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

Instrumentation updates ... work in progress

Browse Source
This commit is contained in:
denny
2015-09-19 12:26:04 -04:00
parent 8c2207e37c
commit ba41022853
8 changed files with 92 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/controller/channel/ChannelEditor.java
View File

@@ -43,6 +43,7 @@ import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import playlist.PlaylistManager;
import record.RecordComponentEditor;
import source.SourceComponentEditor;
import alias.AliasList;
@@ -69,12 +70,16 @@ public class ChannelEditor extends Editor implements ActionListener
private JCheckBox mChannelEnabled = new JCheckBox();
private JComboBox<AliasList> mComboAliasLists;
public ChannelEditor( ChannelNode channel )
private PlaylistManager mPlaylistManager;
public ChannelEditor( ChannelNode channel, PlaylistManager playlistManager )
{
super();
mChannelNode = channel;
mPlaylistManager = playlistManager;
initGUI();
}
@@ -132,7 +137,7 @@ public class ChannelEditor extends Editor implements ActionListener
mSourceEditor = new SourceComponentEditor( mChannelNode );
tabs.addTab( "Source", mSourceEditor );
mDecodeEditor = new DecodeComponentEditor( mChannelNode );
mDecodeEditor = new DecodeComponentEditor( mChannelNode, mPlaylistManager );
tabs.addTab( "Decoder", mDecodeEditor );
mAuxDecodeEditor = new AuxDecodeComponentEditor( mChannelNode );

4
src/controller/channel/ChannelNode.java
View File

@@ -124,7 +124,9 @@ public class ChannelNode extends ConfigurableNode implements ChannelEventListene
@Override
public JPanel getEditor()
{
return new ChannelEditor( this );
return new ChannelEditor( this,
getChannel().getResourceManager() == null ? null :
getChannel().getResourceManager().getPlaylistManager() );
}
public Channel getChannel()