← Back to branch summary

~cprov/uci-engine/tarmac-multienv

« back to all changes in this revision

Viewing changes to cupstream2distro/tests/data/bzrlogs/withstarlogdiff

  • Committer: Francis Ginther
  • Date: 2014-06-10 20:42:46 UTC
  • mto: This revision was merged to the branch mainline in revision 571.
  • Revision ID: francis.ginther@canonical.com-20140610204246-b1bsrik7nlcolqy7
Import lp:cupstream2distro rev 605.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cupstream2distro/tests/data/bzrlogs/withstarlogdiff
 
1
------------------------------------------------------------
 
2
revno: 140 [merge]
 
3
author: Jim Hodapp <jim.hodapp@canonical.com>
 
4
committer: Tarmac
 
5
branch nick: trunk
 
6
timestamp: Thu 2013-09-26 04:54:16 +0000
 
7
message:
 
8
  * Drop support for thumbnail as we can't depend on gstreamer directly until qtmultimedia supports gst1.0 (currently only the -touch fork supports it)
 
9
  * Remove gstreamer related packages from build-dependencies.
 
10
  
 
11
  Approved by PS Jenkins bot, Ricardo Salveti.
 
12
diff:
 
13
=== modified file 'CMakeLists.txt'
 
14
--- CMakeLists.txt      2013-07-29 11:31:35 +0000
 
15
+++ CMakeLists.txt      2013-09-25 23:08:08 +0000
 
16
@@ -30,7 +30,7 @@
 
17
 find_package(Qt5Quick)
 
18
 
 
19
 include(FindPkgConfig)
 
20
-pkg_check_modules(GSTLIB REQUIRED gstreamer-0.10)
 
21
+#pkg_check_modules(GSTLIB REQUIRED gstreamer-1.0)
 
22
 
 
23
 # Standard install paths
 
24
 include(GNUInstallDirs)
 
25
 
 
26
=== modified file 'debian/control'
 
27
--- debian/control      2013-09-09 14:37:58 +0000
 
28
+++ debian/control      2013-09-25 23:08:08 +0000
 
29
@@ -7,7 +7,7 @@
 
30
                dh-translations,
 
31
                libgl1-mesa-dev[i386 amd64] | libgl-dev[i386 amd64],
 
32
                libgles2-mesa-dev[armhf],
 
33
-               libgstreamer0.10-dev,
 
34
+               pkg-config,
 
35
                python,
 
36
                qtbase5-dev,
 
37
                qtdeclarative5-dev,
 
38
@@ -23,9 +23,6 @@
 
39
 Architecture: i386 amd64 armhf
 
40
 Depends: ${misc:Depends},
 
41
          ${shlibs:Depends},
 
42
-         gstreamer0.10-plugins-base,
 
43
-         gstreamer0.10-plugins-good,
 
44
-         gstreamer0.10-ffmpeg,
 
45
          qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,
 
46
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
 
47
          qtdeclarative5-ubuntu-ui-extras0.1,
 
48
 
 
49
=== modified file 'src/CMakeLists.txt'
 
50
--- src/CMakeLists.txt  2013-05-20 19:46:02 +0000
 
51
+++ src/CMakeLists.txt  2013-09-25 23:08:08 +0000
 
52
@@ -5,17 +5,17 @@
 
53
 include_directories(
 
54
     ${CMAKE_BINARY_DIR}
 
55
     ${sdkhelper_SOURCE_DIR}
 
56
-    ${GSTLIB_INCLUDE_DIRS}
 
57
+    #${GSTLIB_INCLUDE_DIRS}
 
58
     )
 
59
 
 
60
 set(mediaplayer_HDRS
 
61
-    thumbnail-provider.h
 
62
-    thumbnail-pipeline-gst.h
 
63
+    #thumbnail-provider.h
 
64
+    #thumbnail-pipeline-gst.h
 
65
     mediaplayer.h)
 
66
 
 
67
 set(mediaplayer_SRCS
 
68
-    thumbnail-provider.cpp
 
69
-    thumbnail-pipeline-gst.cpp
 
70
+    #thumbnail-provider.cpp
 
71
+    #thumbnail-pipeline-gst.cpp
 
72
     mediaplayer.cpp
 
73
     main.cpp)
 
74
 
 
75
@@ -28,7 +28,7 @@
 
76
 
 
77
 target_link_libraries(${MEDIAPLAYER}
 
78
     sdkhelper
 
79
-    ${GSTLIB_LDFLAGS}
 
80
+    #${GSTLIB_LDFLAGS}
 
81
     )
 
82
 
 
83
 install(TARGETS ${MEDIAPLAYER}
 
84
 
 
85
=== modified file 'src/mediaplayer.cpp'
 
86
--- src/mediaplayer.cpp 2013-05-23 20:20:10 +0000
 
87
+++ src/mediaplayer.cpp 2013-09-25 23:08:08 +0000
 
88
@@ -14,7 +14,7 @@
 
89
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
90
  */
 
91
 #include "mediaplayer.h"
 
92
-#include "thumbnail-provider.h"
 
93
+//#include "thumbnail-provider.h"
 
94
 #include "sharefile.h"
 
95
 
 
96
 #include <QtCore/QDir>
 
97
@@ -77,7 +77,7 @@
 
98
     qmlRegisterType<ShareFile>("SDKHelper", 1, 0, "ShareFile");
 
99
 
 
100
     m_view = new QQuickView();
 
101
-    m_view->engine()->addImageProvider("video", new ThumbnailProvider);
 
102
+    //m_view->engine()->addImageProvider("video", new ThumbnailProvider);
 
103
     m_view->setColor(QColor("black"));
 
104
     m_view->setResizeMode(QQuickView::SizeRootObjectToView);
 
105
     m_view->setTitle("Media Player");
 
106
@@ -87,7 +87,7 @@
 
107
             uri = QUrl::fromLocalFile(QDir::current().absoluteFilePath(args[1]));
 
108
         }
 
