wip #34 - removed some wrapper methods from tuner since the tuner

controller is now exposed (frequency, sample rate, channel count, etc)
This commit is contained in:
denny
2016-03-13 07:38:29 -04:00
parent 415f95ec89
commit 0605760fcd
16 changed files with 32 additions and 198 deletions

View File

@@ -48,12 +48,6 @@ public class AirspyTuner extends Tuner
return (AirspyTunerController)getTunerController();
}
@Override
public void apply( TunerConfiguration config ) throws SourceException
{
getController().apply( config );
}
@Override
public String getUniqueID()
{
@@ -81,35 +75,12 @@ public class AirspyTuner extends Tuner
return TunerType.AIRSPY_R820T;
}
@Override
public int getSampleRate()
{
int rate = 0;
try
{
rate = getController().getCurrentSampleRate();
}
catch ( SourceException e )
{
mLog.error( "Error while getting sample rate from controller", e );
}
return rate;
}
@Override
public double getSampleSize()
{
return 13.0;
}
@Override
public long getFrequency() throws SourceException
{
return getController().getFrequency();
}
@Override
public TunerChannelSource getChannel( TunerChannel channel )
throws RejectedExecutionException, SourceException
@@ -131,14 +102,6 @@ public class AirspyTuner extends Tuner
return source;
}
@Override
public int getChannelCount()
{
return getController().getChannelCount();
}
@Override
public void releaseChannel( TunerChannelSource source )
{

View File

@@ -427,7 +427,7 @@ public class AirspyTunerController extends TunerController
/**
* Airspy sample rate object that matches the current sample rate setting.
*/
public AirspySampleRate getSampleRate()
public AirspySampleRate getAirspySampleRate()
{
return getSampleRate( mSampleRate );
}