default Sample Rate to PA default (most likely 44100 Hz), Bug #1087002

mixxxdj · Jan 15, 2013 · c1d37e8 · c1d37e8
1 parent 345fa60
commit c1d37e8
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 13 deletions.
diff --git a/mixxx/src/sounddevice.h b/mixxx/src/sounddevice.h
@@ -48,6 +48,7 @@ class SoundDevice
         virtual int open() = 0;
         virtual int close() = 0;
         virtual QString getError() const = 0;
+        virtual unsigned int getDefaultSampleRate() const = 0;
         int getNumOutputChannels() const;     
         int getNumInputChannels() const;
         SoundDeviceError addOutput(const AudioOutput &out);

diff --git a/mixxx/src/sounddeviceportaudio.h b/mixxx/src/sounddeviceportaudio.h
@@ -48,6 +48,9 @@ class SoundDevicePortAudio : public SoundDevice
                 float *output, short *in,
                 const PaStreamCallbackTimeInfo *timeInfo,
                 PaStreamCallbackFlags statusFlags);
+        virtual unsigned int getDefaultSampleRate() const {
+            return (unsigned int)m_deviceInfo->defaultSampleRate;
+        }
     private:
         /** PortAudio stream for this device. */
         PaStream *m_pStream;

diff --git a/mixxx/src/soundmanager.cpp b/mixxx/src/soundmanager.cpp
@@ -429,13 +429,12 @@ void SoundManager::checkConfig() {
         m_config.loadDefaults(this, SoundManagerConfig::API | SoundManagerConfig::DEVICES);
     }
     if (!m_config.checkSampleRate(*this)) {
-        m_config.setSampleRate(SoundManagerConfig::kDefaultSampleRate);
+        m_config.setSampleRate(SoundManagerConfig::kFallbackSampleRate);
         m_config.loadDefaults(this, SoundManagerConfig::OTHER);
     }
     // latency checks itself for validity on SMConfig::setLatency()
 }
 
-
 QHash<AudioOutput, const CSAMPLE*> SoundManager::requestBuffer(
     QList<AudioOutput> outputs, unsigned long iFramesPerBuffer,
     SoundDevice* device, double streamTime /* = 0 */) {

diff --git a/mixxx/src/soundmanagerconfig.cpp b/mixxx/src/soundmanagerconfig.cpp
@@ -23,14 +23,15 @@
 const unsigned int SoundManagerConfig::kMaxLatency = 7;
 
 const QString SoundManagerConfig::kDefaultAPI = QString("None");
-const unsigned int SoundManagerConfig::kDefaultSampleRate = 48000;
+// Sample Rate even the cheap sound Devices will support most likely
+const unsigned int SoundManagerConfig::kFallbackSampleRate = 48000;
 // latency=5 means about 21 ms of latency which is default in trunk r2453 -- bkgood
 const int SoundManagerConfig::kDefaultLatency = 5;
 
-SoundManagerConfig::SoundManagerConfig()
-    : m_api("None")
-    , m_sampleRate(kDefaultSampleRate)
-    , m_latency(kDefaultLatency) {
+SoundManagerConfig::SoundManagerConfig() : 
+        m_api("None"),
+        m_sampleRate(kFallbackSampleRate),
+        m_latency(kDefaultLatency) {
     m_configFile = QFileInfo(CmdlineArgs::Instance().getSettingsPath() + SOUNDMANAGERCONFIG_FILENAME);
 }
 
@@ -166,7 +167,7 @@ unsigned int SoundManagerConfig::getSampleRate() const {
 
 void SoundManagerConfig::setSampleRate(unsigned int sampleRate) {
     // making sure we don't divide by zero elsewhere
-    m_sampleRate = sampleRate != 0 ? sampleRate : kDefaultSampleRate;
+    m_sampleRate = sampleRate != 0 ? sampleRate : kFallbackSampleRate;
 }
 
 /**
@@ -315,28 +316,35 @@ void SoundManagerConfig::loadDefaults(SoundManager *soundManager, unsigned int f
 #endif
         }
     }
+
+    unsigned int defaultSampleRate = kFallbackSampleRate;
     if (flags & SoundManagerConfig::DEVICES) {
         clearOutputs();
         clearInputs();
         QList<SoundDevice*> outputDevices = soundManager->getDeviceList(m_api, true, false);
         if (!outputDevices.isEmpty()) {
             foreach (SoundDevice *device, outputDevices) {
-                if (device->getNumOutputChannels() < 2) continue;
+                if (device->getNumOutputChannels() < 2) {
+                    continue;
+                }
                 AudioOutput masterOut(AudioPath::MASTER, 0);
                 addOutput(device->getInternalName(), masterOut);
+                defaultSampleRate = device->getDefaultSampleRate();
                 break;
             }
         }
     }
     if (flags & SoundManagerConfig::OTHER) {
         QList<unsigned int> sampleRates = soundManager->getSampleRates(m_api);
-        if (sampleRates.contains(kDefaultSampleRate)) {
-            m_sampleRate = kDefaultSampleRate;
+        if (sampleRates.contains(defaultSampleRate)) {
+            m_sampleRate = defaultSampleRate;
+        } else if (sampleRates.contains(kFallbackSampleRate)) {
+            m_sampleRate = kFallbackSampleRate;
         } else if (!sampleRates.isEmpty()) {
             m_sampleRate = sampleRates.first();
         } else {
             qWarning() << "got empty sample rate list from SoundManager, this is a bug";
-            m_sampleRate = kDefaultSampleRate;
+            m_sampleRate = kFallbackSampleRate;
         }
         m_latency = kDefaultLatency;
     }

diff --git a/mixxx/src/soundmanagerconfig.h b/mixxx/src/soundmanagerconfig.h
@@ -37,7 +37,7 @@ class SoundManagerConfig {
     };
     static const unsigned int kMaxLatency;
     static const QString kDefaultAPI;
-    static const unsigned int kDefaultSampleRate;
+    static const unsigned int kFallbackSampleRate;
     static const int kDefaultLatency;
 
     SoundManagerConfig();