From 45246fd39baa680b1f0f9381e0e1d8f092513b1e Mon Sep 17 00:00:00 2001
From: "rafael@riseup.net"
 <rafael@riseup.net@caa462fc-51d2-11de-8b28-e1b452efc53a>
Date: Sat, 18 May 2013 05:57:40 +0000
Subject: [PATCH] fix for pulseaudio

---
 darkice/trunk/src/PulseAudioDspSource.cpp | 36 ++++++++++++++++-------
 darkice/trunk/src/PulseAudioDspSource.h   |  1 +
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/darkice/trunk/src/PulseAudioDspSource.cpp b/darkice/trunk/src/PulseAudioDspSource.cpp
index 3b76afd..0f24014 100644
--- a/darkice/trunk/src/PulseAudioDspSource.cpp
+++ b/darkice/trunk/src/PulseAudioDspSource.cpp
@@ -88,6 +88,8 @@ PulseAudioDspSource :: init (  const char      * paSourceName )    throw ( Excep
     }
     ss.channels = getChannel();
     ss.rate = getSampleRate();
+
+    running = 0;
     
     //Supported for some bits per sample, both Big and Little endian
     if (isBigEndian())
@@ -153,6 +155,7 @@ PulseAudioDspSource :: strip ( void )                      throw ( Exception )
 bool
 PulseAudioDspSource :: open ( void )                       throw ( Exception )
 {
+  
     char         client_name[255];
 
     //to identify each darkice on pulseaudio server
@@ -162,6 +165,8 @@ PulseAudioDspSource :: open ( void )                       throw ( Exception )
         throw Exception( __FILE__, __LINE__, ": pa_simple_new() failed: %s\n", pa_strerror(error));
     }
 
+    running = 1;
+  
     return true;
 }
 
@@ -173,17 +178,27 @@ bool
 PulseAudioDspSource :: canRead ( unsigned int    sec,
                            unsigned int    usec )    throw ( Exception )
 {
-//this seems to be a problem. 
-//to explore in the future
-/*    if ( !isOpen() ) {
+  
+  /** Strange have to remove this, need to investigate... */
+  /*  if ( !isOpen() ) {
         return false;
-    }
-*/
+      }
+  */
 
-    /*
-     * FIXME How to check if it can read?
-     */
-    return true; // bad!!
+    if (running == 0) {
+      char         client_name[255];
+      
+      //to identify each darkice on pulseaudio server
+      snprintf(client_name, 255, "darkice-%d", getpid());
+      
+      if (!(s = pa_simple_new(NULL, client_name, PA_STREAM_RECORD, sourceName, "darkice record", &ss, NULL, NULL, &error))) {
+        throw Exception( __FILE__, __LINE__, ": pa_simple_new() failed: %s\n", pa_strerror(error));
+      }
+      
+      running = 1;
+    }
+
+    return true; 
 }
 
 
@@ -195,7 +210,7 @@ PulseAudioDspSource :: read (    void          * buf,
                            unsigned int    len )     throw ( Exception )
 {
     int ret;
-
+    
     ret = pa_simple_read(s, buf, len, &error);
     if ( ret < 0) {
         throw Exception(__FILE__, __LINE__, ": pa_simple_read() failed: %s\n", pa_strerror(error));
@@ -215,6 +230,7 @@ PulseAudioDspSource :: close ( void )                  throw ( Exception )
     }
 
     pa_simple_free(s);
+    running = 0;
 }
 
 #endif // HAVE_PULSEAUDIO_LIB
diff --git a/darkice/trunk/src/PulseAudioDspSource.h b/darkice/trunk/src/PulseAudioDspSource.h
index 2f69e07..f59b7b1 100644
--- a/darkice/trunk/src/PulseAudioDspSource.h
+++ b/darkice/trunk/src/PulseAudioDspSource.h
@@ -87,6 +87,7 @@ class PulseAudioDspSource : public AudioSource, public virtual Reporter
           */
         pa_sample_spec ss;
 
+	int running;
         int error;
 
     protected: