From c298839886a0fc2350d2f9b5cf7e49cb1e714add Mon Sep 17 00:00:00 2001 From: Stephen Sinclair Date: Tue, 1 Oct 2013 02:14:49 +0200 Subject: [PATCH 01/10] Extra bracket causes compilation failure in debug mode. --- include/TapDelay.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/TapDelay.h b/include/TapDelay.h index 4aabb0b..1ce6010 100644 --- a/include/TapDelay.h +++ b/include/TapDelay.h @@ -115,7 +115,7 @@ class TapDelay : public Filter inline StkFloat TapDelay :: lastOut( unsigned int tap ) const { #if defined(_STK_DEBUG_) - if ( tap >= lastFrame_.size() ) ) { + if ( tap >= lastFrame_.size() ) { oStream_ << "TapDelay::lastOut(): tap argument and number of taps are incompatible!"; handleError( StkError::FUNCTION_ARGUMENT ); } From caeaa5778c8626f85e9703b6a4c7395878d5a687 Mon Sep 17 00:00:00 2001 From: Stephen Sinclair Date: Tue, 1 Oct 2013 02:15:35 +0200 Subject: [PATCH 02/10] handleError member function must be declared const. Otherwise it causes a compilation failure when called from const functions. --- include/Stk.h | 2 +- src/Stk.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/Stk.h b/include/Stk.h index 8e3f709..5c9c37b 100644 --- a/include/Stk.h +++ b/include/Stk.h @@ -236,7 +236,7 @@ protected: void removeSampleRateAlert( Stk *ptr ); //! Internal function for error reporting that assumes message in \c oStream_ variable. - void handleError( StkError::Type type ); + void handleError( StkError::Type type ) const; }; diff --git a/src/Stk.cpp b/src/Stk.cpp index ab90da9..97a4ecd 100644 --- a/src/Stk.cpp +++ b/src/Stk.cpp @@ -192,7 +192,7 @@ void Stk :: sleep(unsigned long milliseconds) #endif } -void Stk :: handleError( StkError::Type type ) +void Stk :: handleError( StkError::Type type ) const { handleError( oStream_.str(), type ); oStream_.str( std::string() ); // reset the ostringstream buffer From deaabdd0417e3afad4af4f7a0c78cf6f794672fb Mon Sep 17 00:00:00 2001 From: Stephen Sinclair Date: Tue, 1 Oct 2013 02:16:33 +0200 Subject: [PATCH 03/10] Missing header include in Md2Skini. --- projects/demo/Md2Skini.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/demo/Md2Skini.cpp b/projects/demo/Md2Skini.cpp index 5062685..d860f76 100644 --- a/projects/demo/Md2Skini.cpp +++ b/projects/demo/Md2Skini.cpp @@ -14,6 +14,7 @@ #include "SKINI.msg" #include #include +#include void usage(void) { std::cout << "\nuseage: Md2Skini \n\n"; From b089236578a801676c52a9a8142eafdf175178ea Mon Sep 17 00:00:00 2001 From: Stephen Sinclair Date: Tue, 1 Oct 2013 02:23:04 +0200 Subject: [PATCH 04/10] Remove a spurious echo in the configure script. --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index ebc433e..0aaffdb 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,6 @@ fi CPPFLAGS="$CPPFLAGS $cppflag" # For debugging and optimization ... overwrite default because it has both -g and -O2 -echo "$CXXFLAGS" CXXFLAGS="$cxxflag" # Check compiler and use -Wall if gnu. From 4f0c39e7eb07dd21fe493e30211bcc83f5e56671 Mon Sep 17 00:00:00 2001 From: Stephen Sinclair Date: Tue, 1 Oct 2013 02:17:25 +0200 Subject: [PATCH 05/10] Rename Eguitar.tcl so that ElectricGuitar works on case-sensitive file systems. The shell script uses a different case for the TCL script's filename. --- projects/eguitar/tcl/{Eguitar.tcl => EGuitar.tcl} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename projects/eguitar/tcl/{Eguitar.tcl => EGuitar.tcl} (100%) diff --git a/projects/eguitar/tcl/Eguitar.tcl b/projects/eguitar/tcl/EGuitar.tcl similarity index 100% rename from projects/eguitar/tcl/Eguitar.tcl rename to projects/eguitar/tcl/EGuitar.tcl From 80561731fe0fe67382a2d0944259b30fdc63d12e Mon Sep 17 00:00:00 2001 From: Stephen Sinclair Date: Tue, 1 Oct 2013 03:01:28 +0200 Subject: [PATCH 06/10] Add the McGill logo to the doc directory. --- doc/doxygen/images/mcgill.gif | Bin 0 -> 3810 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 doc/doxygen/images/mcgill.gif diff --git a/doc/doxygen/images/mcgill.gif b/doc/doxygen/images/mcgill.gif new file mode 100644 index 0000000000000000000000000000000000000000..5fe2a4beb59ac205296cc5461c40a1c816f016f2 GIT binary patch literal 3810 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 Yue97uIAx~6pUXP+!yyYJBLw$<0l;PV8vp Date: Tue, 1 Oct 2013 03:03:44 +0200 Subject: [PATCH 07/10] Change version number to 4.4.4. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0aaffdb..9db7cd2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(STK, 4.4, gary@music.mcgill.ca, stk) +AC_INIT(STK, 4.4.4, gary@music.mcgill.ca, stk) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR(src/Stk.cpp) AC_CONFIG_FILES(Makefile src/Makefile projects/demo/Makefile projects/effects/Makefile projects/ragamatic/Makefile projects/examples/Makefile projects/examples/libMakefile projects/eguitar/Makefile) From add961c2f457875e389147281efe3a9009209bcc Mon Sep 17 00:00:00 2001 From: Stephen Sinclair Date: Sun, 12 Jan 2014 14:51:49 +0100 Subject: [PATCH 08/10] Change "-lWsock32" to "-lwsock32" for case-sensitive file names. This is needed to be able to cross-compile for Windows using MingW32 on Linux. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9db7cd2..98d88e3 100644 --- a/configure.ac +++ b/configure.ac @@ -180,7 +180,7 @@ if test $realtime = yes; then fi api="$api -D__WINDOWS_MM__" - LIBS="-lole32 -lwinmm -lWsock32 $LIBS" + LIBS="-lole32 -lwinmm -lwsock32 $LIBS" ;; *) From ed754183e306bf99a86e3e1084ad4481a721d380 Mon Sep 17 00:00:00 2001 From: Felipe Sateler Date: Wed, 25 Sep 2013 10:53:56 -0300 Subject: [PATCH 09/10] Add install target to Makefile.in --- Makefile.in | 3 +++ src/Makefile.in | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/Makefile.in b/Makefile.in index 2a2380e..ee84b4f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,3 +28,6 @@ distclean: clean cd projects/eguitar && $(MAKE) distclean cd projects/examples && $(MAKE) distclean +install: + $(MAKE) -C src install + diff --git a/src/Makefile.in b/src/Makefile.in index 526ab26..e5641ad 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -10,6 +10,9 @@ AR = ar -rsc RM = /bin/rm LN = /bin/ln OBJECT_PATH = @object_path@ +LIBDIR = @libdir@ +PREFIX = @prefix@ +INCLUDEDIR = @includedir@ vpath %.o $(OBJECT_PATH) OBJECTS = Stk.o Generator.o Noise.o Blit.o BlitSaw.o BlitSquare.o Granulate.o \ @@ -80,6 +83,17 @@ $(SHAREDLIB) : $(OBJECTS) $(LN) -s @sharedname@ $(SHAREDLIB) # $(LN) -s @sharedname@ $(SHAREDLIB).$(MAJOR) +install-headers: + install -d $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk + cp -r ../include/*.h $(DESTDIR)$(PREFIX)$(INCLUDEDIR)/stk + +install: $(SHAREDLIB) install-headers + install -d $(DESTDIR)$(PREFIX)$(LIBDIR) + install -m 644 $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR) + ln -sf $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB) + ln -sf $(SHAREDLIB).$(RELEASE) $(DESTDIR)$(PREFIX)$(LIBDIR)/$(SHAREDLIB).$(MAJOR) + + $(OBJECTS) : Stk.h clean : From b017472cdf7f18b97cde0ce9b66738e59cdce2e7 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Wed, 25 Sep 2013 11:00:01 -0300 Subject: [PATCH 10/10] Build realtime projects only when requested --- Makefile.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile.in b/Makefile.in index ee84b4f..f4f04ec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,30 +2,38 @@ RM = /bin/rm +REALTIME = @realtime@ + all : cd src && $(MAKE) cd projects/demo && $(MAKE) libdemo +ifeq ($(REALTIME),yes) cd projects/effects && $(MAKE) libeffects cd projects/ragamatic && $(MAKE) libragamat cd projects/eguitar && $(MAKE) libeguitar +endif cd projects/examples && $(MAKE) -f libMakefile clean : $(RM) -f *~ cd src && $(MAKE) clean cd projects/demo && $(MAKE) clean +ifeq ($(REALTIME),yes) cd projects/effects && $(MAKE) clean cd projects/ragamatic && $(MAKE) clean cd projects/eguitar && $(MAKE) clean +endif cd projects/examples && $(MAKE) clean distclean: clean $(RM) -rf config.log config.status autom4te.cache Makefile cd src && $(MAKE) distclean cd projects/demo && $(MAKE) distclean +ifeq ($(REALTIME),yes) cd projects/effects && $(MAKE) distclean cd projects/ragamatic && $(MAKE) distclean cd projects/eguitar && $(MAKE) distclean +endif cd projects/examples && $(MAKE) distclean install: