GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Revert "Merges master onto development branch"

Browse Source 
This reverts commit 2420bc901c63ad9d41e7c99ac95a426f826182ff.
This commit is contained in:
denny
2016-02-13 14:14:54 -05:00
parent 3f674c0b8f
commit 1d7f255784
60 changed files with 2106 additions and 2750 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/SDRTrunk.java
View File

@@ -140,7 +140,7 @@ public class SDRTrunk
AliasActionManager aliasActionManager = new AliasActionManager( threadPoolManager );
channelProcessingManager.addMessageListener( aliasActionManager );
AudioManager audioManager = new AudioManager( threadPoolManager, sourceManager.getMixerManager() );
AudioManager audioManager = new AudioManager( threadPoolManager );
channelProcessingManager.addAudioPacketListener( audioManager );
MapService mapService = new MapService( mSettingsManager );
@@ -471,7 +471,7 @@ public class SDRTrunk
if( version != null )
{
sb.append( " v" );
sb.append( " V" );
sb.append( version );
}
}