diff --git a/configure b/configure index 936dc90..ddff2b0 100755 --- a/configure +++ b/configure @@ -3611,7 +3611,7 @@ fi echo "$as_me:$LINENO: result: $ac_cv_func_gettimeofday" >&5 echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6 if test $ac_cv_func_gettimeofday = yes; then - cflags=$cflags" -DHAVE_GETTIMEOFDAY" + CFLAGS=$CFLAGS" -DHAVE_GETTIMEOFDAY" fi @@ -3621,6 +3621,8 @@ if test $GXX = "yes" ; then fi +CFLAGS="$CFLAGS $cflags" + # Checks for package options and external software ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do @@ -3711,7 +3713,7 @@ case $host in echo "${ECHO_T}using OSS" >&6 audio_apis=-D__LINUX_OSS__ - cflags=$cflags" -lossaudio" + CFLAGS=$CFLAGS" -lossaudio" echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 @@ -3961,7 +3963,7 @@ echo "$as_me: error: Jack support also requires the asound library!" >&2;} { (exit 1); exit 1; }; } fi - LIBS="`pkg-config --cflags --libs jack` $TEMP_LIBS -lasound" + LIBS="`pkg-config --CFLAGS --libs jack` $TEMP_LIBS -lasound" audio_apis="-D__UNIX_JACK__" fi diff --git a/doc/html/RtAudio_8h-source.html b/doc/html/RtAudio_8h-source.html index 081a6e9..956812c 100644 --- a/doc/html/RtAudio_8h-source.html +++ b/doc/html/RtAudio_8h-source.html @@ -12,7 +12,7 @@

RtAudio.h

Go to the documentation of this file.
00001 /************************************************************************/
 00039 /************************************************************************/
 00040 
-00045 // RtAudio: Version 4.0.3
+00045 // RtAudio: Version 4.0.4
 00046 
 00047 #ifndef __RTAUDIO_H
 00048 #define __RTAUDIO_H
@@ -317,7 +317,7 @@
 00617 #endif
 00618 
 00619     RtApiStream()
-00620       :apiHandle(0), deviceBuffer(0) {}
+00620       :apiHandle(0), deviceBuffer(0) { device[0] = 11111; device[1] = 11111; }
 00621   };
 00622 
 00623   typedef signed short Int16;
@@ -546,85 +546,87 @@
 00867 
 00868   private:
 00869 
-00870   bool probeDeviceOpen( unsigned int device, StreamMode mode, unsigned int channels, 
-00871                         unsigned int firstChannel, unsigned int sampleRate,
-00872                         RtAudioFormat format, unsigned int *bufferSize,
-00873                         RtAudio::StreamOptions *options );
-00874 };
-00875 
-00876 #endif
-00877 
-00878 #if defined(__LINUX_OSS__)
+00870   std::vector<RtAudio::DeviceInfo> devices_;
+00871   void saveDeviceInfo( void );
+00872   bool probeDeviceOpen( unsigned int device, StreamMode mode, unsigned int channels, 
+00873                         unsigned int firstChannel, unsigned int sampleRate,
+00874                         RtAudioFormat format, unsigned int *bufferSize,
+00875                         RtAudio::StreamOptions *options );
+00876 };
+00877 
+00878 #endif
 00879 
-00880 class RtApiOss: public RtApi
-00881 {
-00882 public:
-00883 
-00884   RtApiOss();
-00885   ~RtApiOss();
-00886   RtAudio::Api getCurrentApi() { return RtAudio::LINUX_OSS; };
-00887   unsigned int getDeviceCount( void );
-00888   RtAudio::DeviceInfo getDeviceInfo( unsigned int device );
-00889   void closeStream( void );
-00890   void startStream( void );
-00891   void stopStream( void );
-00892   void abortStream( void );
-00893 
-00894   // This function is intended for internal use only.  It must be
-00895   // public because it is called by the internal callback handler,
-00896   // which is not a member of RtAudio.  External use of this function
-00897   // will most likely produce highly undesireable results!
-00898   void callbackEvent( void );
-00899 
-00900   private:
+00880 #if defined(__LINUX_OSS__)
+00881 
+00882 class RtApiOss: public RtApi
+00883 {
+00884 public:
+00885 
+00886   RtApiOss();
+00887   ~RtApiOss();
+00888   RtAudio::Api getCurrentApi() { return RtAudio::LINUX_OSS; };
+00889   unsigned int getDeviceCount( void );
+00890   RtAudio::DeviceInfo getDeviceInfo( unsigned int device );
+00891   void closeStream( void );
+00892   void startStream( void );
+00893   void stopStream( void );
+00894   void abortStream( void );
+00895 
+00896   // This function is intended for internal use only.  It must be
+00897   // public because it is called by the internal callback handler,
+00898   // which is not a member of RtAudio.  External use of this function
+00899   // will most likely produce highly undesireable results!
+00900   void callbackEvent( void );
 00901 
-00902   bool probeDeviceOpen( unsigned int device, StreamMode mode, unsigned int channels, 
-00903                         unsigned int firstChannel, unsigned int sampleRate,
-00904                         RtAudioFormat format, unsigned int *bufferSize,
-00905                         RtAudio::StreamOptions *options );
-00906 };
-00907 
-00908 #endif
-00909 
-00910 #if defined(__RTAUDIO_DUMMY__)
+00902   private:
+00903 
+00904   bool probeDeviceOpen( unsigned int device, StreamMode mode, unsigned int channels, 
+00905                         unsigned int firstChannel, unsigned int sampleRate,
+00906                         RtAudioFormat format, unsigned int *bufferSize,
+00907                         RtAudio::StreamOptions *options );
+00908 };
+00909 
+00910 #endif
 00911 
