Merge lp:~renatofilho/mediaplayer-app/no-fullscreen into lp:mediaplayer-app
- no-fullscreen
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Bill Filler |
Approved revision: | 191 |
Merged at revision: | 190 |
Proposed branch: | lp:~renatofilho/mediaplayer-app/no-fullscreen |
Merge into: | lp:mediaplayer-app |
Diff against target: |
80 lines (+17/-2) 4 files modified
src/mediaplayer.cpp (+9/-0) src/mediaplayer.h (+2/-0) src/qml/player.qml (+1/-0) src/qml/player/VideoPlayer.qml (+5/-2) |
To merge this branch: | bzr merge lp:~renatofilho/mediaplayer-app/no-fullscreen |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Bill Filler (community) | Approve | ||
Review via email: mp+199823@code.launchpad.net |
Commit message
Disabled fullscreen as default mode.
Description of the change
PS Jenkins bot (ps-jenkins) wrote : | # |
- 185. By Launchpad Translations on behalf of phablet-team
-
Launchpad automatic translations update.
- 186. By Launchpad Translations on behalf of phablet-team
-
Launchpad automatic translations update.
- 187. By Launchpad Translations on behalf of phablet-team
-
Launchpad automatic translations update.
- 188. By Launchpad Translations on behalf of phablet-team
-
Launchpad automatic translations update.
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:185
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 189. By Renato Araujo Oliveira Filho
-
clicking/tap anywhere in the scrubber should cause seek directly to that position where you clicked.
Approved by Bill Filler, PS Jenkins bot.
Bill Filler (bfiller) wrote : | # |
this needs fixing. it works on the desktop (doesn't launch in fullscreen) but on the phone it no longer launches in fullscreen either (you see the indicator panel and you are not supposed to).
Since we are going to have the deb and desktop file for the 14.04 desktop version and a click package for the devices, maybe you can make the click package exec line have a --fullscreen arg passed to it and don't pass this arg in the desktop file? Then the app would just honor the value of the argument passed in
- 190. By Renato Araujo Oliveira Filho
-
Used "DESKTOP_MODE" enviroment variable to controll full screen behaviour.
Do not use full screen as default mode on desktop.
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:190
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Bill Filler (bfiller) wrote : | # |
Can we add a check for desktop mode also in the active signal so that the video doesn't get suspended when losing focus on the desktop?
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:190
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 191. By Renato Araujo Oliveira Filho
-
Avoid pause the video when the application lost focus on desktop mode.
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:191
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Bill Filler (bfiller) wrote : | # |
tested, works with and without env var set
PS Jenkins bot (ps-jenkins) : | # |
Preview Diff
1 | === modified file 'src/mediaplayer.cpp' | |||
2 | --- src/mediaplayer.cpp 2013-09-30 21:41:19 +0000 | |||
3 | +++ src/mediaplayer.cpp 2014-01-07 17:29:56 +0000 | |||
4 | @@ -53,6 +53,9 @@ | |||
5 | 53 | bool windowed = args.removeAll("-w") + args.removeAll("--windowed") > 0; | 53 | bool windowed = args.removeAll("-w") + args.removeAll("--windowed") > 0; |
6 | 54 | bool testability = args.removeAll("-testability") > 0; | 54 | bool testability = args.removeAll("-testability") > 0; |
7 | 55 | 55 | ||
8 | 56 | // use windowed in desktop as default | ||
9 | 57 | windowed = windowed || isDesktopMode(); | ||
10 | 58 | |||
11 | 56 | // The testability driver is only loaded by QApplication but not by | 59 | // The testability driver is only loaded by QApplication but not by |
12 | 57 | // QGuiApplication. | 60 | // QGuiApplication. |
13 | 58 | // However, QApplication depends on QWidget which would add some | 61 | // However, QApplication depends on QWidget which would add some |
14 | @@ -104,6 +107,7 @@ | |||
15 | 104 | } | 107 | } |
16 | 105 | } | 108 | } |
17 | 106 | 109 | ||
18 | 110 | m_view->rootContext()->setContextProperty("mpApplication", this); | ||
19 | 107 | m_view->rootContext()->setContextProperty("playUri", playUri); | 111 | m_view->rootContext()->setContextProperty("playUri", playUri); |
20 | 108 | m_view->rootContext()->setContextProperty("screenWidth", m_view->size().width()); | 112 | m_view->rootContext()->setContextProperty("screenWidth", m_view->size().width()); |
21 | 109 | m_view->rootContext()->setContextProperty("screenHeight", m_view->size().height()); | 113 | m_view->rootContext()->setContextProperty("screenHeight", m_view->size().height()); |
22 | @@ -158,3 +162,8 @@ | |||
23 | 158 | { | 162 | { |
24 | 159 | m_view->rootContext()->setContextProperty("screenHeight", height); | 163 | m_view->rootContext()->setContextProperty("screenHeight", height); |
25 | 160 | } | 164 | } |
26 | 165 | |||
27 | 166 | bool MediaPlayer::isDesktopMode() const | ||
28 | 167 | { | ||
29 | 168 | return (qEnvironmentVariableIsSet("DESKTOP_MODE") && (qgetenv("DESKTOP_MODE") == "1")); | ||
30 | 169 | } | ||
31 | 161 | 170 | ||
32 | === modified file 'src/mediaplayer.h' | |||
33 | --- src/mediaplayer.h 2013-02-12 14:30:57 +0000 | |||
34 | +++ src/mediaplayer.h 2014-01-07 17:29:56 +0000 | |||
35 | @@ -23,6 +23,7 @@ | |||
36 | 23 | class MediaPlayer : public QGuiApplication | 23 | class MediaPlayer : public QGuiApplication |
37 | 24 | { | 24 | { |
38 | 25 | Q_OBJECT | 25 | Q_OBJECT |
39 | 26 | Q_PROPERTY(bool desktopMode READ isDesktopMode) | ||
40 | 26 | 27 | ||
41 | 27 | public: | 28 | public: |
42 | 28 | MediaPlayer(int &argc, char **argv); | 29 | MediaPlayer(int &argc, char **argv); |
43 | @@ -34,6 +35,7 @@ | |||
44 | 34 | void toggleFullscreen(); | 35 | void toggleFullscreen(); |
45 | 35 | void onWidthChanged(int); | 36 | void onWidthChanged(int); |
46 | 36 | void onHeightChanged(int); | 37 | void onHeightChanged(int); |
47 | 38 | bool isDesktopMode() const; | ||
48 | 37 | 39 | ||
49 | 38 | private: | 40 | private: |
50 | 39 | QQuickView *m_view; | 41 | QQuickView *m_view; |
51 | 40 | 42 | ||
52 | === modified file 'src/qml/player.qml' | |||
53 | --- src/qml/player.qml 2013-10-21 11:47:18 +0000 | |||
54 | +++ src/qml/player.qml 2014-01-07 17:29:56 +0000 | |||
55 | @@ -40,6 +40,7 @@ | |||
56 | 40 | 40 | ||
57 | 41 | onAppActiveChanged: { | 41 | onAppActiveChanged: { |
58 | 42 | if (!appActive && | 42 | if (!appActive && |
59 | 43 | !mpApplication.desktopMode && | ||
60 | 43 | playerLoader.item && | 44 | playerLoader.item && |
61 | 44 | playerLoader.item.playing) { | 45 | playerLoader.item.playing) { |
62 | 45 | playerLoader.item.pause() | 46 | playerLoader.item.pause() |
63 | 46 | 47 | ||
64 | === modified file 'src/qml/player/VideoPlayer.qml' | |||
65 | --- src/qml/player/VideoPlayer.qml 2013-09-25 23:04:03 +0000 | |||
66 | +++ src/qml/player/VideoPlayer.qml 2014-01-07 17:29:56 +0000 | |||
67 | @@ -115,8 +115,11 @@ | |||
68 | 115 | onPlaybackClicked: player.playPause() | 115 | onPlaybackClicked: player.playPause() |
69 | 116 | 116 | ||
70 | 117 | onFullscreenClicked: { | 117 | onFullscreenClicked: { |
73 | 118 | //TODO: wait for shell supports fullscreen | 118 | if (mpApplication.desktopMode) { |
74 | 119 | Qt.quit() | 119 | mpApplication.toggleFullscreen() |
75 | 120 | } else { | ||
76 | 121 | Qt.quit() | ||
77 | 122 | } | ||
78 | 120 | } | 123 | } |
79 | 121 | 124 | ||
80 | 122 | onSeekRequested: { | 125 | onSeekRequested: { |
FAILED: Continuous integration, rev:185 jenkins. qa.ubuntu. com/job/ mediaplayer- app-ci/ 153/ jenkins. qa.ubuntu. com/job/ generic- mediumtests- trusty/ 1904 jenkins. qa.ubuntu. com/job/ generic- mediumtests- trusty- touch/1821 jenkins. qa.ubuntu. com/job/ mediaplayer- app-trusty- amd64-ci/ 9 jenkins. qa.ubuntu. com/job/ mediaplayer- app-trusty- armhf-ci/ 9 jenkins. qa.ubuntu. com/job/ mediaplayer- app-trusty- armhf-ci/ 9/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mediaplayer- app-trusty- i386-ci/ 9 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-trusty/ 1679 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- amd64/1904 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- amd64/1904/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- armhf/1821 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- trusty- armhf/1821/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner- mako/4308 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 2576
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mediaplayer -app-ci/ 153/rebuild
http://