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

#30 WIP on using the new apache mina library

Browse Source
This commit is contained in:
Denny
2016-12-18 10:17:09 -05:00
parent 1d7354b4a8
commit 5e4cbf2a4e
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ public class IcecastTCPAudioBroadcaster extends AudioBroadcaster
private static final long RECONNECT_INTERVAL_MILLISECONDS = 30000; //30 seconds private static final long RECONNECT_INTERVAL_MILLISECONDS = 30000; //30 seconds
private NioSocketConnector mSocketConnector; private NioSocketConnector mSocketConnector;
private IoSession mSession = null; private IoSession mStreamingSession = null;
private IcecastMetadataUpdater mIcecastMetadataUpdater; private IcecastMetadataUpdater mIcecastMetadataUpdater;
private long mLastConnectionAttempt = 0; private long mLastConnectionAttempt = 0;
@@ -206,7 +206,7 @@ public class IcecastTCPAudioBroadcaster extends AudioBroadcaster
mSocketConnector.setHandler(new IcecastTCPIOHandler()); mSocketConnector.setHandler(new IcecastTCPIOHandler());
} }
mSession = null; mStreamingSession = null;
Runnable runnable = new Runnable() Runnable runnable = new Runnable()
{ {
@@ -223,7 +223,7 @@ public class IcecastTCPAudioBroadcaster extends AudioBroadcaster
.connect(new InetSocketAddress(getBroadcastConfiguration().getHost(), .connect(new InetSocketAddress(getBroadcastConfiguration().getHost(),
getBroadcastConfiguration().getPort())); getBroadcastConfiguration().getPort()));
future.awaitUninterruptibly(); future.awaitUninterruptibly();
mSession = future.getSession(); mStreamingSession = future.getSession();
} }
catch(RuntimeIoException rie) catch(RuntimeIoException rie)
{ {
@@ -265,9 +265,9 @@ public class IcecastTCPAudioBroadcaster extends AudioBroadcaster
if(mConnecting.get()) if(mConnecting.get())
{ {
if(mSession != null) if(mStreamingSession != null)
{ {
mSession.closeNow(); mStreamingSession.closeNow();
} }
} }
} }
@@ -324,9 +324,9 @@ public class IcecastTCPAudioBroadcaster extends AudioBroadcaster
*/ */
private void send(String data) throws IOException private void send(String data) throws IOException
{ {
if(data != null && !data.isEmpty() && mSession != null && mSession.isConnected()) if(data != null && !data.isEmpty() && mStreamingSession != null && mStreamingSession.isConnected())
{ {
mSession.write(data); mStreamingSession.write(data);
} }
} }
@@ -337,9 +337,9 @@ public class IcecastTCPAudioBroadcaster extends AudioBroadcaster
*/ */
private void send(byte[] data) throws IOException private void send(byte[] data) throws IOException
{ {
if(mSession != null && mSession.isConnected()) if(mStreamingSession != null && mStreamingSession.isConnected())
{ {
mSession.write(data); mStreamingSession.write(data);
} }
} }
@@ -398,7 +398,7 @@ public class IcecastTCPAudioBroadcaster extends AudioBroadcaster
mLog.debug("Session Closed - State = Disconnected"); mLog.debug("Session Closed - State = Disconnected");
mSocketConnector.dispose(); mSocketConnector.dispose();
mSession = null; mStreamingSession = null;
mSocketConnector = null; mSocketConnector = null;
mConnecting.set(false); mConnecting.set(false);
@@ -487,7 +487,7 @@ public class IcecastTCPAudioBroadcaster extends AudioBroadcaster
if(mSocketConnector == null) if(mSocketConnector == null)
{ {
mSocketConnector = new NioSocketConnector(); mSocketConnector = new NioSocketConnector();
// mSocketConnector.getFilterChain().addLast("logger", new LoggingFilter()); // mSocketConnector.getFilterChain().addLast("logger", new LoggingFilter(IcecastMetadataUpdater.class));
mSocketConnector.getFilterChain().addLast("http_client_codec", new HttpClientCodec()); mSocketConnector.getFilterChain().addLast("http_client_codec", new HttpClientCodec());
//Each metadata update session is single-use, so we'll shut it down upon success or failure //Each metadata update session is single-use, so we'll shut it down upon success or failure