From 62851351a443bedcbf8121b7c348603e861c274f Mon Sep 17 00:00:00 2001 From: denny Date: Sat, 27 Feb 2016 08:58:47 -0500 Subject: [PATCH] Merges master 399d164 - default tuner configurations issue #57 --- src/settings/SettingsManager.java | 5 ----- src/source/tuner/TunerManager.java | 8 +++----- src/source/tuner/rtl/r820t/R820TTunerConfiguration.java | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/settings/SettingsManager.java b/src/settings/SettingsManager.java index ee25bd78..3cac8abe 100644 --- a/src/settings/SettingsManager.java +++ b/src/settings/SettingsManager.java @@ -564,11 +564,6 @@ public class SettingsManager ArrayList configs = getSettings() .getTunerConfigurations( type ); - if( configs.isEmpty() ) - { - configs.add( addNewTunerConfiguration( type, "Default" ) ); - } - return configs; } diff --git a/src/source/tuner/TunerManager.java b/src/source/tuner/TunerManager.java index 29b87fb8..759bf7d6 100644 --- a/src/source/tuner/TunerManager.java +++ b/src/source/tuner/TunerManager.java @@ -547,16 +547,14 @@ public class TunerManager } } } - else - { - config = configs.get( 0 ); - } //If we're still null at this point, create a default config if( config == null ) { + String name = "Default-" + tuner.getUniqueID(); + config = mSettingsManager.addNewTunerConfiguration( - tuner.getTunerType(), "Default" ); + tuner.getTunerType(), name ); } //Persist the config as the selected tuner configuration. The method diff --git a/src/source/tuner/rtl/r820t/R820TTunerConfiguration.java b/src/source/tuner/rtl/r820t/R820TTunerConfiguration.java index acca6fba..8ecc7795 100644 --- a/src/source/tuner/rtl/r820t/R820TTunerConfiguration.java +++ b/src/source/tuner/rtl/r820t/R820TTunerConfiguration.java @@ -34,7 +34,7 @@ public class R820TTunerConfiguration extends TunerConfiguration private R820TLNAGain mLNAGain = R820TLNAGain.GAIN_222; private R820TVGAGain mVGAGain = R820TVGAGain.GAIN_210; private double mFrequencyCorrection = 0.0d; - private SampleRate mSampleRate = SampleRate.RATE_1_920MHZ; + private SampleRate mSampleRate = SampleRate.RATE_2_400MHZ; /** * Default constructor for JAXB