Changeset 97

Timestamp:

03/21/08 22:44:43 (10 months ago)

Author:

gordonjcp

Message:

Added Sean Bolton's patches to sort out anti-aliasing

Files:

• nekostring/trunk/configure.ac (modified) (1 diff)
• nekostring/trunk/gui/Makefile (modified) (35 diffs)
• nekostring/trunk/src/Makefile (modified) (25 diffs)
• nekostring/trunk/src/minblep_tables.c (modified) (4 diffs)
• nekostring/trunk/src/neko-dssi.c (modified) (2 diffs)
• nekostring/trunk/src/neko_voice.c (modified) (2 diffs)
• nekostring/trunk/src/neko_voice.h (modified) (5 diffs)
• nekostring/trunk/src/neko_voice_render.c (modified) (11 diffs)

nekostring/trunk/configure.ac

@@ -31 +31 @@
-AC_SUBST(PACKAGE_LIBS)
-
-
-
-
+
-with_gtk=no
-
-
-
-
-
-
-
+
-AM_CONDITIONAL(BUILD_GUI, test "x${with_gtk}" != 'xno')
-echo "GTK support: $with_gtk"
-
-
-# FIXME: Replace `main' with a function in `-llo':

nekostring/trunk/gui/Makefile

@@ -1 @@
-10
+9.6
-# gui/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-, 2006
+
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
@@ -15 +15 @@
-
-
+srcdir = .
+top_srcdir = ..
-
-pkgdatadir = $(datadir)/nekostring
-pkglibdir = $(libdir)/nekostring
-pkgincludedir = $(includedir)/nekostring
+top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
@@ -53 +57 @@
-nekostring_gtk_OBJECTS = $(am_nekostring_gtk_OBJECTS)
-nekostring_gtk_DEPENDENCIES =
-
-
-
-
+
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAG
---mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDE
-PPFLAGS) $(CPPFLAGS) $(AM_C
+--mode=compile $(CC) $(DEF
+$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAG
+
-CCLD = $(CC)
-
-
-
+
+
-SOURCES = $(nekostring_gtk_SOURCES)
-DIST_SOURCES = $(nekostring_gtk_SOURCES)
@@ -73 +73 @@
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-
+
+
+
+
-AR = ar
-
-
-
-
+
+
+
+
+
+
-CC = gcc
-CCDEPMODE = depmode=gcc3
-
+-g -O2
-CPP = gcc -E
-CPPFLAGS = 
@@ -92 +96 @@
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
+DSYMUTIL = 
-ECHO = echo
-ECHO_C = 
@@ -101 +106 @@
-FFLAGS = 
-GREP = /bin/grep
-
-
-
+
+
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-
+{SHELL} $
-LDFLAGS = 
-LIBOBJS = 
@@ -114 +118 @@
-LN_S = ln -s
-LTLIBOBJS = 
-
-
+-new
+
-OBJEXT = o
-PACKAGE = nekostring
-PACKAGE_BUGREPORT = 
-
-fontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11
+-I/usr/include/pixman-1 
+pango-1.0 -lcairo
-PACKAGE_NAME = 
-PACKAGE_STRING = 
@@ -128 +132 @@
-PKG_CONFIG = /usr/bin/pkg-config
-RANLIB = ranlib
+SED = /bin/sed
-SET_MAKE = 
-SHELL = /bin/bash
-STRIP = strip
-VERSION = 0.1.1
-abs_builddir = /home/gordonjcp/devel/nekostring/gui
-abs_srcdir = /home/gordonjcp/devel/nekostring/gui
-abs_top_builddir = /home/gordonjcp/devel/nekostring
-abs_top_srcdir = /home/gordonjcp/devel/nekostring
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE = 
+am__fastdepCXX_FALSE = #
+am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
@@ -150 +155 @@
-build_os = linux-gnu
-build_vendor = pc
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
@@ -164 +168 @@
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-$(SHELL) /home/gordonjcp/devel/nekostring
+/home/gordonjcp/devel/nekostring-new
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
@@ -170 +174 @@
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-/bin/mkdir -p
+mkdir -p --
-oldincludedir = /usr/include
-pdfdir = ${docdir}
@@ -178 +182 @@
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_builddir = ..
-top_srcdir = ..
-INCLUDES = \
-        -DPACKAGE_DATA_DIR=\""$(datadir)"\" 
-
-
-
+-I/usr/include/pixman-1 
+-I/usr/include/pixman-1 
-nekostring_gtk_SOURCES = \
-        main.c \
@@ -196 +197 @@
-        widgets.h
-
-fontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11
+pango-1.0 -lcairo
-_SOURCES = osc.c
-all: all-am
@@ -233 +234 @@
-install-binPROGRAMS: $(bin_PROGRAMS)
-        @$(NORMAL_INSTALL)
-MKDIR_P
+mkdir_p
-        @list='$(bin_PROGRAMS)'; for p in $$list; do \
-          p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -261 +262 @@
-nekostring_gtk$(EXEEXT): $(nekostring_gtk_OBJECTS) $(nekostring_gtk_DEPENDENCIES) 
-        @rm -f nekostring_gtk$(EXEEXT)
-nekostring_gtk_LINK
+LINK) $(nekostring_gtk_LDFLAGS
-
-mostlyclean-compile:
@@ -276 +277 @@
-
-.c.o:
-$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#       source='$<' object='$@' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -283 +284 @@
-
-.c.obj:
-$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#       source='$<' object='$@' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -290 +291 @@
-
-.c.lo:
-$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#       source='$<' object='$@' libtool=yes \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -297 +298 @@
-
-nekostring_gtk-main.o: main.c
-$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-main.o -MD -MP -MF $(DEPDIR)/nekostring_gtk-main.Tpo -c -o nekostring_gtk-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
-mv -f $(DEPDIR)/nekostring_gtk-main.Tpo $(DEPDIR)/nekostring_gtk-main.Po
+if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-main.o -MD -MP -MF "$(DEPDIR)/nekostring_gtk-main.Tpo" -c -o nekostring_gtk-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
+then mv -f "$(DEPDIR)/nekostring_gtk-main.Tpo" "$(DEPDIR)/nekostring_gtk-main.Po"; else rm -f "$(DEPDIR)/nekostring_gtk-main.Tpo"; exit 1; fi
-#       source='main.c' object='nekostring_gtk-main.o' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -304 +305 @@
-
-nekostring_gtk-main.obj: main.c
-$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-main.obj -MD -MP -MF $(DEPDIR)/nekostring_gtk-main.Tpo -c -o nekostring_gtk-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
-mv -f $(DEPDIR)/nekostring_gtk-main.Tpo $(DEPDIR)/nekostring_gtk-main.Po
+if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-main.obj -MD -MP -MF "$(DEPDIR)/nekostring_gtk-main.Tpo" -c -o nekostring_gtk-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`; \
+then mv -f "$(DEPDIR)/nekostring_gtk-main.Tpo" "$(DEPDIR)/nekostring_gtk-main.Po"; else rm -f "$(DEPDIR)/nekostring_gtk-main.Tpo"; exit 1; fi
-#       source='main.c' object='nekostring_gtk-main.obj' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -311 +312 @@
-
-nekostring_gtk-support.o: support.c
-$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-support.o -MD -MP -MF $(DEPDIR)/nekostring_gtk-support.Tpo -c -o nekostring_gtk-support.o `test -f 'support.c' || echo '$(srcdir)/'`support.c
-mv -f $(DEPDIR)/nekostring_gtk-support.Tpo $(DEPDIR)/nekostring_gtk-support.Po
+if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-support.o -MD -MP -MF "$(DEPDIR)/nekostring_gtk-support.Tpo" -c -o nekostring_gtk-support.o `test -f 'support.c' || echo '$(srcdir)/'`support.c; \
+then mv -f "$(DEPDIR)/nekostring_gtk-support.Tpo" "$(DEPDIR)/nekostring_gtk-support.Po"; else rm -f "$(DEPDIR)/nekostring_gtk-support.Tpo"; exit 1; fi
-#       source='support.c' object='nekostring_gtk-support.o' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -318 +319 @@
-
-nekostring_gtk-support.obj: support.c
-$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-support.obj -MD -MP -MF $(DEPDIR)/nekostring_gtk-support.Tpo -c -o nekostring_gtk-support.obj `if test -f 'support.c'; then $(CYGPATH_W) 'support.c'; else $(CYGPATH_W) '$(srcdir)/support.c'; fi`
-mv -f $(DEPDIR)/nekostring_gtk-support.Tpo $(DEPDIR)/nekostring_gtk-support.Po
+if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-support.obj -MD -MP -MF "$(DEPDIR)/nekostring_gtk-support.Tpo" -c -o nekostring_gtk-support.obj `if test -f 'support.c'; then $(CYGPATH_W) 'support.c'; else $(CYGPATH_W) '$(srcdir)/support.c'; fi`; \
+then mv -f "$(DEPDIR)/nekostring_gtk-support.Tpo" "$(DEPDIR)/nekostring_gtk-support.Po"; else rm -f "$(DEPDIR)/nekostring_gtk-support.Tpo"; exit 1; fi
-#       source='support.c' object='nekostring_gtk-support.obj' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -325 +326 @@
-
-nekostring_gtk-interface.o: interface.c
-$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-interface.o -MD -MP -MF $(DEPDIR)/nekostring_gtk-interface.Tpo -c -o nekostring_gtk-interface.o `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
-mv -f $(DEPDIR)/nekostring_gtk-interface.Tpo $(DEPDIR)/nekostring_gtk-interface.Po
+if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-interface.o -MD -MP -MF "$(DEPDIR)/nekostring_gtk-interface.Tpo" -c -o nekostring_gtk-interface.o `test -f 'interface.c' || echo '$(srcdir)/'`interface.c; \
+then mv -f "$(DEPDIR)/nekostring_gtk-interface.Tpo" "$(DEPDIR)/nekostring_gtk-interface.Po"; else rm -f "$(DEPDIR)/nekostring_gtk-interface.Tpo"; exit 1; fi
-#       source='interface.c' object='nekostring_gtk-interface.o' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -332 +333 @@
-
-nekostring_gtk-interface.obj: interface.c
-$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-interface.obj -MD -MP -MF $(DEPDIR)/nekostring_gtk-interface.Tpo -c -o nekostring_gtk-interface.obj `if test -f 'interface.c'; then $(CYGPATH_W) 'interface.c'; else $(CYGPATH_W) '$(srcdir)/interface.c'; fi`
-mv -f $(DEPDIR)/nekostring_gtk-interface.Tpo $(DEPDIR)/nekostring_gtk-interface.Po
+if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-interface.obj -MD -MP -MF "$(DEPDIR)/nekostring_gtk-interface.Tpo" -c -o nekostring_gtk-interface.obj `if test -f 'interface.c'; then $(CYGPATH_W) 'interface.c'; else $(CYGPATH_W) '$(srcdir)/interface.c'; fi`; \
+then mv -f "$(DEPDIR)/nekostring_gtk-interface.Tpo" "$(DEPDIR)/nekostring_gtk-interface.Po"; else rm -f "$(DEPDIR)/nekostring_gtk-interface.Tpo"; exit 1; fi
-#       source='interface.c' object='nekostring_gtk-interface.obj' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -339 +340 @@
-
-nekostring_gtk-callbacks.o: callbacks.c
-$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-callbacks.o -MD -MP -MF $(DEPDIR)/nekostring_gtk-callbacks.Tpo -c -o nekostring_gtk-callbacks.o `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
-mv -f $(DEPDIR)/nekostring_gtk-callbacks.Tpo $(DEPDIR)/nekostring_gtk-callbacks.Po
+if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-callbacks.o -MD -MP -MF "$(DEPDIR)/nekostring_gtk-callbacks.Tpo" -c -o nekostring_gtk-callbacks.o `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c; \
+then mv -f "$(DEPDIR)/nekostring_gtk-callbacks.Tpo" "$(DEPDIR)/nekostring_gtk-callbacks.Po"; else rm -f "$(DEPDIR)/nekostring_gtk-callbacks.Tpo"; exit 1; fi
-#       source='callbacks.c' object='nekostring_gtk-callbacks.o' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -346 +347 @@
-
-nekostring_gtk-callbacks.obj: callbacks.c
-$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-callbacks.obj -MD -MP -MF $(DEPDIR)/nekostring_gtk-callbacks.Tpo -c -o nekostring_gtk-callbacks.obj `if test -f 'callbacks.c'; then $(CYGPATH_W) 'callbacks.c'; else $(CYGPATH_W) '$(srcdir)/callbacks.c'; fi`
-mv -f $(DEPDIR)/nekostring_gtk-callbacks.Tpo $(DEPDIR)/nekostring_gtk-callbacks.Po
+if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-callbacks.obj -MD -MP -MF "$(DEPDIR)/nekostring_gtk-callbacks.Tpo" -c -o nekostring_gtk-callbacks.obj `if test -f 'callbacks.c'; then $(CYGPATH_W) 'callbacks.c'; else $(CYGPATH_W) '$(srcdir)/callbacks.c'; fi`; \
+then mv -f "$(DEPDIR)/nekostring_gtk-callbacks.Tpo" "$(DEPDIR)/nekostring_gtk-callbacks.Po"; else rm -f "$(DEPDIR)/nekostring_gtk-callbacks.Tpo"; exit 1; fi
-#       source='callbacks.c' object='nekostring_gtk-callbacks.obj' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -353 +354 @@
-
-nekostring_gtk-neko_ports.o: neko_ports.c
-$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-neko_ports.o -MD -MP -MF $(DEPDIR)/nekostring_gtk-neko_ports.Tpo -c -o nekostring_gtk-neko_ports.o `test -f 'neko_ports.c' || echo '$(srcdir)/'`neko_ports.c
-mv -f $(DEPDIR)/nekostring_gtk-neko_ports.Tpo $(DEPDIR)/nekostring_gtk-neko_ports.Po
+if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-neko_ports.o -MD -MP -MF "$(DEPDIR)/nekostring_gtk-neko_ports.Tpo" -c -o nekostring_gtk-neko_ports.o `test -f 'neko_ports.c' || echo '$(srcdir)/'`neko_ports.c; \
+then mv -f "$(DEPDIR)/nekostring_gtk-neko_ports.Tpo" "$(DEPDIR)/nekostring_gtk-neko_ports.Po"; else rm -f "$(DEPDIR)/nekostring_gtk-neko_ports.Tpo"; exit 1; fi
-#       source='neko_ports.c' object='nekostring_gtk-neko_ports.o' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -360 +361 @@
-
-nekostring_gtk-neko_ports.obj: neko_ports.c
-$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-neko_ports.obj -MD -MP -MF $(DEPDIR)/nekostring_gtk-neko_ports.Tpo -c -o nekostring_gtk-neko_ports.obj `if test -f 'neko_ports.c'; then $(CYGPATH_W) 'neko_ports.c'; else $(CYGPATH_W) '$(srcdir)/neko_ports.c'; fi`
-mv -f $(DEPDIR)/nekostring_gtk-neko_ports.Tpo $(DEPDIR)/nekostring_gtk-neko_ports.Po
+if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(nekostring_gtk_CFLAGS) $(CFLAGS) -MT nekostring_gtk-neko_ports.obj -MD -MP -MF "$(DEPDIR)/nekostring_gtk-neko_ports.Tpo" -c -o nekostring_gtk-neko_ports.obj `if test -f 'neko_ports.c'; then $(CYGPATH_W) 'neko_ports.c'; else $(CYGPATH_W) '$(srcdir)/neko_ports.c'; fi`; \
+then mv -f "$(DEPDIR)/nekostring_gtk-neko_ports.Tpo" "$(DEPDIR)/nekostring_gtk-neko_ports.Po"; else rm -f "$(DEPDIR)/nekostring_gtk-neko_ports.Tpo"; exit 1; fi
-#       source='neko_ports.c' object='nekostring_gtk-neko_ports.obj' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -371 +372 @@
-clean-libtool:
-        -rm -rf .libs _libs
+
+distclean-libtool:
+        -rm -f libtool
+uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -421 +426 @@
-
-distdir: $(DISTFILES)
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+            dir="/$$dir"; \
+            $(mkdir_p) "$(distdir)$$dir"; \
+          else \
+            dir=''; \
+          fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
@@ -451 +457 @@
-installdirs:
-        for dir in "$(DESTDIR)$(bindir)"; do \
-MKDIR_P
+mkdir_p
-        done
-install: install-am
@@ -485 +491 @@
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-
+libtool distclean-
-
-dvi: dvi-am
@@ -499 +505 @@
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
@@ -533 +531 @@
-ps-am:
-
-
-
-
+
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
@@ -541 +537 @@
-        distclean-generic distclean-libtool distclean-tags distdir dvi \
-        dvi-am html html-am info info-am install install-am \
-
-
-
-
+
+
-        install-strip installcheck installcheck-am installdirs \
-        maintainer-clean maintainer-clean-generic mostlyclean \
-        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-        pdf pdf-am ps ps-am tags uninstall uninstall-am \
-
+ uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.

nekostring/trunk/src/Makefile

@@ -1 @@
-10
+9.6
-# src/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-, 2006
+
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
@@ -15 +15 @@
-
-
+srcdir = .
+top_srcdir = ..
-
-pkgdatadir = $(datadir)/nekostring
-pkglibdir = $(libdir)/nekostring
-pkgincludedir = $(includedir)/nekostring
+top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
@@ -56 +60 @@
-        neko_voice.lo neko_ensemble.lo neko_voice_render.lo
-nekostring_la_OBJECTS = $(am_nekostring_la_OBJECTS)
-
-
-
-
+
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAG
---mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDE
-PPFLAGS) $(CPPFLAGS) $(AM_C
+--mode=compile $(CC) $(DEF
+$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAG
+
-CCLD = $(CC)
-
-
-
+
+
-SOURCES = $(nekostring_la_SOURCES)
-DIST_SOURCES = $(nekostring_la_SOURCES)
@@ -76 +76 @@
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-
+
+
+
+
-AR = ar
-
-
-
-
+
+
+
+
+
+
-CC = gcc
-CCDEPMODE = depmode=gcc3
-
+-g -O2
-CPP = gcc -E
-CPPFLAGS = 
@@ -95 +99 @@
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
+DSYMUTIL = 
-ECHO = echo
-ECHO_C = 
@@ -104 +109 @@
-FFLAGS = 
-GREP = /bin/grep
-
-
-
+
+
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-
+{SHELL} $
-LDFLAGS = 
-LIBOBJS = 
@@ -117 +121 @@
-LN_S = ln -s
-LTLIBOBJS = 
-
-
+-new
+
-OBJEXT = o
-PACKAGE = nekostring
-PACKAGE_BUGREPORT = 
-
-fontconfig -lXext -lXrender -lXinerama -lXi -lXrandr -lXcursor -lXfixes -lpango-1.0 -lcairo -lX11
+-I/usr/include/pixman-1 
+pango-1.0 -lcairo
-PACKAGE_NAME = 
-PACKAGE_STRING = 
@@ -131 +135 @@
-PKG_CONFIG = /usr/bin/pkg-config
-RANLIB = ranlib
+SED = /bin/sed
-SET_MAKE = 
-SHELL = /bin/bash
-STRIP = strip
-VERSION = 0.1.1
-abs_builddir = /home/gordonjcp/devel/nekostring/src
-abs_srcdir = /home/gordonjcp/devel/nekostring/src
-abs_top_builddir = /home/gordonjcp/devel/nekostring
-abs_top_srcdir = /home/gordonjcp/devel/nekostring
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE = 
+am__fastdepCXX_FALSE = #
+am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
@@ -153 +158 @@
-build_os = linux-gnu
-build_vendor = pc
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
@@ -167 +171 @@
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-$(SHELL) /home/gordonjcp/devel/nekostring
+/home/gordonjcp/devel/nekostring-new
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
@@ -173 +177 @@
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-/bin/mkdir -p
+mkdir -p --
-oldincludedir = /usr/include
-pdfdir = ${docdir}
@@ -181 +185 @@
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_builddir = ..
-top_srcdir = ..
-plugindir = $(libdir)/dssi
-plugin_LTLIBRARIES = nekostring.la
@@ -242 +243 @@
-install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
-        @$(NORMAL_INSTALL)
-MKDIR_P
+mkdir_p
-        @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
-          if test -f $$p; then \
@@ -253 +254 @@
-uninstall-pluginLTLIBRARIES:
-        @$(NORMAL_UNINSTALL)
-
+set -x; 
-          p=$(am__strip_dir) \
-          echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
@@ -268 +269 @@
-        done
-nekostring.la: $(nekostring_la_OBJECTS) $(nekostring_la_DEPENDENCIES) 
-nekostring_la_LINK) -rpath $(plugindir
+LINK) -rpath $(plugindir) $(nekostring_la_LDFLAGS
-
-mostlyclean-compile:
@@ -287 +288 @@
-
-.c.o:
-$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#       source='$<' object='$@' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -294 +295 @@
-
-.c.obj:
-$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#       source='$<' object='$@' libtool=no \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -301 +302 @@
-
-.c.lo:
-$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#       source='$<' object='$@' libtool=yes \
-#       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
@@ -312 +313 @@
-clean-libtool:
-        -rm -rf .libs _libs
+
+distclean-libtool:
+        -rm -f libtool
+uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -362 +367 @@
-
-distdir: $(DISTFILES)
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-          if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+            dir="/$$dir"; \
+            $(mkdir_p) "$(distdir)$$dir"; \
+          else \
+            dir=''; \
+          fi; \
-          if test -d $$d/$$file; then \
-            dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-            if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-              cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
@@ -392 +398 @@
-installdirs:
-        for dir in "$(DESTDIR)$(plugindir)"; do \
-MKDIR_P
+mkdir_p
-        done
-install: install-am
@@ -427 +433 @@
-        -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-
+libtool distclean-
-
-dvi: dvi-am
@@ -441 +447 @@
-install-data-am: install-pluginLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
@@ -475 +473 @@
-ps-am:
-
-
-
-
+
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
@@ -483 +479 @@
-        distclean-compile distclean-generic distclean-libtool \
-        distclean-tags distdir dvi dvi-am html html-am info info-am \
-
-
-
-
-
+
+
+
-        installcheck-am installdirs maintainer-clean \
-        maintainer-clean-generic mostlyclean mostlyclean-compile \
-        mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-
+
+
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.

nekostring/trunk/src/minblep_tables.c

@@ -3 +3 @@
-/* nekostring polyphonic string ensemble
- *
-(C) 2006
+Copyright (C) 2008
- *
- * For further information on contributors and the history of nekostring,
@@ -12 +12 @@
-#include "neko_voice.h"
-
-
+ created by Sean Bolton
- *
- * sinc cutoff frequency: 0.9 nyquist
@@ -24 +24 @@
- *
- * forward-shifted step discontinuity delta truncated after local minimum
-7
+6
- *
- * forward-shifted slope discontinuity delta truncated after local minimum
@@ -1191 +1191 @@
- {-3.906813e-09, 3.319882e-10},{-3.574825e-09, 3.479630e-10},{-3.226862e-09, 3.631132e-10},{-2.863749e-09, 3.774054e-10},
- {-2.486343e-09, 3.908078e-10},{-2.095535e-09, 4.032923e-10},{-1.692243e-09, 4.148307e-10},{-1.277412e-09, 4.254000e-10},
-435438e-10},{ 2.650880e-11,-2.650880e-11
+170337e-10},{ 0.000000e+00, 0.000000e+00
- { 0.000000e+00, 0.000000e+00}
-};

nekostring/trunk/src/neko-dssi.c

@@ -3 +3 @@
-/* nekostring polyphonic string ensemble
- *
-(C) 2006
+Copyright (C) 2008
- *
- * For further information on contributors and the history of nekostring,
@@ -516 +516 @@
-        neko_LADSPA_descriptor->Properties = 0;
-        neko_LADSPA_descriptor->Name = "Neko DSSI plugin";
-Sean Bolton 
+Gordon JC Pearce
-        neko_LADSPA_descriptor->Copyright = "GNU General Public License version 2 or later";
-        neko_LADSPA_descriptor->PortCount = NEKO_PORTS_COUNT;

nekostring/trunk/src/neko_voice.c

@@ -3 +3 @@
-/* nekostring polyphonic string ensemble
- *
-(C) 2006
+Copyright (C) 2008
- *
- * For further information on contributors and the history of nekostring,
@@ -102 +102 @@
-                        
-                        voice->osc_bass.pos = 0;//synth->voice[i]->osc_bass.pos*oct_mult;
+                        voice->osc_bass.state = 0;
-                        osc_pos=synth->bog_pos[key%12] *oct_mult /2;
-                        osc_pos=osc_pos-(float)trunc(osc_pos);
-                        voice->osc_cello.pos = osc_pos;//synth->voice[i]->osc_cello.pos*oct_mult;
+                        voice->osc_cello.state = (osc_pos > 0.5f) ? 1 : 0;
-                        osc_pos=synth->bog_pos[key%12] *oct_mult;
-                        osc_pos=osc_pos-(float)trunc(osc_pos);
-                        voice->osc_viola.pos = osc_pos;
+                        voice->osc_viola.state = (osc_pos > 0.5f) ? 1 : 0;
-                        osc_pos=synth->bog_pos[key%12] *oct_mult*2;
-                        osc_pos=osc_pos-(float)trunc(osc_pos);
-                        voice->osc_violin.pos = osc_pos;//synth->voice[i]->osc_violin.pos*oct_mult*2;
+                        voice->osc_violin.state = (osc_pos > 0.5f) ? 1 : 0;
-
-                

nekostring/trunk/src/neko_voice.h

@@ -3 +3 @@
-/* nekostring polyphonic string ensemble
- *
-(C) 2006
+Copyright (C) 2008
- *
- * For further information on contributors and the history of nekostring,
@@ -34 +34 @@
-/* the longer of the two above: */
-#define LONGEST_DD_PULSE_LENGTH STEP_DD_PULSE_LENGTH
-
-
-
+
+
+
+
+
-/* delay between start of DD pulse and the discontinuity, in samples: */
-#define DD_SAMPLE_DELAY          4
@@ -71 +73 @@
-    int   last_waveform,    /* persistent */
-          waveform,         /* comes from LADSPA port each cycle */
-bp_high;
+state;  
-    float pos,              /* persistent */
-          pw;               /* comes from LADSPA port each cycle */
-    int osc_index;
-    float osc_audio[MINBLEP_BUFFER_LENGTH];
-        float hp_last, hp_last_in;
@@ -113 +114 @@
-    unsigned char eg1_phase,
-                  eg2_p