Merge lp:~renatofilho/mediaplayer-app/fix-end-of-file into lp:mediaplayer-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Jim Hodapp
Approved revision: 72
Merged at revision: 73
Proposed branch: lp:~renatofilho/mediaplayer-app/fix-end-of-file
Merge into: lp:mediaplayer-app
Diff against target: 23 lines (+1/-1)
2 files modified
src/qml/player.qml (+1/-0)
src/qml/player/AbstractPlayer.qml (+0/-1)
To merge this branch: bzr merge lp:~renatofilho/mediaplayer-app/fix-end-of-file
Reviewer Review Type Date Requested Status
Jim Hodapp (community) code Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+159733@code.launchpad.net

Commit message

Stop video at EOF.
Does not clear the source property of MediaPlayer inside of the stop function.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Jim Hodapp (jhodapp) wrote :

Looks good, nice simple fix.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/player.qml'
2--- src/qml/player.qml 2013-04-01 20:24:16 +0000
3+++ src/qml/player.qml 2013-04-18 21:54:25 +0000
4@@ -137,6 +137,7 @@
5 target: playerLoader.item
6 onStatusChanged: {
7 if (playerLoader.item.status === MediaPlayer.EndOfMedia) {
8+ playerLoader.item.stop()
9 playerLoader.item.controlsActive = true
10 }
11 }
12
13=== modified file 'src/qml/player/AbstractPlayer.qml'
14--- src/qml/player/AbstractPlayer.qml 2013-02-21 20:52:29 +0000
15+++ src/qml/player/AbstractPlayer.qml 2013-04-18 21:54:25 +0000
16@@ -46,7 +46,6 @@
17
18 function stop() {
19 state = "stopped"
20- source = ""
21 }
22
23 function play() {

Subscribers

People subscribed via source and target branches