mediaplayer-app

Merge lp:~renatofilho/mediaplayer-app/pocket-pc into lp:mediaplayer-app

pocket-pc
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2016-01-20

Status:

Merged

Approved by:

Bill Filler on 2016-01-27

Approved revision:

398

Merged at revision:

386

Proposed branch:

lp:~renatofilho/mediaplayer-app/pocket-pc

Merge into:

lp:mediaplayer-app

Diff against target:

558 lines (+322/-54)

9 files modified

data/CMakeLists.txt (+5/-0)
data/mediaplayer-app-content.json (+5/-0)
debian/mediaplayer-app.install (+1/-0)
src/mediaplayer.cpp (+55/-0)
src/mediaplayer.h (+1/-0)
src/qml/player.qml (+42/-16)
src/qml/player/Controls.qml (+6/-3)
src/qml/player/ToolBar.qml (+122/-0)
src/qml/player/VideoPlayer.qml (+85/-35)

To merge this branch:

bzr merge lp:~renatofilho/mediaplayer-app/pocket-pc

Related bugs:

Bug #1312659: [desktop] mediaplayer-app toolbar is not easy to reveal	High	Fix Released
Bug #1518332: FileManager should have option for viewing rather than exporting	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-01-26
Ubuntu Phablet Team		2016-01-20	Pending
Review via email: mp+283299@code.launchpad.net

Commit message

*Implement support for content hub.
*Use themed icons for full screen button.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-20:

FAILED: Continuous integration, rev:384
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/278/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6086/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-armhf-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-vivid-i386-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6097/console

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/mediaplayer-app/pocket-pc updated on 2016-01-20

384. By Renato Araujo Oliveira Filho on 2016-01-20

Implement support for content hub.

Copy imported files to user video dir and play the video.

385. By Renato Araujo Oliveira Filho on 2016-01-20

Does not show the empty ulr dialgo if the app was launched by content hub.

386. By Renato Araujo Oliveira Filho on 2016-01-20

Does not set the app visibility to defaul on app startup.

387. By Renato Araujo Oliveira Filho on 2016-01-20

Pause video before start sekking to avoid problems with the player.

388. By Renato Araujo Oliveira Filho on 2016-01-20

Wait the app full load before check for empty url.

Avoid problems with content hub hasPending property.

389. By Renato Araujo Oliveira Filho on 2016-01-20

Fixed wrong return for copyFiles function.

Apped the newFile path into the result list.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-20:

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

review: Approve (continuous-integration)

lp:~renatofilho/mediaplayer-app/pocket-pc updated on 2016-01-20

390. By Renato Araujo Oliveira Filho on 2016-01-20: Check if the app was launched by content hub a bit late, to give it some time to load.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-20:

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/mediaplayer-app/pocket-pc updated on 2016-01-20

391. By Renato Araujo Oliveira Filho on 2016-01-20

Fixed seek with media-hub.

Keep track of seek position to use in consecutives seek operation.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-21:

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-21:

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

review: Approve (continuous-integration)

lp:~renatofilho/mediaplayer-app/pocket-pc updated on 2016-01-21

392. By Renato Araujo Oliveira Filho on 2016-01-21: Created a toolbar component to allow us to control the hide/show animation.
Make sure that the controls are visible before start seeking.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-21:

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/mediaplayer-app/pocket-pc updated on 2016-01-22

393. By Renato Araujo Oliveira Filho on 2016-01-22: Remove unecessary mouser area.
394. By Renato Araujo Oliveira Filho on 2016-01-22: Remove debug message.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-22:

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/mediaplayer-app/pocket-pc updated on 2016-01-22

395. By Renato Araujo Oliveira Filho on 2016-01-22: Reduce controls timeout.
Fix control dissapearing after a seek.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-22:

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/mediaplayer-app/pocket-pc updated on 2016-01-22

396. By Renato Araujo Oliveira Filho on 2016-01-22: Updated toolbar behaviour.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-23:

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/mediaplayer-app/pocket-pc updated on 2016-01-25

397. By Renato Araujo Oliveira Filho on 2016-01-25: Trunk merged.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-25:

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/mediaplayer-app/pocket-pc updated on 2016-01-26

398. By Renato Araujo Oliveira Filho on 2016-01-26: Revert changes on play/pause behavior.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-01-26:

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Renato Araujo Oliveira Filho

