Pause radio on play

Having the mediaplayer application pause the radio was requested as
a demo behavior improvement.  Use the new radio binding support in
libqtappfw to do so.

Change-Id: I6b2aa6c2c03a2485dfb05406ec450c126995440c
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

diff --git a/app/MediaPlayer.qml b/app/MediaPlayer.qml
index ec7b4e0..c859509 100644 (file)
--- a/app/MediaPlayer.qml
+++ b/app/MediaPlayer.qml
@@ -195,6 +195,7 @@ ApplicationWindow {
                             id: previous
                             offImage: './images/AGL_MediaPlayer_BackArrow.svg'
                             onClicked: {
+                                radio.stop()
                                 mediaplayer.previous()
                             }
                         }
@@ -216,7 +217,10 @@ ApplicationWindow {
                                     PropertyChanges {
                                         target: play
                                         offImage: './images/AGL_MediaPlayer_Player_Play.svg'
-                                        onClicked: mediaplayer.play()
+                                        onClicked: {
+                                            radio.stop()
+                                            mediaplayer.play()
+                                        }
                                     }
                                 }
                             ]
@@ -225,6 +229,7 @@ ApplicationWindow {
                             id: forward
                             offImage: './images/AGL_MediaPlayer_ForwardArrow.svg'
                             onClicked: {
+                                radio.stop()
                                 mediaplayer.next()
                             }
                         }
@@ -294,6 +299,7 @@ ApplicationWindow {
                         //}
                     }
                     onClicked: {
+                        radio.stop()
                         mediaplayer.picktrack(playlistview.model[index].index)
                     }
                 }

diff --git a/app/main.cpp b/app/main.cpp
index 40dec24..64f6746 100644 (file)
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -29,6 +29,7 @@
 #include <libhomescreen.hpp>
 #include <qlibwindowmanager.h>
 #include <mediaplayer.h>
+#include <radio.h>
 
 #include <unistd.h>
 
@@ -99,6 +100,7 @@ int main(int argc, char *argv[])
         });
 
         context->setContextProperty("mediaplayer", new Mediaplayer(bindingAddress, context));
+        context->setContextProperty("radio", new Radio(bindingAddress, context));
         context->setContextProperty(QStringLiteral("screenInfo"), &screenInfo);
 
         engine.load(QUrl(QStringLiteral("qrc:/MediaPlayer.qml")));

diff --git a/package/config.xml b/package/config.xml
index 2a07994..befde62 100644 (file)
--- a/package/config.xml
+++ b/package/config.xml
@@ -10,6 +10,7 @@
     <param name="windowmanager" value="ws" />
     <param name="homescreen" value="ws" />
     <param name="mediaplayer" value="ws" />
+    <param name="radio" value="ws" />
   </feature>
   <feature name="urn:AGL:widget:required-permission">
     <param name="urn:AGL:permission::public:no-htdocs" value="required" />