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

Work in progress.

Browse Source 
-Removed channel collection panel since panels will only have 1 channel
now
-Resolved issue with channel list and channel selection events
-Fixed some of the classes from the rebase to master branch
This commit is contained in:
denny
2016-02-15 07:10:41 -05:00
parent 1f654b5b9c
commit 2c6e35c739
19 changed files with 244 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/gui/SDRTrunk.java
View File

@@ -119,10 +119,10 @@ public class SDRTrunk
SourceManager sourceManager = new SourceManager( mSettingsManager, threadPoolManager );
AliasModel aliasModel = new AliasModel();
ChannelModel channelModel = new ChannelModel();
AliasModel aliasModel = new AliasModel();
PlaylistManager playlistManager = new PlaylistManager( threadPoolManager,
aliasModel, channelModel );
@@ -137,7 +137,11 @@ public class SDRTrunk
channelProcessingManager.addAudioPacketListener( recorderManager );
AliasActionManager aliasActionManager = new AliasActionManager( threadPoolManager );
ChannelSelectionManager channelSelectionManager =
new ChannelSelectionManager( channelModel );
channelModel.addListener( channelSelectionManager );
AliasActionManager aliasActionManager = new AliasActionManager( threadPoolManager );
channelProcessingManager.addMessageListener( aliasActionManager );
AudioManager audioManager = new AudioManager( threadPoolManager, sourceManager.getMixerManager() );
@@ -145,16 +149,6 @@ public class SDRTrunk
MapService mapService = new MapService( mSettingsManager );
channelProcessingManager.addMessageListener( mapService );
ChannelSelectionManager channelSelectionManager =
new ChannelSelectionManager( channelModel );
channelModel.addListener( channelSelectionManager );
//TODO: move this to the end once we add the alias model, otherwise the
//configuration tree won't load correctly
//Initialize the playlist manager to load the saved playlist
playlistManager.init();
ConfigurationControllerModel configurationControllerModel =
new ConfigurationControllerModel( channelModel, channelProcessingManager,
@@ -169,11 +163,16 @@ public class SDRTrunk
mTitle = getTitle();
//Initialize the GUI
//TODO: move this to the end once we add the alias model, otherwise the
//configuration tree won't load correctly
//Initialize the playlist manager to load the saved playlist
playlistManager.init();
mLog.info( "starting main application gui" );
//Initialize the GUI
initGUI();
mLog.info( "starting main application gui" );
if( mLogChannelAndMemoryUsage )
{
Runnable cml = new ChannelMemoryLogger();