Merge branch 'master' of https://github.com/thestk/stk

configure.ac

@@ -50,6 +50,26 @@ else
 fi
 AC_MSG_RESULT($realtime)
 
+AC_MSG_CHECKING(whether to build the static library)
+AC_ARG_ENABLE(static,
+         [  --disable-static = do not compile static library ],
+	 build_static=$enableval,
+	 build_static=yes)
+AC_SUBST(build_static)
+AC_MSG_RESULT($build_static)
+
+AC_MSG_CHECKING(whether to build the shared library)
+AC_ARG_ENABLE(shared,
+         [  --enable-shared = compile the shared library ],
+	 build_shared=$enableval,
+	 build_shared=no)
+AC_SUBST(build_shared)
+AC_MSG_RESULT($build_shared)
+
+if test x$build_static = xno -a x$build_shared = xno ; then
+        AC_MSG_ERROR([ both static and shared libraries are disabled], 1)
+fi
+
 # Check for math library
 AC_CHECK_LIB(m, cos, , AC_MSG_ERROR(math library is needed!))
 

include/Fir.h

@@ -88,7 +88,7 @@ inline StkFloat Fir :: tick( StkFloat input )
   lastFrame_[0] = 0.0;
   inputs_[0] = gain_ * input;
 
-  for ( unsigned int i=b_.size()-1; i>0; i-- ) {
+  for ( unsigned int i=(unsigned int)(b_.size())-1; i>0; i-- ) {
     lastFrame_[0] += b_[i] * inputs_[i];
     inputs_[i] = inputs_[i-1];
   }
@@ -112,7 +112,7 @@ inline StkFrames& Fir :: tick( StkFrames& frames, unsigned int channel )
     inputs_[0] = gain_ * *samples;
     *samples = 0.0;
 
-    for ( i=b_.size()-1; i>0; i-- ) {
+    for ( i=(unsigned int)b_.size()-1; i>0; i-- ) {
       *samples += b_[i] * inputs_[i];
       inputs_[i] = inputs_[i-1];
     }
@@ -139,7 +139,7 @@ inline StkFrames& Fir :: tick( StkFrames& iFrames, StkFrames& oFrames, unsigned
     inputs_[0] = gain_ * *iSamples;
     *oSamples = 0.0;
 
-    for ( i=b_.size()-1; i>0; i-- ) {
+    for ( i=(unsigned int)b_.size()-1; i>0; i-- ) {
       *oSamples += b_[i] * inputs_[i];
       inputs_[i] = inputs_[i-1];
     }

include/Stk.h

@@ -376,7 +376,7 @@ public:
   unsigned int channels( void ) const { return nChannels_; };
 
   //! Return the number of sample frames represented by the data.
-  unsigned int frames( void ) const { return nFrames_; };
+  unsigned int frames( void ) const { return (unsigned int)nFrames_; };
 
   //! Set the sample rate associated with the StkFrames data.
   /*!

src/Makefile.in

@@ -55,6 +55,16 @@ ifeq ($(REALTIME),yes)
 	OBJECTS += RtMidi.o RtAudio.o RtWvOut.o RtWvIn.o InetWvOut.o InetWvIn.o Thread.o Mutex.o Socket.o TcpClient.o TcpServer.o UdpSocket.o @objects@
 endif
 
+BUILD_STATIC = @build_static@
+BUILD_SHARED = @build_shared@
+DEFAULT_TARGETS = 
+ifeq ($(BUILD_STATIC),yes)
+ DEFAULT_TARGETS += $(STATICLIB)
+endif
+ifeq ($(BUILD_SHARED),yes)
+ DEFAULT_TARGETS += $(SHAREDLIB)
+endif
+
 RAWWAVES = @rawwaves@
 ifeq ($(strip $(RAWWAVES)), )
 	RAWWAVES = ../../rawwaves/
@@ -67,7 +77,7 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\"
 %.o : ../src/include/%.cpp $(OBJECT_PATH)/.placeholder
 	$(CC) $(CFLAGS) $(DEFS) -c $(<) -o $(OBJECT_PATH)/$@
 
-all : $(STATICLIB)
+all : $(DEFAULT_TARGETS)
 
 $(OBJECT_PATH)/.placeholder:
 	mkdir -vp $(OBJECT_PATH)

src/MidiFileIn.cpp

@@ -232,7 +232,7 @@ unsigned long MidiFileIn :: getNextEvent( std::vector<unsigned char> *event, uns
     if ( !file_.read( (char *)&c, 1 ) ) goto error;
     event->push_back( c );
     if ( format_ != 1 && ( c == 0x51 ) ) isTempoEvent = true;
-    position = file_.tellg();
+    position = (unsigned long)file_.tellg();
     if ( !readVariableLength( &bytes ) ) goto error;
     bytes += ( (unsigned long)file_.tellg() - position );
     file_.seekg( position, std::ios_base::beg );
@@ -242,7 +242,7 @@ unsigned long MidiFileIn :: getNextEvent( std::vector<unsigned char> *event, uns
   case 0xF7: // The start or continuation of a Sysex event
     trackStatus_[track] = 0;
     event->push_back( c );
-    position = file_.tellg();
+    position = (unsigned long)file_.tellg();
     if ( !readVariableLength( &bytes ) ) goto error;
     bytes += ( (unsigned long)file_.tellg() - position );
     file_.seekg( position, std::ios_base::beg );
@@ -294,7 +294,7 @@ unsigned long MidiFileIn :: getNextEvent( std::vector<unsigned char> *event, uns
   }
 
   // Save the current track pointer value.
-  trackPointers_[track] = file_.tellg();
+  trackPointers_[track] = (long)file_.tellg();
 
   return ticks;