mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-12 16:47:31 -05:00
Work in progress - program compiles and runs
This commit is contained in:
@@ -124,6 +124,6 @@ public class SourceComponentEditor extends AbstractChannelEditor
|
||||
|
||||
//Let the calling save method send the config change event
|
||||
mChannelNode.getChannel()
|
||||
.setSourceConfiguration( mEditor.getConfig(), false );
|
||||
.setSourceConfiguration( mEditor.getConfig() );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -42,6 +42,7 @@ public class SourceConfigMixer extends SourceConfiguration
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
sb.append( "Mixer: " );
|
||||
sb.append( mMixer );
|
||||
sb.append( "-" );
|
||||
sb.append( mChannel.toString() );
|
||||
|
||||
@@ -34,6 +34,7 @@ import source.tuner.frequency.FrequencyChangeListener;
|
||||
import spectrum.SpectrumFrame;
|
||||
import controller.BaseNode;
|
||||
import controller.ResourceManager;
|
||||
import controller.channel.ChannelModel;
|
||||
|
||||
public class TunerNode extends BaseNode implements FrequencyChangeListener
|
||||
{
|
||||
@@ -46,11 +47,14 @@ public class TunerNode extends BaseNode implements FrequencyChangeListener
|
||||
|
||||
private long mFrequency;
|
||||
private int mSampleRate;
|
||||
private ChannelModel mChannelModel;
|
||||
|
||||
public TunerNode( Tuner tuner )
|
||||
public TunerNode( ChannelModel channelModel, Tuner tuner )
|
||||
{
|
||||
super( tuner ); //does this make it a super tuner?
|
||||
|
||||
mChannelModel = channelModel;
|
||||
|
||||
tuner.addListener( this );
|
||||
|
||||
try
|
||||
@@ -115,7 +119,7 @@ public class TunerNode extends BaseNode implements FrequencyChangeListener
|
||||
{
|
||||
ResourceManager rm = getModel().getResourceManager();
|
||||
|
||||
SpectrumFrame frame = new SpectrumFrame( rm.getChannelManager(),
|
||||
SpectrumFrame frame = new SpectrumFrame( mChannelModel,
|
||||
rm.getController(), rm.getPlaylistManager(),
|
||||
rm.getSettingsManager(), getTuner() );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user