From 79b4b30ec7f22d2501a6e5dfb06696c6569cc4e2 Mon Sep 17 00:00:00 2001 From: Denny Date: Fri, 17 Feb 2017 17:53:42 -0500 Subject: [PATCH 1/2] Resolves issue with audio broadcasters attempting to reconnect if a connection attempt is not successful. --- src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java | 5 +++-- src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java | 4 ++-- .../broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java | 2 ++ .../broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java | 2 ++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java b/src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java index d42af8b5..935d4979 100644 --- a/src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java +++ b/src/audio/broadcast/icecast/IcecastHTTPAudioBroadcaster.java @@ -156,6 +156,8 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster disconnect(); } + + mConnecting.set(false); } }; @@ -176,8 +178,6 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster { mStreamingSession.closeNow(); } - - mConnecting.set(false); } /** @@ -256,6 +256,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster mSocketConnector = null; mConnecting.set(false); + super.sessionClosed(session); } diff --git a/src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java b/src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java index 53f728c3..fa9cd8d5 100644 --- a/src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java +++ b/src/audio/broadcast/icecast/IcecastTCPAudioBroadcaster.java @@ -147,6 +147,8 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster disconnect(); } + + mConnecting.set(false); } }; @@ -293,8 +295,6 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster setBroadcastState(BroadcastState.ERROR); disconnect(); } - - mConnecting.set(false); } @Override diff --git a/src/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java b/src/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java index 3bc83071..5d6d8dab 100644 --- a/src/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java +++ b/src/audio/broadcast/shoutcast/v1/ShoutcastV1AudioBroadcaster.java @@ -168,6 +168,8 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster disconnect(); } + + mConnecting.set(false); } }; diff --git a/src/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java b/src/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java index cd4cadaf..341b31bf 100644 --- a/src/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java +++ b/src/audio/broadcast/shoutcast/v2/ShoutcastV2AudioBroadcaster.java @@ -204,6 +204,8 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr disconnect(); } + + mConnecting.set(false); } }; From f3605db0edb8c2f7bb6147854b3d23af10c3e8b7 Mon Sep 17 00:00:00 2001 From: Denny Date: Fri, 17 Feb 2017 18:08:01 -0500 Subject: [PATCH 2/2] Resolves issue where metadata is UTF-8 URL encoded versus UTF-8 String encoding. --- src/audio/broadcast/shoutcast/v2/ultravox/UltravoxMetadata.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/broadcast/shoutcast/v2/ultravox/UltravoxMetadata.java b/src/audio/broadcast/shoutcast/v2/ultravox/UltravoxMetadata.java index 6a124355..0372fc6b 100644 --- a/src/audio/broadcast/shoutcast/v2/ultravox/UltravoxMetadata.java +++ b/src/audio/broadcast/shoutcast/v2/ultravox/UltravoxMetadata.java @@ -65,7 +65,7 @@ public enum UltravoxMetadata { StringBuilder sb = new StringBuilder(); sb.append("<").append(getXMLTag()).append(">"); - sb.append(URLEncoder.encode(value, "UTF-8")); + sb.append(new String(value.getBytes(), "UTF-8")); sb.append(""); return sb.toString();