changeset 507:9a125d1c8a22 tony-2.0-integration

Merge from branch "3.0-integration"

--- a/audio/AudioCallbackPlaySource.cpp	Wed Oct 14 10:19:24 2015 +0100
+++ b/audio/AudioCallbackPlaySource.cpp	Wed Oct 14 14:52:46 2015 +0100
@@ -23,6 +23,7 @@
 #include "base/Preferences.h"
 #include "data/model/DenseTimeValueModel.h"
 #include "data/model/WaveFileModel.h"
+#include "data/model/ReadOnlyWaveFileModel.h"
 #include "data/model/SparseOneDimensionalModel.h"
 #include "plugin/RealTimePluginInstance.h"
 
@@ -34,7 +35,7 @@
 #include <iostream>
 #include <cassert>
 
-//#define DEBUG_AUDIO_PLAY_SOURCE 1
+#define DEBUG_AUDIO_PLAY_SOURCE 1
 //#define DEBUG_AUDIO_PLAY_SOURCE_PLAYING 1
 
 static const int DEFAULT_RING_BUFFER_SIZE = 131071;
@@ -78,7 +79,6 @@
     m_stretcherInputSizes(0),
     m_fillThread(0),
     m_converter(0),
-    m_crapConverter(0),
     m_resampleQuality(Preferences::getInstance()->getResampleQuality())
 {
     m_viewManager->setAudioPlaySource(this);
@@ -161,8 +161,8 @@
     bool buffersChanged = false, srChanged = false;
 
     int modelChannels = 1;
-    DenseTimeValueModel *dtvm = dynamic_cast<DenseTimeValueModel *>(model);
-    if (dtvm) modelChannels = dtvm->getChannelCount();
+    ReadOnlyWaveFileModel *rowfm = qobject_cast<ReadOnlyWaveFileModel *>(model);
+    if (rowfm) modelChannels = rowfm->getChannelCount();
     if (modelChannels > m_sourceChannelCount) {
 	m_sourceChannelCount = modelChannels;
     }
@@ -178,24 +178,26 @@
 
     } else if (model->getSampleRate() != m_sourceSampleRate) {
 
-        // If this is a dense time-value model and we have no other, we
-        // can just switch to this model's sample rate
+        // If this is a read-only wave file model and we have no
+        // other, we can just switch to this model's sample rate
 
-        if (dtvm) {
+        if (rowfm) {
 
             bool conflicting = false;
 
             for (std::set<Model *>::const_iterator i = m_models.begin();
                  i != m_models.end(); ++i) {
-                // Only wave file models can be considered conflicting --
-                // writable wave file models are derived and we shouldn't
-                // take their rates into account.  Also, don't give any
-                // particular weight to a file that's already playing at
-                // the wrong rate anyway
-                WaveFileModel *wfm = dynamic_cast<WaveFileModel *>(*i);
-                if (wfm && wfm != dtvm &&
-                    wfm->getSampleRate() != model->getSampleRate() &&
-                    wfm->getSampleRate() == m_sourceSampleRate) {
+                // Only read-only wave file models should be
+                // considered conflicting -- writable wave file models
+                // are derived and we shouldn't take their rates into
+                // account.  Also, don't give any particular weight to
+                // a file that's already playing at the wrong rate
+                // anyway
+                ReadOnlyWaveFileModel *other =
+                    qobject_cast<ReadOnlyWaveFileModel *>(*i);
+                if (other && other != rowfm &&
+                    other->getSampleRate() != model->getSampleRate() &&
+                    other->getSampleRate() == m_sourceSampleRate) {
                     SVDEBUG << "AudioCallbackPlaySource::addModel: Conflicting wave file model " << *i << " found" << endl;
                     conflicting = true;
                     break;
@@ -230,10 +232,11 @@
 
     if (buffersChanged || srChanged) {
 	if (m_converter) {
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+            cerr << "AudioCallbackPlaySource::addModel: Buffers or sample rate changed, deleting existing SR converter" << endl;
+#endif
 	    src_delete(m_converter);
-            src_delete(m_crapConverter);
 	    m_converter = 0;
-            m_crapConverter = 0;
 	}
     }
 
@@ -241,6 +244,8 @@
 
     m_mutex.unlock();
 
+    initialiseConverter();
+    
     m_audioGenerator->setTargetChannelCount(getTargetChannelCount());
 
     if (!m_fillThread) {
@@ -298,10 +303,11 @@
 
     if (m_models.empty()) {
 	if (m_converter) {
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+            cerr << "AudioCallbackPlaySource::removeModel: No models left, deleting SR converter" << endl;
+#endif
 	    src_delete(m_converter);
-            src_delete(m_crapConverter);
 	    m_converter = 0;
-            m_crapConverter = 0;
 	}
 	m_sourceSampleRate = 0;
     }
@@ -340,10 +346,11 @@
     m_models.clear();
 
     if (m_converter) {
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+        cerr << "AudioCallbackPlaySource::clearModels: Deleting SR converter" << endl;
+#endif
 	src_delete(m_converter);
-        src_delete(m_crapConverter);
 	m_converter = 0;
-        m_crapConverter = 0;
     }
 
     m_lastModelEndFrame = 0;
@@ -467,7 +474,6 @@
         }
     }
     if (m_converter) src_reset(m_converter);
-    if (m_crapConverter) src_reset(m_crapConverter);
 
     m_mutex.unlock();
 
@@ -959,11 +965,14 @@
 {
     m_mutex.lock();
 
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+    cerr << "AudioCallbackPlaySource::initialiseConverter(): from "
+         << getSourceSampleRate() << " to " << getTargetSampleRate() << endl;
+#endif
+    
     if (m_converter) {
         src_delete(m_converter);
-        src_delete(m_crapConverter);
         m_converter = 0;
-        m_crapConverter = 0;
     }
 
     if (getSourceSampleRate() != getTargetSampleRate()) {
@@ -976,26 +985,9 @@
                                                        SRC_SINC_MEDIUM_QUALITY,
 			      getTargetChannelCount(), &err);
 
-        if (m_converter) {
-            m_crapConverter = src_new(SRC_LINEAR,
-                                      getTargetChannelCount(),
-                                      &err);
-        }
-
-	if (!m_converter || !m_crapConverter) {
-	    cerr
-		<< "AudioCallbackPlaySource::setModel: ERROR in creating samplerate converter: "
-		<< src_strerror(err) << endl;
-
-            if (m_converter) {
-                src_delete(m_converter);
-                m_converter = 0;
-            } 
-
-            if (m_crapConverter) {
-                src_delete(m_crapConverter);
-                m_crapConverter = 0;
-            }
+	if (!m_converter) {
+	    cerr << "AudioCallbackPlaySource::setModel: ERROR in creating samplerate converter: "
+                 << src_strerror(err) << endl;
 
             m_mutex.unlock();
 
@@ -1435,11 +1427,7 @@
     sv_frame_t generatorBlockSize = m_audioGenerator->getBlockSize();
 
     if (resample && !m_converter) {
-	static bool warned = false;
-	if (!warned) {
-	    cerr << "WARNING: sample rates differ, but no converter available!" << endl;
-	    warned = true;
-	}
+        throw std::logic_error("Sample rates differ, but no converter available!");
     }
 
     if (resample && m_converter) {
@@ -1503,16 +1491,7 @@
 	data.src_ratio = ratio;
 	data.end_of_input = 0;
 	
-	int err = 0;
-
-        if (m_timeStretcher && m_timeStretcher->getTimeRatio() < 0.4) {
-#ifdef DEBUG_AUDIO_PLAY_SOURCE
-            cout << "Using crappy converter" << endl;
-#endif
-            err = src_process(m_crapConverter, &data);
-        } else {
-            err = src_process(m_converter, &data);
-        }
+	int err = src_process(m_converter, &data);
 
 	sv_frame_t toCopy = sv_frame_t(double(got) * ratio + 0.1);
 

--- a/audio/AudioCallbackPlaySource.h	Wed Oct 14 10:19:24 2015 +0100
+++ b/audio/AudioCallbackPlaySource.h	Wed Oct 14 14:52:46 2015 +0100
@@ -396,7 +396,6 @@
     QWaitCondition m_condition;
     FillThread *m_fillThread;
     SRC_STATE *m_converter;
-    SRC_STATE *m_crapConverter; // for use when playing very fast
     int m_resampleQuality;
     void initialiseConverter();
 };

--- a/audio/AudioRecordTarget.cpp	Wed Oct 14 10:19:24 2015 +0100
+++ b/audio/AudioRecordTarget.cpp	Wed Oct 14 14:52:46 2015 +0100
@@ -19,14 +19,11 @@
 
 #include "data/model/WritableWaveFileModel.h"
 
-#include <bqaudioio/SystemRecordSource.h>
-
 #include <QDir>
 
 AudioRecordTarget::AudioRecordTarget(ViewManagerBase *manager,
 				     QString clientName) :
     m_viewManager(manager),
-    m_source(0),
     m_clientName(clientName.toUtf8().data()),
     m_recording(false),
     m_recordSampleRate(44100),

--- a/audio/AudioRecordTarget.h	Wed Oct 14 10:19:24 2015 +0100
+++ b/audio/AudioRecordTarget.h	Wed Oct 14 14:52:46 2015 +0100
@@ -41,8 +41,6 @@
     virtual int getApplicationSampleRate() const { return 0; } // don't care
     virtual int getApplicationChannelCount() const { return 2; }
 
-    virtual void setSystemRecordSource(breakfastquay::SystemRecordSource *);
-
     virtual void setSystemRecordBlockSize(int);
     virtual void setSystemRecordSampleRate(int);
     virtual void setSystemRecordLatency(int);
@@ -69,7 +67,6 @@
     
 private:
     ViewManagerBase *m_viewManager;
-    breakfastquay::SystemRecordSource *m_source;
     std::string m_clientName;
     bool m_recording;
     sv_samplerate_t m_recordSampleRate;

--- a/framework/MainWindowBase.cpp	Wed Oct 14 10:19:24 2015 +0100
+++ b/framework/MainWindowBase.cpp	Wed Oct 14 14:52:46 2015 +0100
@@ -2200,7 +2200,6 @@
             createCallbackIO(m_recordTarget, m_playSource);
         m_audioIO->suspend(); // start in suspended state
         m_playSource->setSystemPlaybackTarget(m_audioIO);
-        m_recordTarget->setSystemRecordSource(m_audioIO);
     } else {
         m_playTarget = breakfastquay::AudioFactory::
             createCallbackPlayTarget(m_playSource);
@@ -2702,15 +2701,6 @@
         }
     }
 
-    QAction *action = qobject_cast<QAction *>(sender());
-    
-    if (m_audioRecordMode == RecordReplaceSession) {
-        if (!checkSaveModified()) {
-            if (action) action->setChecked(false);
-            return;
-        }
-    }
-
     m_audioIO->resume();
     WritableWaveFileModel *model = m_recordTarget->startRecording();
     if (!model) {