comparison audioio/AudioPulseAudioTarget.cpp @ 195:d9c21e7bff21

* Some debug, turn off PulseAudio autospawn

 
 #include <iostream>
 #include <cassert>
 #include <cmath>
 
-//#define DEBUG_AUDIO_PULSE_AUDIO_TARGET 1
+#define DEBUG_AUDIO_PULSE_AUDIO_TARGET 1
+//#define DEBUG_AUDIO_PULSE_AUDIO_TARGET_PLAY 1
 
 AudioPulseAudioTarget::AudioPulseAudioTarget(AudioCallbackPlaySource *source) :
     AudioCallbackPlayTarget(source),
     m_mutex(QMutex::Recursive),
     m_loop(0),

     }
     m_spec.rate = m_sampleRate;
     m_spec.channels = 2;
     m_spec.format = PA_SAMPLE_FLOAT32NE;
 
+#ifdef DEBUG_AUDIO_PULSE_AUDIO_TARGET
+    std::cerr << "AudioPulseAudioTarget: Creating context" << std::endl;
+#endif
+
     m_context = pa_context_new(m_api, source->getClientName().toLocal8Bit().data());
     if (!m_context) {
         std::cerr << "ERROR: AudioPulseAudioTarget: Failed to create context object" << std::endl;
         return;
     }
 
     pa_context_set_state_callback(m_context, contextStateChangedStatic, this);
 
-    pa_context_connect(m_context, 0, (pa_context_flags_t)0, 0); // default server
+#ifdef DEBUG_AUDIO_PULSE_AUDIO_TARGET
+    std::cerr << "AudioPulseAudioTarget: Connecting to default server..." << std::endl;
+#endif
+
+    pa_context_connect(m_context, 0, // default server
+                       (pa_context_flags_t)PA_CONTEXT_NOAUTOSPAWN, 0);
+
+#ifdef DEBUG_AUDIO_PULSE_AUDIO_TARGET
+    std::cerr << "AudioPulseAudioTarget: Starting main loop" << std::endl;
+#endif
 
     m_loopThread = new MainLoopThread(m_loop);
     m_loopThread->start();
 
 #ifdef DEBUG_PULSE_AUDIO_TARGET

 }
 
 void
 AudioPulseAudioTarget::streamWrite(size_t requested)
 {
-#ifdef DEBUG_AUDIO_PULSE_AUDIO_TARGET    
+#ifdef DEBUG_AUDIO_PULSE_AUDIO_TARGET_PLAY
     std::cout << "AudioPulseAudioTarget::streamWrite(" << requested << ")" << std::endl;
 #endif
     if (m_done) return;
 
     QMutexLocker locker(&m_mutex);

 
     if (nframes > m_bufferSize) {
         std::cerr << "WARNING: AudioPulseAudioTarget::streamWrite: nframes " << nframes << " > m_bufferSize " << m_bufferSize << std::endl;
     }
 
-#ifdef DEBUG_AUDIO_PULSE_AUDIO_TARGET
+#ifdef DEBUG_AUDIO_PULSE_AUDIO_TARGET_PLAY
     std::cout << "AudioPulseAudioTarget::streamWrite: nframes = " << nframes << std::endl;
 #endif
 
     if (!tmpbuf || tmpbufch != sourceChannels || int(tmpbufsz) < nframes) {
 

         output = new float[tmpbufsz * tmpbufch];
     }
 	
     size_t received = m_source->getSourceSamples(nframes, tmpbuf);
 
-#ifdef DEBUG_AUDIO_PULSE_AUDIO_TARGET
+#ifdef DEBUG_AUDIO_PULSE_AUDIO_TARGET_PLAY
     std::cerr << "requested " << nframes << ", received " << received << std::endl;
 
     if (received < nframes) {
         std::cerr << "*** WARNING: Wrong number of frames received" << std::endl;
     }

 
 	if (ch == 0) peakLeft = peak;
 	if (ch > 0 || sourceChannels == 1) peakRight = peak;
     }
 
-#ifdef DEBUG_AUDIO_PULSE_AUDIO_TARGET
+#ifdef DEBUG_AUDIO_PULSE_AUDIO_TARGET_PLAY
     std::cerr << "calling pa_stream_write with "
               << nframes * tmpbufch * sizeof(float) << " bytes" << std::endl;
 #endif
 
     pa_stream_write(m_stream, output, nframes * tmpbufch * sizeof(float),