Merge 0281af7ac0 into 7088804826

hsmodem/hsmodem.cpp

@@ -390,14 +390,14 @@ void startModem()
     }
 
     // int TX audio and modulator
-    io_capidx = kmaudio_startCapture(captureDeviceName, caprate);
+    io_capidx = kmaudio_startCapture(captureDeviceName, caprate, "Modem RX");
     if (io_capidx == -1)
     {
         printf("CAP: cannot open device: %s\n", captureDeviceName);
         return;
     }
     
-    io_pbidx = kmaudio_startPlayback(playbackDeviceName, caprate);
+    io_pbidx = kmaudio_startPlayback(playbackDeviceName, caprate, "Modem TX");
     if (io_pbidx == -1)
     {
         printf("PB: cannot open device: %s\n", playbackDeviceName);
@@ -429,13 +429,13 @@ void initVoice()
         if (VoiceAudioMode == VOICEMODE_LISTENAUDIOIN && caprate == 44100)
             srate = 44100;
 
-        voice_capidx = kmaudio_startCapture(micDeviceName, srate);
+        voice_capidx = kmaudio_startCapture(micDeviceName, srate, "Voice Input");
         if (voice_capidx == -1)
         {
             printf("Voice CAP: cannot open device: %s\n", micDeviceName);
             return;
         }
-        voice_pbidx = kmaudio_startPlayback(lsDeviceName, srate);
+        voice_pbidx = kmaudio_startPlayback(lsDeviceName, srate, "Voice Output");
         if (voice_pbidx == -1)
         {
             printf("Voice PB: cannot open device: %s\n", lsDeviceName);

hsmodem/libkmaudio/libkmaudio.h

@@ -127,14 +127,14 @@ int kmaudio_getDeviceList();
 * starts a capturing stream from devname with samprate
 * returns: id of the capture stream or -1 = error
 */
-int kmaudio_startCapture(char* devname, int samprate);
+int kmaudio_startCapture(char* devname, int samprate, char* description);
 
 /*
 * starts a playback stream to devname with samprate
 * returns: id of the playback stream or -1 = error
 */
 
-int kmaudio_startPlayback(char* devname, int samprate);
+int kmaudio_startPlayback(char* devname, int samprate, char* description);
 
 /* 
 * plays len samples from psamp to device id

hsmodem/libkmaudio/libkmaudio_capture.cpp

@@ -49,7 +49,7 @@ void close_capture_stream(int idx)
 	}
 }
 
-int kmaudio_startCapture(char* devname, int samprate)
+int kmaudio_startCapture(char* devname, int samprate, char* description)
 {
 	printf("Start request for CAP stream:%s\n", devname);
 

hsmodem/libkmaudio/libkmaudio_capture_linux.cpp

@@ -121,7 +121,7 @@ void close_capture_stream(int idx)
     }
 }
 
-int kmaudio_startCapture(char* devname, int samprate)
+int kmaudio_startCapture(char* devname, int samprate, char* description)
 {
     printf("Start request for CAP stream:%s\n", devname);
 
@@ -193,6 +193,7 @@ int kmaudio_startCapture(char* devname, int samprate)
     devlist[idx].instream->read_callback = read_callback;
     devlist[idx].instream->overflow_callback = overflow_callback;
     devlist[idx].instream->userdata = &(devlist[idx].index);
+    devlist[idx].instream->name = description;
 
     int err = 0;
     if ((err = soundio_instream_open(devlist[idx].instream))) {

hsmodem/libkmaudio/libkmaudio_init_linux.cpp

@@ -45,6 +45,7 @@ int kmaudio_init_linux()
         printf("soundio_create: out of memory\n");
         return -1;
     }
+    soundio->app_name = "AMSAT-DL HS Modem";
 
     if ((err = soundio_connect(soundio))) {
         printf("soundio_connect: %s\n", soundio_strerror(err));

hsmodem/libkmaudio/libkmaudio_playback.cpp

@@ -51,7 +51,7 @@ void close_playback_stream(int idx)
 	}
 }
 
-int kmaudio_startPlayback(char* devname, int samprate)
+int kmaudio_startPlayback(char* devname, int samprate, char* description)
 {
 	printf("Start request for PB stream:%s\n", devname);
 

hsmodem/libkmaudio/libkmaudio_playback_linux.cpp

@@ -151,7 +151,7 @@ void close_playback_stream(int idx)
     }
 }
 
-int kmaudio_startPlayback(char* devname, int samprate)
+int kmaudio_startPlayback(char* devname, int samprate, char* description)
 {
     printf("Start request for PB stream:%s\n", devname);
     
@@ -223,6 +223,7 @@ int kmaudio_startPlayback(char* devname, int samprate)
     devlist[idx].outstream->write_callback = write_callback;
     devlist[idx].outstream->underflow_callback = underflow_callback;
     devlist[idx].outstream->userdata = &(devlist[idx].index);
+    devlist[idx].outstream->name = description;
 
     int err = 0;
     if ((err = soundio_outstream_open(devlist[idx].outstream))) {

hsmodem/soundio.cpp

@@ -456,6 +456,7 @@ int io_init_sound(char *pbname, char *capname)
         return 0;
     }
 #endif
+    soundio->app_name = "AMSAT-DL HS Modem";
 
     io_readAudioDevices();
     io_init_pipes();

hsmodem/voiceio.cpp

@@ -235,6 +235,7 @@ int io_init_voice(char* lsname, char* micname)
         return 0;
     }
 #endif
+    voice_soundio->app_name = "AMSAT-DL HS Modem";
 
     if (lsname == NULL || micname == NULL || strlen(lsname) < 3 || strlen(micname) < 3)  // no devices defined yet
     {