Merge lp:~renatofilho/mediaplayer-app/fix-1365497 into lp:mediaplayer-app

[Renato Araujo Oliveira Filho]

Show a proper message if the video format is not supported.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:273
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/220/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4836
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-i386-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4597
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6088
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6088/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13231
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2934
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3847
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3847/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/220/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/qml/player/AbstractPlayer.qml'
--- src/qml/player/AbstractPlayer.qml	2014-04-09 16:50:50 +0000
+++ src/qml/player/AbstractPlayer.qml	2014-09-15 21:45:08 +0000
@@ -40,6 +40,8 @@
     property int backwardSeekStep: Math.min(30000, mediaPlayer.duration * 0.025)
 
 
+    signal error(int errorCode, string errorString)
+
     objectName: "videoPlayer"
     state: "stopped"
     color: "black"
@@ -131,7 +133,8 @@
         property int heightMargin: aspectRatio != -1 ? (aspectRatio < parent.aspectRatio ? 0 : (height - realHeight) / 2) : -1
 
         onError: {
-            console.log("AbstractPlayer: " + errorString)
+            console.error("AbstractPlayer: " + error + ":" + errorString)
+            player.error(error, errorString)
         }
     }
 

=== modified file 'src/qml/player/VideoPlayer.qml'
--- src/qml/player/VideoPlayer.qml	2014-02-13 18:26:52 +0000
+++ src/qml/player/VideoPlayer.qml	2014-09-15 21:45:08 +0000
@@ -37,6 +37,7 @@
     property alias controlsActive: _controls.active
     property bool componentLoaded: false
     readonly property int seekStep: 1000
+    property var errorDialog: null
 
     signal timeClicked
 
@@ -198,4 +199,50 @@
             break;
         }
     }
+
+    Component {
+        id: dialogPlayerError
+
+        Popups.Dialog {
+            id: dialogue
+            objectName: "playError"
+
+            property string errorString: ""
+
+            title: i18n.tr("Error playing video")
+            text: errorString
+
+            Button {
+                text: i18n.tr("Close")
+                onClicked: PopupUtils.close(dialogue)
+            }
+
+            Component.onDestruction: player.errorDialog = null
+        }
+    }
+
+    onError: {
+        if (player.errorDialog !== null)
+
+            return
+
+        player.errorDialog = PopupUtils.open(dialogPlayerError, null)
+        switch(errorCode) {
+        case 1:
+            player.errorDialog.errorString = i18n.tr("Fail to open the source video.")
+            break;
+        case 2:
+            player.errorDialog.errorString = i18n.tr("Video format not supported.")
+            break;
+        case 3:
+            player.errorDialog.errorString = i18n.tr("A network error occurred.")
+            break;
+        case 4:
+            player.errorDialog.errorString = i18n.tr("There are not the appropriate permissions to play a media resource.")
+            break;
+        case 5:
+            player.errorDialog.errorString = i18n.tr("Fail to connect with playback backend.")
+            break;
+        }
+    }
 }