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

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

7
src/playlist/PlaylistManager.java
View File

@@ -103,11 +103,8 @@ public class PlaylistManager implements ChannelEventListener
mPlaylistLoading = true;
mLog.debug( "Transferring aliases to model" );
mAliasModel.addAliases( mPlaylist.getAliases() );
mLog.debug( "Transferring channels to model" );
mChannelModel.addChannels( mPlaylist.getChannels() );
mLog.debug( "Transfer to models is complete" );
mPlaylistLoading = false;
}
@@ -175,13 +172,9 @@ public class PlaylistManager implements ChannelEventListener
{
//TODO: recreate the playlist and load values from each of the models
mLog.debug( "Aliases in model:" + mAliasModel.getAliases().size() );
mPlaylist.setAliases( mAliasModel.getAliases() );
mLog.debug( "Aliases in playlist:" + mPlaylist.getAliases().size() );
mLog.debug( "Channels in model:" + mChannelModel.getChannels().size() );
mPlaylist.setChannels( mChannelModel.getChannels() );
mLog.debug( "Channels in playlist:" + mPlaylist.getChannels().size() );
JAXBContext context = null;