From a6e2cbb83ce78940a9cdbac44d6080a8e9cad21f Mon Sep 17 00:00:00 2001
From: Jonas Rabbe <jonas.rabbe@nokia.com>
Date: Thu, 1 Sep 2011 07:44:46 +1000
Subject: Added tune up and down methods, and changed name of scan methods.

Instead of requiring developers using the radio API to read the
frequency step, adding it to the current frequency and setting the
new frequency, there has been added tuneUp and tuneDown methods.
Also, the searchBackward and searchForward methods have been renamed
to scanDown and scanUp which seem more logical. And cancelSearch
has become cancelScan.

Change-Id: Ib9ff61c0f58163039f41f045037cb9a11b37a59e
Reviewed-on: http://codereview.qt.nokia.com/4013
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: derick hawcroft <derick.hawcroft@nokia.com>
---
 src/imports/multimedia/qdeclarativeradio.cpp | 20 +++++++++++++++++---
 src/imports/multimedia/qdeclarativeradio_p.h |  8 +++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/imports/multimedia/qdeclarativeradio.cpp b/src/imports/multimedia/qdeclarativeradio.cpp
index 5debda7ba..5cac32e6f 100644
--- a/src/imports/multimedia/qdeclarativeradio.cpp
+++ b/src/imports/multimedia/qdeclarativeradio.cpp
@@ -156,21 +156,35 @@ void QDeclarativeRadio::setMuted(bool muted)
     m_radioTuner->setMuted(muted);
 }
 
-void QDeclarativeRadio::cancelSearch()
+void QDeclarativeRadio::cancelScan()
 {
     m_radioTuner->cancelSearch();
 }
 
-void QDeclarativeRadio::searchBackward()
+void QDeclarativeRadio::scanDown()
 {
     m_radioTuner->searchBackward();
 }
 
-void QDeclarativeRadio::searchForward()
+void QDeclarativeRadio::scanUp()
 {
     m_radioTuner->searchForward();
 }
 
+void QDeclarativeRadio::tuneDown()
+{
+    int f = frequency();
+    f = f - frequencyStep();
+    setFrequency(f);
+}
+
+void QDeclarativeRadio::tuneUp()
+{
+    int f = frequency();
+    f = f + frequencyStep();
+    setFrequency(f);
+}
+
 void QDeclarativeRadio::start()
 {
     m_radioTuner->start();
diff --git a/src/imports/multimedia/qdeclarativeradio_p.h b/src/imports/multimedia/qdeclarativeradio_p.h
index 498e60fe3..eddf93bfc 100644
--- a/src/imports/multimedia/qdeclarativeradio_p.h
+++ b/src/imports/multimedia/qdeclarativeradio_p.h
@@ -134,9 +134,11 @@ public Q_SLOTS:
     void setVolume(int volume);
     void setMuted(bool muted);
 
-    void cancelSearch();
-    void searchBackward();
-    void searchForward();
+    void cancelScan();
+    void scanDown();
+    void scanUp();
+    void tuneUp();
+    void tuneDown();
     void start();
     void stop();
 
-- 
cgit v1.2.3