-00912 class RtApiDummy: public RtApi
-00913 {
-00914 public:
-00915 
-00916   RtApiDummy() { errorText_ = "RtApiDummy: This class provides no functionality."; error( RtError::WARNING ); };
-00917   RtAudio::Api getCurrentApi( void ) { return RtAudio::RTAUDIO_DUMMY; };
-00918   unsigned int getDeviceCount( void ) { return 0; };
-00919   RtAudio::DeviceInfo getDeviceInfo( unsigned int device ) { RtAudio::DeviceInfo info; return info; };
-00920   void closeStream( void ) {};
-00921   void startStream( void ) {};
-00922   void stopStream( void ) {};
-00923   void abortStream( void ) {};
-00924 
-00925   private:
+00912 #if defined(__RTAUDIO_DUMMY__)
+00913 
+00914 class RtApiDummy: public RtApi
+00915 {
+00916 public:
+00917 
+00918   RtApiDummy() { errorText_ = "RtApiDummy: This class provides no functionality."; error( RtError::WARNING ); };
+00919   RtAudio::Api getCurrentApi( void ) { return RtAudio::RTAUDIO_DUMMY; };
+00920   unsigned int getDeviceCount( void ) { return 0; };
+00921   RtAudio::DeviceInfo getDeviceInfo( unsigned int device ) { RtAudio::DeviceInfo info; return info; };
+00922   void closeStream( void ) {};
+00923   void startStream( void ) {};
+00924   void stopStream( void ) {};
+00925   void abortStream( void ) {};
 00926 
-00927   bool probeDeviceOpen( unsigned int device, StreamMode mode, unsigned int channels, 
-00928                         unsigned int firstChannel, unsigned int sampleRate,
-00929                         RtAudioFormat format, unsigned int *bufferSize,
-00930                         RtAudio::StreamOptions *options ) { return false; };
-00931 };
-00932 
-00933 #endif
-00934 
+00927   private:
+00928 
+00929   bool probeDeviceOpen( unsigned int device, StreamMode mode, unsigned int channels, 
+00930                         unsigned int firstChannel, unsigned int sampleRate,
+00931                         RtAudioFormat format, unsigned int *bufferSize,
+00932                         RtAudio::StreamOptions *options ) { return false; };
+00933 };
+00934 
 00935 #endif
 00936 
-00937 // Indentation settings for Vim and Emacs
-00938 //
-00939 // Local Variables:
-00940 // c-basic-offset: 2
-00941 // indent-tabs-mode: nil
-00942 // End:
-00943 //
-00944 // vim: et sts=2 sw=2
+00937 #endif
+00938 
+00939 // Indentation settings for Vim and Emacs
+00940 //
+00941 // Local Variables:
+00942 // c-basic-offset: 2
+00943 // indent-tabs-mode: nil
+00944 // End:
+00945 //
+00946 // vim: et sts=2 sw=2
- +
©2001-2007 Gary P. Scavone, McGill University. All Rights Reserved.
Maintained by Gary P. Scavone.
©2001-2008 Gary P. Scavone, McGill University. All Rights Reserved.
Maintained by Gary P. Scavone.
diff --git a/doc/html/RtAudio_8h.html b/doc/html/RtAudio_8h.html index 8e35aee..73f5584 100644 --- a/doc/html/RtAudio_8h.html +++ b/doc/html/RtAudio_8h.html @@ -172,7 +172,7 @@ To continue normal stream operation, the RtAudioCallback function should return
- +
©2001-2007 Gary P. Scavone, McGill University. All Rights Reserved.
Maintained by Gary P. Scavone.
©2001-2008 Gary P. Scavone, McGill University. All Rights Reserved.
Maintained by Gary P. Scavone.
diff --git a/doc/html/RtError_8h-source.html b/doc/html/RtError_8h-source.html index aa18569..0c736c1 100644 --- a/doc/html/RtError_8h-source.html +++ b/doc/html/RtError_8h-source.html @@ -57,7 +57,7 @@
- +
©2001-2007 Gary P. Scavone, McGill University. All Rights Reserved.
Maintained by Gary P. Scavone.
©2001-2008 Gary P. Scavone, McGill University. All Rights Reserved.
Maintained by Gary P. Scavone.
diff --git a/doc/html/acknowledge.html b/doc/html/acknowledge.html index 82ed11e..395227a 100644 --- a/doc/html/acknowledge.html +++ b/doc/html/acknowledge.html @@ -11,6 +11,8 @@

Acknowledgements

Many thanks to the following people for providing bug fixes and improvements: