GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-14 09:37:36 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Merge branch 'master' into #66_remove_loggers_and_recorders_between_channel_restarts

Browse Source
This commit is contained in:
Denny
2017-01-08 04:44:53 -05:00
parent 49a1ea04f8 2c558ce929
commit a55296eb45
3 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java
View File

@@ -243,9 +243,18 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
{ {
if(cause instanceof IOException && ((IOException)cause).getMessage().startsWith("Connection reset")) if(cause instanceof IOException && ((IOException)cause).getMessage().startsWith("Connection reset"))
{ {
mLog.info("Streaming connection reset by remote server - reestablishing connection"); IOException ioe = (IOException)cause;
disconnect();
connect(); if(ioe.getMessage() != null && ioe.getMessage().startsWith("Connection reset"))
{
mLog.info("Streaming connection reset by remote server - reestablishing connection");
disconnect();
connect();
}
else
{
mLog.error("IO Exception", ioe);
}
} }
else else
{ {

15
src/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java
View File

@@ -244,9 +244,18 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
{ {
if(cause instanceof IOException && ((IOException)cause).getMessage().startsWith("Connection reset")) if(cause instanceof IOException && ((IOException)cause).getMessage().startsWith("Connection reset"))
{ {
mLog.info("Streaming connection reset by remote server - reestablishing connection"); IOException ioe = (IOException)cause;
disconnect();
connect(); if(ioe.getMessage() != null && ioe.getMessage().startsWith("Connection reset"))
{
mLog.info("Streaming connection reset by remote server - reestablishing connection");
disconnect();
connect();
}
else
{
mLog.error("IO Exception", ioe);
}
} }
else else
{ {

15
src/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java
View File

@@ -370,9 +370,18 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
{ {
if(cause instanceof IOException && ((IOException)cause).getMessage().startsWith("Connection reset")) if(cause instanceof IOException && ((IOException)cause).getMessage().startsWith("Connection reset"))
{ {
mLog.info("Streaming connection reset by remote server - reestablishing connection"); IOException ioe = (IOException)cause;
disconnect();
connect(); if(ioe.getMessage() != null && ioe.getMessage().startsWith("Connection reset"))
{
mLog.info("Streaming connection reset by remote server - reestablishing connection");
disconnect();
connect();
}
else
{
mLog.error("IO Exception", ioe);
}
} }
else else
{ {