mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-16 18:57:24 -05:00
TCP Audio Retry on Disc; Ncurses Key '8'; #119
This commit is contained in:
@@ -3389,6 +3389,36 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
|||||||
noCarrier(opts, state);
|
noCarrier(opts, state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//attempt retry to TCP Audio server
|
||||||
|
if (c == 56) // '8' key, try audio in type 8 (TCP Audio Server connection) using defaults OR whatever the user last specified
|
||||||
|
{
|
||||||
|
|
||||||
|
opts->tcp_sockfd = Connect(opts->tcp_hostname, opts->tcp_portno);
|
||||||
|
if (opts->tcp_sockfd != 0)
|
||||||
|
{
|
||||||
|
//reset audio input stream
|
||||||
|
opts->audio_in_file_info = calloc(1, sizeof(SF_INFO));
|
||||||
|
opts->audio_in_file_info->samplerate=opts->wav_sample_rate;
|
||||||
|
opts->audio_in_file_info->channels=1;
|
||||||
|
opts->audio_in_file_info->seekable=0;
|
||||||
|
opts->audio_in_file_info->format=SF_FORMAT_RAW|SF_FORMAT_PCM_16|SF_ENDIAN_LITTLE;
|
||||||
|
opts->tcp_file_in = sf_open_fd(opts->tcp_sockfd, SFM_READ, opts->audio_in_file_info, 0);
|
||||||
|
|
||||||
|
if(opts->tcp_file_in == NULL)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "Error, couldn't Connect to TCP with libsndfile: %s\n", sf_strerror(NULL));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//close pulse input if it is currently open
|
||||||
|
if (opts->audio_in_type == 0) closePulseInput(opts);
|
||||||
|
fprintf (stderr, "TCP Socket Connected Successfully.\n");
|
||||||
|
opts->audio_in_type = 8;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else fprintf (stderr, "TCP Socket Connection Error.\n");
|
||||||
|
}
|
||||||
|
|
||||||
//anything with an entry box will need the inputs and outputs stopped first
|
//anything with an entry box will need the inputs and outputs stopped first
|
||||||
//so probably just write a function to handle c input, and when c = certain values
|
//so probably just write a function to handle c input, and when c = certain values
|
||||||
//needing an entry box, then stop all of those
|
//needing an entry box, then stop all of those
|
||||||
|
|||||||
@@ -142,16 +142,49 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
//tcp socket input from SDR++
|
//tcp socket input from SDR++
|
||||||
else if (opts->audio_in_type == 8)
|
else if (opts->audio_in_type == 8)
|
||||||
{
|
{
|
||||||
result = sf_read_short(opts->tcp_file_in, &sample, 1);
|
result = sf_read_short(opts->tcp_file_in, &sample, 1);
|
||||||
if(result == 0) {
|
if(result == 0) {
|
||||||
sf_close(opts->tcp_file_in);
|
fprintf (stderr, "\nConnection to TCP Server Interrupted. Trying again in 3 seconds.\n");
|
||||||
opts->audio_in_type = 0; //set input type
|
sample = 0;
|
||||||
openPulseInput(opts); //open pulse inpput
|
sf_close(opts->tcp_file_in); //close current connection on this end
|
||||||
sample = 0; //zero sample on bad result, keep the ball rolling
|
sleep (3); //halt all processing and wait 3 seconds
|
||||||
fprintf (stderr, "Connection to TCP Server Disconnected.\n");
|
|
||||||
|
//attempt to reconnect to socket
|
||||||
|
opts->tcp_sockfd = 0;
|
||||||
|
opts->tcp_sockfd = Connect(opts->tcp_hostname, opts->tcp_portno);
|
||||||
|
if (opts->tcp_sockfd != 0)
|
||||||
|
{
|
||||||
|
//reset audio input stream
|
||||||
|
opts->audio_in_file_info = calloc(1, sizeof(SF_INFO));
|
||||||
|
opts->audio_in_file_info->samplerate=opts->wav_sample_rate;
|
||||||
|
opts->audio_in_file_info->channels=1;
|
||||||
|
opts->audio_in_file_info->seekable=0;
|
||||||
|
opts->audio_in_file_info->format=SF_FORMAT_RAW|SF_FORMAT_PCM_16|SF_ENDIAN_LITTLE;
|
||||||
|
opts->tcp_file_in = sf_open_fd(opts->tcp_sockfd, SFM_READ, opts->audio_in_file_info, 0);
|
||||||
|
|
||||||
|
if(opts->tcp_file_in == NULL)
|
||||||
|
{
|
||||||
|
fprintf(stderr, "Error, couldn't Reconnect to TCP with libsndfile: %s\n", sf_strerror(NULL));
|
||||||
|
}
|
||||||
|
else fprintf (stderr, "TCP Socket Reconnected Successfully.\n");
|
||||||
|
}
|
||||||
|
else fprintf (stderr, "TCP Socket Connection Error.\n");
|
||||||
|
|
||||||
|
//now retry reading sample
|
||||||
|
result = sf_read_short(opts->tcp_file_in, &sample, 1);
|
||||||
|
if (result == 0) {
|
||||||
|
sf_close(opts->tcp_file_in);
|
||||||
|
opts->audio_in_type = 0; //set input type
|
||||||
|
opts->tcp_sockfd = 0; //added this line so we will know if it connected when using ncurses terminal keyboard shortcut
|
||||||
|
openPulseInput(opts); //open pulse inpput
|
||||||
|
sample = 0; //zero sample on bad result, keep the ball rolling
|
||||||
|
fprintf (stderr, "Connection to TCP Server Disconnected.\n");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//UDP Socket input...not working correct. Reads samples, but no sync
|
//UDP Socket input...not working correct. Reads samples, but no sync
|
||||||
|
|||||||
Reference in New Issue
Block a user