From e7e83b13beca7b82bd90a8f02912f84f572720b7 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sat, 18 Feb 2017 12:21:17 +0100
Subject: [PATCH] RTLSDR input: make sample rate precision to the sample/s and 
 added 2.167 MS/s for GSM

---
 plugins/samplesource/rtlsdr/rtlsdrgui.cpp | 23 ++++++++++++++++++-----
 plugins/samplesource/rtlsdr/rtlsdrgui.h   |  4 ++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
index 8b57645d6..01505c399 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp
@@ -44,7 +44,7 @@ RTLSDRGui::RTLSDRGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
 
 	for (int i = 0; i < RTLSDRSampleRates::getNbRates(); i++)
 	{
-		ui->sampleRate->addItem(QString::number(RTLSDRSampleRates::getRate(i)));
+		ui->sampleRate->addItem(QString::number(RTLSDRSampleRates::getRate(i)/1000));
 	}
 
 	connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
@@ -306,7 +306,7 @@ void RTLSDRGui::on_gain_valueChanged(int value)
 void RTLSDRGui::on_sampleRate_currentIndexChanged(int index)
 {
 	int newrate = RTLSDRSampleRates::getRate(index);
-	m_settings.m_devSampleRate = newrate * 1000;
+	m_settings.m_devSampleRate = newrate;
 
 	sendSettings();
 }
@@ -402,8 +402,21 @@ void RTLSDRGui::on_checkBox_stateChanged(int state)
 	sendSettings();
 }
 
-unsigned int RTLSDRSampleRates::m_rates[] = {250, 256, 1000, 1024, 1152, 1200, 1536, 1600, 2000, 2048, 2304, 2400};
-unsigned int RTLSDRSampleRates::m_nb_rates = 12;
+const unsigned int RTLSDRSampleRates::m_nb_rates = 13;
+const unsigned int RTLSDRSampleRates::m_rates[] = {
+        250000,
+        256000,
+       1000000,
+       1024000,
+       1152000,
+       1200000,
+       1536000,
+       1600000,
+       2000000,
+       2048000,
+       2166667, // for GSM
+       2304000,
+       2400000};
 
 unsigned int RTLSDRSampleRates::getRate(unsigned int rate_index)
 {
@@ -421,7 +434,7 @@ unsigned int RTLSDRSampleRates::getRateIndex(unsigned int rate)
 {
 	for (unsigned int i=0; i < m_nb_rates; i++)
 	{
-		if (rate/1000 == m_rates[i])
+		if (rate == m_rates[i])
 		{
 			return i;
 		}
diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.h b/plugins/samplesource/rtlsdr/rtlsdrgui.h
index 4386e6f85..e7fa92f48 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrgui.h
+++ b/plugins/samplesource/rtlsdr/rtlsdrgui.h
@@ -89,8 +89,8 @@ public:
 	static unsigned int getRateIndex(unsigned int rate);
 	static unsigned int getNbRates();
 private:
-	static unsigned int m_rates[12];
-	static unsigned int m_nb_rates;
+    static const unsigned int m_nb_rates;
+	static const unsigned int m_rates[];
 };
 
 #endif // INCLUDE_RTLSDRGUI_H