Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30460/src
Modified Files:
AudioIO.cpp AudioIO.h
Log Message:
Make the functions in AudioIO that were static (before I messed them up) static
again
Index: AudioIO.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudioIO.cpp,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- AudioIO.cpp 8 Nov 2009 02:30:45 -0000 1.231
+++ AudioIO.cpp 8 Nov 2009 05:18:41 -0000 1.232
@@ -101,6 +101,13 @@
// static
int AudioIO::mNextStreamToken = 0;
+int AudioIO::mCachedPlaybackIndex = -1;
+wxArrayLong AudioIO::mCachedPlaybackRates;
+int AudioIO::mCachedCaptureIndex = -1;
+wxArrayLong AudioIO::mCachedCaptureRates;
+wxArrayLong AudioIO::mCachedSampleRates;
+double AudioIO::mCachedBestRateIn = 0.0;
+double AudioIO::mCachedBestRateOut;
const int AudioIO::StandardRates[] = {
8000,
@@ -277,10 +284,6 @@
mUpdateMeters = false;
mUpdatingMeters = false;
- mCachedPlaybackIndex = -1;
- mCachedCaptureIndex = -1;
- mCachedBestRateIn = 0.0;
-
PaError err = Pa_Initialize();
if (err != paNoError) {
Index: AudioIO.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudioIO.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- AudioIO.h 8 Nov 2009 02:30:45 -0000 1.80
+++ AudioIO.h 8 Nov 2009 05:18:41 -0000 1.81
@@ -198,8 +198,8 @@
* You may also specify a rate for which to check in addition to the
* standard rates.
*/
- wxArrayLong GetSupportedPlaybackRates(int DevIndex = -1,
- double rate = 0.0);
+ static wxArrayLong GetSupportedPlaybackRates(int DevIndex = -1,
+ double rate = 0.0);
/** \brief Get a list of sample rates the input (recording) device
* supports.
@@ -213,8 +213,8 @@
* You may also specify a rate for which to check in addition to the
* standard rates.
*/
- wxArrayLong GetSupportedCaptureRates(int devIndex = -1,
- double rate = 0.0);
+ static wxArrayLong GetSupportedCaptureRates(int devIndex = -1,
+ double rate = 0.0);
/** \brief Get a list of sample rates the current input/output device
* combination supports.
@@ -230,8 +230,8 @@
* You may also specify a rate for which to check in addition to the
* standard rates.
*/
- wxArrayLong GetSupportedSampleRates(int playDevice = -1,
- int recDevice = -1,
+ static wxArrayLong GetSupportedSampleRates(int playDevice = -1,
+ int recDevice = -1,
double rate = 0.0);
/** \brief Get a supported sample rate which can be used a an optimal
@@ -242,7 +242,7 @@
* for project rates if one cannot be retrieved from the preferences.
* So all in all not that useful or important really
*/
- int GetOptimalSupportedSampleRate();
+ static int GetOptimalSupportedSampleRate();
/** \brief The time the stream has been playing for
*
@@ -502,13 +502,13 @@
TimeTrack *mTimeTrack;
// For cacheing supported sample rates
- int mCachedPlaybackIndex;
- wxArrayLong mCachedPlaybackRates;
- int mCachedCaptureIndex;
- wxArrayLong mCachedCaptureRates;
- wxArrayLong mCachedSampleRates;
- double mCachedBestRateIn;
- double mCachedBestRateOut;
+ static int mCachedPlaybackIndex;
+ static wxArrayLong mCachedPlaybackRates;
+ static int mCachedCaptureIndex;
+ static wxArrayLong mCachedCaptureRates;
+ static wxArrayLong mCachedSampleRates;
+ static double mCachedBestRateIn;
+ static double mCachedBestRateOut;
/** brief The function which is called from PortAudio's callback thread
* context to collect and deliver audio for / from the sound device.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
