yafox
/
minimodem-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minimodem: --alsa[=plughw:X,Y]

This commit is contained in:
Kamal Mostafa 2012-09-09 15:24:35 -07:00
parent 5ee6a23c42
commit d603fc444d
3 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/minimodem.1.in
View File

@ -110,9 +110,12 @@ Do not report CARRIER / NOCARRIER or signal analysis metrics.
.B \-R, \-\-samplerate {rate}
Set the audio sample rate (default rate is 48000 Hz).
.TP
.B \-A, \-\-alsa
.B \-A, \-\-alsa[={plughw:X,Y | X,Y | X }]
Use ALSA as the audio output system instead of the default
PulseAudio (depending on build configuration options).
PulseAudio (depending on build configuration options). The ALSA
device alias "default" is used, if a specific device is not specified.
For example, the following options all select ALSA device #1, sub-device #0:
\-\-alsa=plughw:1,0 \-\-alsa=1,0 \-A1
.TP
.B \-\-lut={tx_sin_table_len}
Minimodem uses a precomputed sine wave lookup table of 1024 elements,

27
src/minimodem.c
View File

@ -217,7 +217,7 @@ benchmarks()
// enable the sine wave LUT
simpleaudio_tone_init(1024, 1.0);
sa_out = simpleaudio_open_stream(backend, SA_STREAM_PLAYBACK,
sa_out = simpleaudio_open_stream(backend, NULL, SA_STREAM_PLAYBACK,
SA_SAMPLE_FORMAT_S16, sample_rate, 1,
program_name, "generate-tones-lut1024-S16-mono");
if ( ! sa_out )
@ -225,7 +225,7 @@ benchmarks()
generate_test_tones(sa_out, 10);
simpleaudio_close(sa_out);
sa_out = simpleaudio_open_stream(backend, SA_STREAM_PLAYBACK,
sa_out = simpleaudio_open_stream(backend, NULL, SA_STREAM_PLAYBACK,
SA_SAMPLE_FORMAT_FLOAT, sample_rate, 1,
program_name, "generate-tones-lut1024-FLOAT-mono");
if ( ! sa_out )
@ -237,7 +237,7 @@ benchmarks()
// disable the sine wave LUT
simpleaudio_tone_init(0, 1.0);
sa_out = simpleaudio_open_stream(backend, SA_STREAM_PLAYBACK,
sa_out = simpleaudio_open_stream(backend, NULL, SA_STREAM_PLAYBACK,
SA_SAMPLE_FORMAT_S16, sample_rate, 1,
program_name, "generate-tones-nolut-S16-mono");
if ( ! sa_out )
@ -245,7 +245,7 @@ benchmarks()
generate_test_tones(sa_out, 10);
simpleaudio_close(sa_out);
sa_out = simpleaudio_open_stream(backend, SA_STREAM_PLAYBACK,
sa_out = simpleaudio_open_stream(backend, NULL, SA_STREAM_PLAYBACK,
SA_SAMPLE_FORMAT_FLOAT, sample_rate, 1,
program_name, "generate-tones-nolut-FLOAT-mono");
if ( ! sa_out )
@ -296,7 +296,7 @@ usage()
" -q, --quiet\n"
" -R, --samplerate {rate}\n"
" -V, --version\n"
" -A, --alsa\n"
" -A, --alsa[=plughw:X,Y]\n"
" --lut={tx_sin_table_len}\n"
" --float-samples\n"
" --rx-one\n"
@ -348,6 +348,7 @@ main( int argc, char*argv[] )
// float fsk_confidence_search_limit = INFINITY; /* for test */
sa_backend_t sa_backend = SA_BACKEND_SYSDEFAULT;
char *sa_backend_device = NULL;
sa_format_t sample_format = SA_SAMPLE_FORMAT_S16;
unsigned int sample_rate = 48000;
unsigned int nchannels = 1; // FIXME: only works with one channel
@ -414,7 +415,7 @@ main( int argc, char*argv[] )
{ "stopbits", 1, 0, MINIMODEM_OPT_STOPBITS },
{ "sync-byte", 1, 0, MINIMODEM_OPT_SYNC_BYTE },
{ "quiet", 0, 0, 'q' },
{ "alsa", 0, 0, 'A' },
{ "alsa", 2, 0, 'A' },
{ "samplerate", 1, 0, 'R' },
{ "lut", 1, 0, MINIMODEM_OPT_LUT },
{ "float-samples", 0, 0, MINIMODEM_OPT_FLOAT_SAMPLES },
@ -424,7 +425,7 @@ main( int argc, char*argv[] )
{ "Xrxnoise", 1, 0, MINIMODEM_OPT_XRXNOISE },
{ 0 }
};
c = getopt_long(argc, argv, "Vtrc:l:ai85f:b:v:M:S:T:qAR:",
c = getopt_long(argc, argv, "Vtrc:l:ai85f:b:v:M:S:T:qA::R:",
long_options, &option_index);
if ( c == -1 )
break;
@ -504,6 +505,8 @@ main( int argc, char*argv[] )
case 'A':
#if USE_ALSA
sa_backend = SA_BACKEND_ALSA;
if ( optarg )
sa_backend_device = optarg;
#else
fprintf(stderr, "E: This build of minimodem was configured without alsa support.\n");
exit(1);
@ -667,11 +670,11 @@ main( int argc, char*argv[] )
if ( fsk_confidence_search_limit < fsk_confidence_threshold )
fsk_confidence_search_limit = fsk_confidence_threshold;
char *stream_name = NULL;;
char *stream_name = NULL;
if ( filename ) {
sa_backend = SA_BACKEND_FILE;
stream_name = filename;
sa_backend_device = filename;
}
/*
@ -688,7 +691,8 @@ main( int argc, char*argv[] )
}
simpleaudio *sa_out;
sa_out = simpleaudio_open_stream(sa_backend, SA_STREAM_PLAYBACK,
sa_out = simpleaudio_open_stream(sa_backend, sa_backend_device,
SA_STREAM_PLAYBACK,
sample_format, sample_rate, nchannels,
program_name, stream_name);
if ( ! sa_out )
@ -716,7 +720,8 @@ main( int argc, char*argv[] )
stream_name = "input audio";
simpleaudio *sa;
sa = simpleaudio_open_stream(sa_backend, SA_STREAM_RECORD,
sa = simpleaudio_open_stream(sa_backend, sa_backend_device,
SA_STREAM_RECORD,
sample_format, sample_rate, nchannels,
program_name, stream_name);
if ( ! sa )

16
src/simpleaudio-alsa.c
View File

@ -107,11 +107,21 @@ sa_alsa_open_stream(
snd_pcm_t *pcm;
int error;
if ( ! backend_device )
backend_device = "default";
char *be_device;
if ( ! backend_device ) {
be_device = "default";
} else {
be_device = alloca(32);
if ( strchr(backend_device, ':') )
snprintf(be_device, 32, "%s", backend_device);
else if ( strchr(backend_device, ',') )
snprintf(be_device, 32, "plughw:%s", backend_device);
else
snprintf(be_device, 32, "plughw:%s,0", backend_device);
}
error = snd_pcm_open(&pcm,
backend_device,
be_device,
sa_stream_direction == SA_STREAM_RECORD ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK,
0 /*mode*/);
if (error) {