diff audioio/AudioCallbackPlaySource.cpp @ 180:98ba77e0d897

* Merge from sv-match-alignment branch (excluding alignment-specific document).
  - add aggregate wave model (not yet complete enough to be added as a true
    model in a layer, but there's potential)
  - add play solo mode
  - add alignment model -- unused in plain SV
  - fix two plugin leaks
  - add m3u playlist support (opens all files at once, potentially hazardous)
  - fix retrieval of pre-encoded URLs
  - add ability to resample audio files on import, so as to match rates with
    other files previously loaded; add preference for same
  - add preliminary support in transform code for range and rate of transform
    input
  - reorganise preferences dialog, move dark-background option to preferences,
    add option for temporary directory location

--- a/audioio/AudioCallbackPlaySource.cpp	Fri Sep 21 09:13:11 2007 +0000
+++ b/audioio/AudioCallbackPlaySource.cpp	Fri Sep 28 13:56:38 2007 +0000
@@ -697,6 +697,20 @@
     if (formerPlugin) m_pluginScavenger.claim(formerPlugin);
 }
 
+void
+AudioCallbackPlaySource::setSoloModelSet(std::set<Model *> s)
+{
+    m_audioGenerator->setSoloModelSet(s);
+    clearRingBuffers();
+}
+
+void
+AudioCallbackPlaySource::clearSoloModelSet()
+{
+    m_audioGenerator->clearSoloModelSet();
+    clearRingBuffers();
+}
+
 size_t
 AudioCallbackPlaySource::getTargetSampleRate() const
 {
@@ -1108,9 +1122,9 @@
 #ifdef DEBUG_AUDIO_PLAY_SOURCE
             std::cout << "Using crappy converter" << std::endl;
 #endif
-            src_process(m_crapConverter, &data);
+            err = src_process(m_crapConverter, &data);
         } else {
-            src_process(m_converter, &data);
+            err = src_process(m_converter, &data);
         }
 
 	size_t toCopy = size_t(got * ratio + 0.1);