mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-12 08:37:25 -05:00
Changed FrequencyChangeListener interface to an event so that I could describe what event was causing the frequency change and to broadcast frequency and sample rate error values.
R820T - added a couple more sample rate settings to the enum and modified the periodic sample rate info logger.
This commit is contained in:
@@ -24,6 +24,7 @@ import javax.swing.JPanel;
|
||||
|
||||
import sample.Listener;
|
||||
import source.SourceException;
|
||||
import source.tuner.FrequencyChangeEvent.Attribute;
|
||||
import controller.ResourceManager;
|
||||
import controller.ThreadPoolManager;
|
||||
|
||||
@@ -172,11 +173,38 @@ public abstract class Tuner implements FrequencyChangeBroadcaster,
|
||||
/**
|
||||
* Broadcasts a frequency change event to all registered listeners
|
||||
*/
|
||||
public void broadcastFrequencyChange( long frequency, int bandwidth )
|
||||
public void broadcastFrequencyChange( long frequency )
|
||||
{
|
||||
broadcastFrequencyChangeEvent(
|
||||
new FrequencyChangeEvent( Attribute.FREQUENCY, frequency ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Broadcasts a sample rate change event to all registered listeners
|
||||
*/
|
||||
public void broadcastSampleRateChange( int sampleRate )
|
||||
{
|
||||
broadcastFrequencyChangeEvent(
|
||||
new FrequencyChangeEvent( Attribute.SAMPLE_RATE, sampleRate ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Broadcasts actual sample rate change event to all registered listeners
|
||||
*/
|
||||
public void broadcastActualSampleRateChange( int actualSampleRate )
|
||||
{
|
||||
broadcastFrequencyChangeEvent(
|
||||
new FrequencyChangeEvent( Attribute.SAMPLE_RATE, actualSampleRate ) );
|
||||
}
|
||||
|
||||
/**
|
||||
* Broadcasts a frequency change event to all registered listeners
|
||||
*/
|
||||
public void broadcastFrequencyChangeEvent( FrequencyChangeEvent event )
|
||||
{
|
||||
for( FrequencyChangeListener listener: mFrequencyChangeListeners )
|
||||
{
|
||||
listener.frequencyChanged( frequency, bandwidth );
|
||||
listener.frequencyChanged( event );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -184,8 +212,19 @@ public abstract class Tuner implements FrequencyChangeBroadcaster,
|
||||
* Frequency change listener method. We receive change events from the
|
||||
* controller and rebroadcast them to all registered listeners.
|
||||
*/
|
||||
public void frequencyChanged( long frequency, int bandwidth )
|
||||
public void frequencyChanged( FrequencyChangeEvent event )
|
||||
{
|
||||
broadcastFrequencyChange( frequency, bandwidth );
|
||||
broadcastFrequencyChangeEvent( event );
|
||||
}
|
||||
|
||||
// /**
|
||||
// * Broadcasts a frequency change event to all registered listeners
|
||||
// */
|
||||
// public void broadcastBandwidthChange( int bandwidth )
|
||||
// {
|
||||
// broadcastFrequencyChangeEvent(
|
||||
// new FrequencyChangeEvent( Attribute.BANDWIDTH, bandwidth ) );
|
||||
// }
|
||||
//
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user