109
 
 
110
-        // For now we only accept local files
 
111
+        // Check if it's a local file
 
112
         if (uri.isValid() && uri.isLocalFile()) {
 
113
             QFileInfo info(uri.toLocalFile());
 
114
             if (info.exists() && info.isFile()) {
 
115
@@ -95,6 +95,9 @@
 
116
             } else {
 
117
                 qWarning() << "File not found:" << uri << info.exists() << info.isFile();
 
118
             }
 
119
+        // Otherwise see if it's a remote stream
 
120
+        } else if (uri.isValid()) {
 
121
+            m_view->rootContext()->setContextProperty("playUri", uri);
 
122
         } else {
 
123
             qWarning() << "Invalid uri:" << uri;
 
124
         }
 
125
 
 
126
=== modified file 'src/qml/player/Controls.qml'
 
127
--- src/qml/player/Controls.qml 2013-09-02 08:55:48 +0000
 
128
+++ src/qml/player/Controls.qml 2013-09-25 23:19:16 +0000
 
129
@@ -64,10 +64,16 @@
 
130
 
 
131
         property bool parentActive: _controls.active
 
132
 
 
133
+        function selectSceneAt(time) {
 
134
+            // SKIP it for now, we need to fix hybris bug #1231147
 
135
+            return
 
136
+        }
 
137
+
 
138
         objectName: "Controls.SceneSelector"
 
139
         opacity: 0
 
140
         visible: opacity > 0
 
141
-        model: _sceneSelectorModel
 
142
+        // SKIP it for now, we need to fix hybris bug #1231147
 
143
+        //model: _sceneSelectorModel
 
144
         anchors {
 
145
             left: parent.left
 
146
             right: parent.right
 
147
@@ -84,7 +90,8 @@
 
148
         ParallelAnimation {
 
149
             id: _showAnimation
 
150
 
 
151
-            running: _sceneSelector.show
 
152
+            // SKIP it for now, we need to fix hybris bug #1231147
 
153
+            running: false //_sceneSelector.show
 
154
             NumberAnimation { target: _sceneSelector; property: "opacity"; to: 1; duration: 175 }
 
155
             NumberAnimation { target: controls; property: "heightOffset"; to: 0; duration: 175 }
 
156
         }
 
157
@@ -92,7 +99,8 @@
 
158
         ParallelAnimation {
 
159
             id: _hideAnimation
 
160
 
 
161
-            running: !_sceneSelector.show
 
162
+            // SKIP it for now, we need to fix hybris bug #1231147
 
163
+            running: false //!_sceneSelector.show
 
164
             NumberAnimation { target: _sceneSelector; property: "opacity"; to: 0; duration: 175 }
 
165
             NumberAnimation { target: controls; property: "heightOffset"; to: units.gu(2); duration: 175 }
 
166
         }
 
167
@@ -151,7 +159,7 @@
 
168
         Item {
 
169
             id: _timeLineAnchor
 
170
 
 
171
-            anchors {                
 
172
+            anchors {
 
173
                 left: _playbackButtom.right
 
174
                 leftMargin: units.gu(2)
 
175
                 right: _shareButton.left
 
176
 
 
177
=== modified file 'src/qml/player/VideoPlayer.qml'
 
178
--- src/qml/player/VideoPlayer.qml      2013-09-03 15:28:59 +0000
 
179
+++ src/qml/player/VideoPlayer.qml      2013-09-25 23:04:03 +0000
 
180
@@ -33,7 +33,7 @@
 
181
     property int pressCount: 0
 
182
     property bool wasPlaying: false
 
183
     property string uri
 
184
-    property bool rotating: false   
 
185
+    property bool rotating: false
 
186
     property alias controlsActive: _controls.active
 
187
     property bool componentLoaded: false
 
188
 
 
189
 
 
190
=== modified file 'tests/CMakeLists.txt'
 
191
--- tests/CMakeLists.txt        2013-04-04 22:18:39 +0000
 
192
+++ tests/CMakeLists.txt        2013-09-25 23:08:08 +0000
 
193
@@ -1,4 +1,4 @@
 
194
 add_subdirectory(videos)
 
195
 add_subdirectory(images)
 
196
 add_subdirectory(autopilot)
 
197
-add_subdirectory(unittest)
 
198
+#add_subdirectory(unittest)
 
199
 
 
200
=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
 
201
--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py     2013-09-10 14:36:10 +0000
 
202
+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py     2013-09-25 21:19:34 +0000
 
203
@@ -74,7 +74,7 @@
 
204
         self.assertProperty(player, playing=True, paused=False)
 
205
         self.assertProperty(playback_buttom, icon="pause")
 
206
 
 
207
-    @skipIf(model() == 'Nexus 4' or model() == 'Galaxy Nexus', 'Screen width not enough for seekbar')
 
208
+    @skip("New backend work needed. bug 1231147")
 
209
     def test_scene_selector_visibility(self):
 
210
         self.show_controls()
 
211
         self.pause_video()
 
212
------------------------------------------------------------
 
213
Use --include-merged or -n0 to see merged revisions.