[Commit-gnuradio] r3511 - gnuradio/trunk/gr-audio-portaudio/src

[eb]

Author: eb
Date: 2006-09-10 12:14:55 -0600 (Sun, 10 Sep 2006)
New Revision: 3511

Modified:
   gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.cc
   gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.cc
Log:
fixed ticket:46 by applying Don's patch

Modified: gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.cc
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.cc       
2006-09-09 22:14:17 UTC (rev 3510)
+++ gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_sink.cc       
2006-09-10 18:14:55 UTC (rev 3511)
@@ -176,16 +176,21 @@
     for (i=0;i<numDevices;i++) {
       deviceInfo = Pa_GetDeviceInfo( i );
       fprintf(stderr,"Testing device name: %s",deviceInfo->name);
+      if (deviceInfo->maxOutputChannels <= 0) {
+       fprintf(stderr,"\n");
+       continue;
+      }
       if (strstr(deviceInfo->name, d_device_name.c_str())){
        fprintf(stderr,"  Chosen!\n");
-       device = gri_pa_find_device_by_name(deviceInfo->name);
+       device = i;
        fprintf(stderr,"%s using %s as the host\n",d_device_name.c_str(),
                Pa_GetHostApiInfo(deviceInfo->hostApi)->name), fflush(stderr);
        found = true;
        deviceInfo = Pa_GetDeviceInfo(device);
        i = numDevices;         // force loop exit
       }
-      fprintf(stderr,"\n"),fflush(stderr);
+      else
+       fprintf(stderr,"\n"),fflush(stderr);
     }
 
     if (!found){

Modified: gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.cc
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.cc     
2006-09-09 22:14:17 UTC (rev 3510)
+++ gnuradio/trunk/gr-audio-portaudio/src/audio_portaudio_source.cc     
2006-09-10 18:14:55 UTC (rev 3511)
@@ -102,7 +102,7 @@
       self->d_log->printf("PAsrc  cb: f/b = %4ld OVERRUN\n", framesPerBuffer);
 
     self->d_noverruns++;
-    ::write(2, "aU", 2);       // FIXME change to non-blocking call
+    ::write(2, "aO", 2);       // FIXME change to non-blocking call
 
 #if 0
     // copy any frames that will fit
@@ -181,16 +181,21 @@
     for (i=0;i<numDevices;i++) {
       deviceInfo = Pa_GetDeviceInfo( i );
       fprintf(stderr,"Testing device name: %s",deviceInfo->name);
+      if (deviceInfo->maxInputChannels <= 0) {
+       fprintf(stderr,"\n");
+       continue;
+      }
       if (strstr(deviceInfo->name, d_device_name.c_str())){
        fprintf(stderr,"  Chosen!\n");
-       device = gri_pa_find_device_by_name(deviceInfo->name);
+       device = i;
        fprintf(stderr,"%s using %s as the host\n",d_device_name.c_str(),
                Pa_GetHostApiInfo(deviceInfo->hostApi)->name), fflush(stderr);
        found = true;
        deviceInfo = Pa_GetDeviceInfo(device);
        i = numDevices;         // force loop exit
       }
-      fprintf(stderr,"\n"),fflush(stderr);
+      else
+       fprintf(stderr,"\n"),fflush(stderr);
     }
 
     if (!found){