Merge lp:~vthompson/music-app/remove-qtpowerd into lp:music-app/trusty

[Victor Thompson]

Remove QtPowerd

This is a proposal to remove QtPowerd since it is not needed to keep the music-app alive due to the lifecycle exceptions it currently has (which will be removed soon). This means that the dependency upon QtPowerd could have been removed quite some time ago.

To test, I pushed the updated QML files and plugins.json file to /opt/click.ubuntu.com/com.ubuntu.music/current/ and removed the QtPowerd from the /opt/click.ubuntu.com/com.ubuntu.music/current/lib/ directory.

One thing to note is that currently if the user has Qt5.2 (might be due to other changes in the landing006 PPA) on the device, both before and after this change music will stop when a track ends AND the device's screen is off. If the user's screen is simply turned back on the next song will start playing. I'm not sure what the issue is here--but it is unrelated to this change.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:378
http://91.189.93.70:8080/job/music-app-ci/642/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1740
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/642
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/644
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/363

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/642/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

I see the same behaviour of the app not moving onto the next track if the screen if off.

I feel this needs investigating before the Qt5.2 images are promoted.

# system-image-cli -i
current build number: 246
device name: mako
channel: ubuntu-touch/devel-proposed
alias: ubuntu-touch/trusty-proposed
last update: 2014-03-19 15:05:46
version version: 246
version ubuntu: 20140319.2
version device: 20140304

[Victor Thompson (vthompson)]

Agreed, the bug I filed for that (lp:1292306) will be marked critical.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tested this on device and it worked fine for me.

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-03-07 20:49:32 +0000
+++ debian/control	2014-03-14 00:15:59 +0000
@@ -18,7 +18,6 @@
          qtdeclarative5-particles-plugin,
          qtdeclarative5-qtgrilo0.1,
          qtdeclarative5-qtmultimedia-plugin,
-         qtdeclarative5-qtpowerd0.1 (>= 0.2~),
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
          qtdeclarative5-usermetrics0.1,
 
=== modified file 'music-app.qml'
--- music-app.qml	2014-03-08 22:09:12 +0000
+++ music-app.qml	2014-03-14 00:15:59 +0000
@@ -22,7 +22,6 @@
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Unity.Action 1.0 as UnityActions
-import QtPowerd 0.1
 import org.nemomobile.grilo 0.1
 import QtMultimedia 5.0
 import QtQuick.LocalStorage 2.0
@@ -267,15 +266,6 @@
         }
     }
 
-    // Connections for powerd
-    Connections {
-        target: player
-        onPlaybackStateChanged: {
-            QtPowerd.keepAlive = player.playbackState === MediaPlayer.PlayingState
-            console.log("QtPowerd.keepAlive=" + QtPowerd.keepAlive)
-        }
-    }
-
     // Design stuff
     Style { id: styleMusic }
     width: units.gu(100)
 
=== modified file 'plugins.json'
--- plugins.json	2013-10-14 22:02:41 +0000
+++ plugins.json	2014-03-14 00:15:59 +0000
@@ -1,8 +1,5 @@
 [
 {
-    "package": "qtdeclarative5-qtpowerd0.1"
-},
-{
     "package": "qtdeclarative5-qtgrilo0.1"
 }
 ]