diff audio/AudioCallbackPlaySource.cpp @ 514:68ab0fe3bce4 3.0-integration

Merge from branch "tony-2.0-integration"
author Chris Cannam
date Thu, 04 Feb 2016 11:19:01 +0000
parents 83c60632bac0
children 0d5c3abc9658
line wrap: on
line diff
--- a/audio/AudioCallbackPlaySource.cpp	Fri Jan 22 13:39:45 2016 +0000
+++ b/audio/AudioCallbackPlaySource.cpp	Thu Feb 04 11:19:01 2016 +0000
@@ -35,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;
@@ -414,8 +414,6 @@
 void
 AudioCallbackPlaySource::play(sv_frame_t startFrame)
 {
-    if (m_target) m_target->resume();
-    
     if (!m_sourceSampleRate) {
         cerr << "AudioCallbackPlaySource::play: No source sample rate available, not playing" << endl;
         return;
@@ -526,8 +524,6 @@
                        (m_lastCurrentFrame, m_sourceSampleRate).toText().c_str()));
     }
     m_lastCurrentFrame = 0;
-
-    if (m_target) m_target->suspend();
 }
 
 void