Ubuntu Phablet Team

 === modified file 'data/CMakeLists.txt'
 --- data/CMakeLists.txt	2014-10-02 13:42:17 +0000
 +++ data/CMakeLists.txt	2016-01-26 22:05:58 +0000
@@ -2,6 +2,7 @@
  set(MEDIAPLAYER_APP_ICON mediaplayer-app.png)
  set(MEDIAPLAYER_APP_SYMBOLIC_ICON mediaplayer-app-symbolic.svg)
  set(MEDIAPLAYER_URL_DISPATCHER mediaplayer-app.url-dispatcher)
++set(MEDIAPLAYER_CONTENT_HUB mediaplayer-app-content.json)
  configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
  add_custom_target(${DESKTOP_FILE} ALL
@@ -20,3 +21,7 @@
  install(FILES ${MEDIAPLAYER_URL_DISPATCHER}
          DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls
+ )
++
++install(FILES ${MEDIAPLAYER_CONTENT_HUB}
++        DESTINATION ${CMAKE_INSTALL_DATADIR}/content-hub/peers
++        RENAME mediaplayer-app)
 === added file 'data/mediaplayer-app-content.json'
 --- data/mediaplayer-app-content.json	1970-01-01 00:00:00 +0000
 +++ data/mediaplayer-app-content.json	2016-01-26 22:05:58 +0000
@@ -0,0 +1,5 @@
++{
++    "destination": [
++        "videos"
++    ]
++}
 === modified file 'debian/mediaplayer-app.install'
 --- debian/mediaplayer-app.install	2014-09-29 20:53:44 +0000
 +++ debian/mediaplayer-app.install	2016-01-26 22:05:58 +0000
@@ -5,3 +5,4 @@
  /usr/share/mediaplayer-app/qml/*
  /usr/share/locale/*/LC_MESSAGES/mediaplayer-app.mo
  /usr/share/url-dispatcher/urls/*
++/usr/share/content-hub/peers/mediaplayer-app
 === modified file 'src/mediaplayer.cpp'
 --- src/mediaplayer.cpp	2016-01-05 15:12:20 +0000
 +++ src/mediaplayer.cpp	2016-01-26 22:05:58 +0000
@@ -25,6 +25,7 @@
  #include <QtCore/QLibrary>
  #include <QtCore/QTimer>
  #include <QtCore/QStandardPaths>
++#include <QtCore/QMimeDatabase>
  #include <QtWidgets/QFileDialog>
  #include <QtQml/QQmlContext>
  #include <QtQml/QQmlEngine>
@@ -216,3 +217,57 @@
      return fileName;
+ }
++
++QList<QUrl> MediaPlayer::copyFiles(const QList<QUrl> &urls)
++{
++    static QString moviesDir = QStandardPaths::writableLocation(QStandardPaths::MoviesLocation);
++
++    QList<QUrl> result;
++
++    Q_FOREACH(const QUrl &url, urls) {
++        if (!url.isLocalFile()) {
++            qWarning() << "Remote files not supported:" << url;
++            continue;
++        }
++
++        QFileInfo originalFile(url.toLocalFile());
++
++        QString filename = originalFile.fileName();
++        QString suffix = originalFile.completeSuffix();
++        QString filenameWithoutSuffix;
++        if (suffix.isEmpty()) {
++            QMimeDatabase mdb;
++            QMimeType mt = mdb.mimeTypeForFile(originalFile.absoluteFilePath());
++
++            // If the filename doesn't have an extension add one from the
++            // detected mimetype
++            if(!mt.preferredSuffix().isEmpty()) {
++                suffix = mt.preferredSuffix();
++            }
++            filenameWithoutSuffix = filename;
++        } else {
++            filenameWithoutSuffix = originalFile.baseName();
++        }
++
++        QFileInfo newFile(moviesDir, QString("%1.%2").arg(filenameWithoutSuffix).arg(suffix));
++        if (newFile.exists()) {
++            // find a alternative name
++            int index = 1;
++            do {
++                newFile = QFileInfo(moviesDir,
++                                      QString("%1(%2).%3")
++                                        .arg(filenameWithoutSuffix)
++                                        .arg(index)
++                                        .arg(suffix));
++                index++;
++            } while (newFile.exists());
++        }
++
++        if (QFile::copy(originalFile.absoluteFilePath(), newFile.absoluteFilePath())) {
++            result <<  QUrl::fromLocalFile(newFile.absoluteFilePath());
++        } else {
++            qWarning() << "Fail to copy file from:" << originalFile.absoluteFilePath() << "to" << newFile.absoluteFilePath();
++        }
++    }
++    return result;
++}
 === modified file 'src/mediaplayer.h'
 --- src/mediaplayer.h	2014-02-13 18:26:52 +0000
 +++ src/mediaplayer.h	2016-01-26 22:05:58 +0000
@@ -40,6 +40,7 @@
      void onHeightChanged(int);
      bool isDesktopMode() const;
      QUrl chooseFile();
++    QList<QUrl> copyFiles(const QList<QUrl> &urls);
  private:
      QQuickView *m_view;
 === modified file 'src/qml/player.qml'
 --- src/qml/player.qml	2015-04-28 18:56:10 +0000
 +++ src/qml/player.qml	2016-01-26 22:05:58 +0000
@@ -25,6 +25,7 @@
  import Ubuntu.Unity.Action 1.1 as UnityActions
  import Ubuntu.Components 1.1
  import Ubuntu.Components.Popups 1.0 as Popups
++import Ubuntu.Content 0.1 as ContentHub
  Item {
      id: mediaPlayer
@@ -35,7 +36,6 @@
      property string formFactor: "phone"
      property real volume: playerLoader.item.volume
      property bool appActive: Qt.application.active
--
      property variant nativeOrientation: Screen.primaryOrientation
      onAppActiveChanged: {
@@ -84,16 +84,8 @@
              item.focus = true
              item.rotating = Qt.binding(function () { return rotatingTransition.running } )
              if (playUri != "") {
++                lateUrlCheck.stop()
                  item.playUri(playUri)
--            } else {
--                if (mpApplication.desktopMode) {
--                    var videoFile = mpApplication.chooseFile()
--                    if (videoFile != "") {
--                        item.playUri(videoFile)
--                    }
--                } else {
--                    PopupUtils.open(dialogNoUrl, null)
--                }
+             }
+         }
@@ -212,14 +204,10 @@
+     }
      Keys.onReleased: {
--        if (!event.isAutoRepeat
--            && (event.key == Qt.Key_F11 || event.key == Qt.Key_F)) {
--            event.accepted = true
--            application.toggleFullscreen();
--        } else if (!event.isAutoRepeat && event.key == Qt.Key_BracketLeft) {
++       if (!event.isAutoRepeat && event.key === Qt.Key_BracketLeft) {
              event.accepted = true
              rotateClockwise()
--        } else if (!event.isAutoRepeat && event.key == Qt.Key_BracketRight) {
++        } else if (!event.isAutoRepeat && event.key === Qt.Key_BracketRight) {
              event.accepted = true
              rotateCounterClockwise()
+         }
@@ -229,9 +217,47 @@
          target: UriHandler
          onOpened: {
              for (var i = 0; i < uris.length; ++i) {
++                lateUrlCheck.stop()
                  var videoUri = uris[i].replace("video://", "file://")
                  playerLoader.item.playUri(videoUri)
+             }
+         }
+     }
++
++    Connections {
++        target: ContentHub.ContentHub
++        onImportRequested: {
++            lateUrlCheck.stop()
++            if (transfer.state === ContentHub.ContentTransfer.Charged) {
++                var urls = []
++                for(var i=0; i < transfer.items.length; i++) {
++                    urls.push(transfer.items[i].url)
++                }
++
++                var result = mpApplication.copyFiles(urls);
++                if (result.length > 0)
++                    playerLoader.item.playUri(result[result.length - 1])
++            }
++        }
++    }
++
++    Timer {
++        id: lateUrlCheck
++
++        interval: 1000
++        repeat: false
++        running: true
++        onTriggered: {
++            if ((playUri == "") && !ContentHub.ContentHub.hasPending) {
++                if (mpApplication.desktopMode) {
++                    var videoFile = mpApplication.chooseFile()
++                    if (videoFile != "") {
++                        playerLoader.item.playUri(videoFile)
++                    }
++                } else {
++                    PopupUtils.open(dialogNoUrl, null)
++                }
++            }
++        }
++    }
+ }
 === modified file 'src/qml/player/Controls.qml'
 --- src/qml/player/Controls.qml	2015-03-20 17:34:56 +0000
 +++ src/qml/player/Controls.qml	2016-01-26 22:05:58 +0000
@@ -19,6 +19,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
  import QtQuick 2.0
++import QtQuick.Window 2.2
  import QtMultimedia 5.0
  import Ubuntu.Components 1.1
@@ -152,13 +153,16 @@
                  id: _fullScreenButton
                  //TODO: use the correct icon based on window state
--                iconSource: mpApplication.desktopMode ? "artwork/icon_exitfscreen.png" : "image://theme/back"
++                iconSource: mpApplication.desktopMode ?
++                                Window.visibility ===  Window.FullScreen ? "image://theme/view-restore" : "image://theme/view-fullscreen" :
++                                "image://theme/close"
                  iconSize: units.gu(3)
                  anchors.verticalCenter: parent.verticalCenter
--                width: units.gu(8)
++                width: visible ? units.gu(8) : 0
                  height: units.gu(4)
                  onClicked: controls.fullscreenClicked()
                  leftAlignment: true
++                visible: (mpApplication.desktopMode || (Window.visibility ===  Window.FullScreen))
+             }
              VLine {
@@ -341,7 +345,6 @@
      Connections {
          target: controls
          onPlayerStatusChanged: {
--            console.debug("onPlayerStatusChanged")
              _timeline.playerStatus = controls.playerStatus
+         }
+     }
 === added file 'src/qml/player/ToolBar.qml'
 --- src/qml/player/ToolBar.qml	1970-01-01 00:00:00 +0000
 +++ src/qml/player/ToolBar.qml	2016-01-26 22:05:58 +0000
@@ -0,0 +1,122 @@
++/*
++ * Copyright (C) 2013 Canonical, Ltd.
++ *
++ * Authors:
++ *  Renato Araujo Oliveira Filho <renato@canonical.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++
++
++MouseArea {
++    id: root
++
++    property bool active: false
++    readonly property alias aboutToDismiss: dismissControls.running
++    default property alias controls: contents.children
++    readonly property bool fullVisible: (spacer.height === 0)
++
++    function dismiss()
++    {
++        dismissControls.restart()
++    }
++
++    function abortDismiss()
++    {
++        dismissControls.stop()
++        active = true
++    }
++
++    onActiveChanged: dismissControls.stop()
++
++    hoverEnabled: true
++    onExited: dismiss()
++    onEntered: {
++        abortDismiss()
++        active = true
++    }
++
++    Timer {
++        id: dismissControls
++
++        running: false
++        interval: 3000
++        repeat: false
++        onTriggered: root.active = false
++    }
++
++    Column {
++        anchors.fill: parent
++        Item {
++            id: spacer
++            anchors {
++                left: parent.left
++                right: parent.right
++            }
++            height: root.active ? 0 : contents.height
++        }
++        Item {
++            id: contents
++            anchors {
++                left: parent.left
++                right: parent.right
++            }
++            height: childrenRect.height
++        }
++    }
++
++    states: [
++        State {
++            name: "active"
++            when: root.active
++            PropertyChanges {
++                target: spacer
++                height: 0
++                enabled: false
++            }
++        },
++        State {
++            name: "deActive"
++            when: !root.active
++            PropertyChanges {
++                target: spacer
++                height: contents.height
++                enabled: true
++            }
++        }
++    ]
++
++    transitions: [
++        Transition {
++            from: "deActive"
++            to: "active"
++            UbuntuNumberAnimation {
++                target: spacer
++                property: "height"
++                duration: UbuntuAnimation.FastDuration
++            }
++        },
++        Transition {
++            from: "active"
++            to: "deActive"
++            UbuntuNumberAnimation {
++                target: spacer
++                property: "height"
++                duration: UbuntuAnimation.SlowDuration
++            }
++        }
++    ]
++}
 === modified file 'src/qml/player/VideoPlayer.qml'
 --- src/qml/player/VideoPlayer.qml	2015-05-01 20:10:32 +0000
 +++ src/qml/player/VideoPlayer.qml	2016-01-26 22:05:58 +0000
@@ -78,7 +78,8 @@
  //        videoOutput: player.videoOutput
  //    }
--    GenericToolbar {
++
++    ToolBar {
          id: _controls
          objectName: "toolbar"
@@ -89,11 +90,48 @@
+         }
          height: _controlsContents.height
--
          Controls {
              id: _controlsContents
--            property bool isPaused: false
++            property bool wasPausedBeforeSeek: false
++            property bool wasVisibleBeforeSeek: false
++            property int seekPosition: 0
++
++            function aboutToSeek()
++            {
++                wasPausedBeforeSeek = (state == "paused")
++                wasVisibleBeforeSeek = _controls.active && !_controls.aboutToDismiss
++                _controls.abortDismiss()
++                player.pause()
++                _controls.active = true
++                _controlsContents.seekPosition = video.position
++            }
++
++            function seekDone()
++            {
++                // Only automatically resume playing after a seek that is not to the
++                // end of stream (i.e. position == duration)
++                if (player.status !== MediaPlayer.EndOfMedia && !_controlsContents.wasPausedBeforeSeek) {
++                    player.play()
++                }
++
++                if (!_controlsContents.wasVisibleBeforeSeek) {
++                    _controls.dismiss()
++                }
++
++                _controlsContents.seekPosition = -1
++                _controlsContents.wasPausedBeforeSeek = false
++                _controlsContents.wasVisibleBeforeSeek = false
++            }
++
++            function seek(time)
++            {
++                //keep trak of last seek position in case of the last seek does not complete in time
++                //sometimes the seek is too fast and we can not rely on the video position to calculate
++                //the next seek position.
++                _controlsContents.seekPosition = time
++                player.video.seek(time)
++            }
              settingsEnabled: mpApplication.desktopMode
@@ -120,22 +158,9 @@
+                 }
+             }
--            onSeekRequested: {
--                player.video.seek(time)
--            }
--
--            onStartSeek: {
--                isPaused = (state == "paused")
--                player.pause()
--            }
--
--            onEndSeek: {
--                // Only automatically resume playing after a seek that is not to the
--                // end of stream (i.e. position == duration)
--                if (player.status != MediaPlayer.EndOfMedia && !isPaused) {
--                    player.play()
--                }
--            }
++            onStartSeek: aboutToSeek()
++            onEndSeek: seekDone()
++            onSeekRequested: seek(time)
              onSettingsClicked: {
                  if (mpApplication.desktopMode) {
@@ -150,17 +175,34 @@
+     }
      MouseArea {
--        id: _mouseArea
--
--        objectName: "videoMouseArea"
--        anchors {
--            left: parent.left
--            right: parent.right
--            top: parent.top
--            bottom: _controls.top
--        }
--
--        onClicked: _controls.active = !_controls.active
++            id: _mouseArea
++
++            objectName: "videoMouseArea"
++            anchors {
++                left: parent.left
++                right: parent.right
++                top: parent.top
++                bottom: _controls.top
++            }
++
++            onClicked: _controls.active = !_controls.active
++        }
++
++
++    Keys.onReleased:
++    {
++        if (event.isAutoRepeat) {
++            return
++        }
++
++        switch(event.key) {
++            case Qt.Key_Right:
++            case Qt.Key_Left:
++                _controlsContents.seekDone()
++                break;
++            default:
++                break
++        }
+     }
      Keys.onPressed: {
@@ -171,9 +213,17 @@
          case Qt.Key_Right:
          case Qt.Key_Left:
+         {
--            var currentPos = (video ? video.position : 0)
--            var nextPos = currentPos
--            if (event.key == Qt.Key_Right) {
++            if (!event.isAutoRepeat) {
++                _controlsContents.aboutToSeek()
++            }
++            // wait controls be fully visbile
++            if (!_controls.fullVisible)
++                return
++
++            var nextPos = _controlsContents.seekPosition >=  0 ?
++                        _controlsContents.seekPosition : 0
++
++            if (event.key === Qt.Key_Right) {
                  var maxPos = (video ? video.duration : 0)
                  nextPos += player.seekStep
                  if (nextPos > maxPos) {
@@ -186,8 +236,8 @@
+                 }
+             }
--            if (nextPos != -1) {
--                player.video.seek(nextPos)
++            if (nextPos !== -1) {
++                _controlsContents.seek(nextPos)
+             }
              break;
+         }

mediaplayer-app

Merge lp:~renatofilho/mediaplayer-app/pocket-pc into lp:mediaplayer-app

Commit message

Description of the change

Preview Diff

Subscribers