Merge remote-tracking branch 'origin/master'

This commit is contained in:
Denny
2017-02-20 20:20:11 -05:00
5 changed files with 10 additions and 5 deletions

View File

@@ -156,6 +156,8 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
disconnect(); disconnect();
} }
mConnecting.set(false);
} }
}; };
@@ -176,8 +178,6 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
{ {
mStreamingSession.closeNow(); mStreamingSession.closeNow();
} }
mConnecting.set(false);
} }
/** /**
@@ -256,6 +256,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
mSocketConnector = null; mSocketConnector = null;
mConnecting.set(false); mConnecting.set(false);
super.sessionClosed(session); super.sessionClosed(session);
} }

View File

@@ -147,6 +147,8 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
disconnect(); disconnect();
} }
mConnecting.set(false);
} }
}; };
@@ -293,8 +295,6 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
setBroadcastState(BroadcastState.ERROR); setBroadcastState(BroadcastState.ERROR);
disconnect(); disconnect();
} }
mConnecting.set(false);
} }
@Override @Override

View File

@@ -168,6 +168,8 @@ public class ShoutcastV1AudioBroadcaster extends AudioBroadcaster
disconnect(); disconnect();
} }
mConnecting.set(false);
} }
}; };

View File

@@ -204,6 +204,8 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
disconnect(); disconnect();
} }
mConnecting.set(false);
} }
}; };

View File

@@ -65,7 +65,7 @@ public enum UltravoxMetadata
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("<").append(getXMLTag()).append(">"); sb.append("<").append(getXMLTag()).append(">");
sb.append(URLEncoder.encode(value, "UTF-8")); sb.append(new String(value.getBytes(), "UTF-8"));
sb.append("</").append(getXMLTag()).append(">"); sb.append("</").append(getXMLTag()).append(">");
return sb.toString(); return sb.toString();