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

minimodem: do not do interactive signal handling with --tx --file

This commit is contained in:
Kamal Mostafa 2011-07-15 20:37:13 -07:00
parent e5e620ed95
commit 777b57dd3a
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/minimodem.c
View File

@ -119,6 +119,7 @@ tx_stop_transmit_sighandler( int sig )
*/ */
static void fsk_transmit_stdin( static void fsk_transmit_stdin(
simpleaudio *sa_out, simpleaudio *sa_out,
int tx_interactive,
float data_rate, float data_rate,
float bfsk_mark_f, float bfsk_mark_f,
float bfsk_space_f, float bfsk_space_f,
@ -138,15 +139,17 @@ static void fsk_transmit_stdin(
// one-shot // one-shot
struct itimerval itv = { struct itimerval itv = {
{0, 0}, // it_interval {0, 0}, // it_interval
{0, 1000000/(data_rate+data_rate*0.03) } // it_value {0, 1000000/(float)(data_rate+data_rate*0.03) } // it_value
}; };
signal(SIGALRM, tx_stop_transmit_sighandler); if ( tx_interactive )
signal(SIGALRM, tx_stop_transmit_sighandler);
tx_transmitting = 0; tx_transmitting = 0;
while ( (c = getchar()) != EOF ) while ( (c = getchar()) != EOF )
{ {
setitimer(ITIMER_REAL, NULL, NULL); if ( tx_interactive )
setitimer(ITIMER_REAL, NULL, NULL);
// fprintf(stderr, "<c=%d>", c); // fprintf(stderr, "<c=%d>", c);
unsigned int nwords; unsigned int nwords;
@ -173,9 +176,13 @@ static void fsk_transmit_stdin(
bit_nsamples * bfsk_txstopbits); // stop bit_nsamples * bfsk_txstopbits); // stop
} }
setitimer(ITIMER_REAL, &itv, NULL); if ( tx_interactive )
setitimer(ITIMER_REAL, &itv, NULL);
}
if ( tx_interactive ) {
setitimer(ITIMER_REAL, NULL, NULL);
signal(SIGALRM, SIG_DFL);
} }
setitimer(ITIMER_REAL, NULL, NULL);
if ( !tx_transmitting ) if ( !tx_transmitting )
return; return;
@ -463,8 +470,10 @@ main( int argc, char*argv[] )
if ( TX_mode ) { if ( TX_mode ) {
simpleaudio *sa_out = NULL; simpleaudio *sa_out = NULL;
int tx_interactive = 1;
if ( filename ) { if ( filename ) {
tx_interactive = 0;
sa_out = simpleaudio_open_stream_sndfile(SA_STREAM_PLAYBACK, sa_out = simpleaudio_open_stream_sndfile(SA_STREAM_PLAYBACK,
filename); filename);
if ( ! sa_out ) if ( ! sa_out )
@ -476,7 +485,7 @@ main( int argc, char*argv[] )
if ( ! sa_out ) if ( ! sa_out )
return 1; return 1;
fsk_transmit_stdin(sa_out, fsk_transmit_stdin(sa_out, tx_interactive,
bfsk_data_rate, bfsk_data_rate,
bfsk_mark_f, bfsk_space_f, bfsk_mark_f, bfsk_space_f,
bfsk_n_data_bits, bfsk_n_data_bits,