Merge lp:~phablet-team/qtubuntu-media-signals/fix-black-video-issues into lp:qtubuntu-media-signals

Proposed by Jim Hodapp on 2015-06-18
Status: Merged
Approved by: Alfonso Sanchez-Beato on 2015-07-22
Approved revision: 22
Merged at revision: 20
Proposed branch: lp:~phablet-team/qtubuntu-media-signals/fix-black-video-issues
Merge into: lp:qtubuntu-media-signals
Diff against target: 46 lines (+14/-3)
3 files modified
CMakeLists.txt (+3/-3)
debian/changelog (+6/-0)
src/qtubuntu_media_signals.h (+5/-0)
To merge this branch: bzr merge lp:~phablet-team/qtubuntu-media-signals/fix-black-video-issues
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato 2015-06-18 Approve on 2015-07-22
PS Jenkins bot continuous-integration Approve on 2015-06-18
Review via email: mp+262363@code.launchpad.net

Commit message

Add sinkReset signal which allows qtvideo-node to take appropriate action to reset some of its internal state.

Description of the change

Add sinkReset signal which allows qtvideo-node to take appropriate action to reset some of its internal state.

To post a comment you must log in.
21. By Jim Hodapp on 2015-06-18

Bump the package version

22. By Jim Hodapp on 2015-06-18

Update version number for changelog.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-03-12 15:51:11 +0000
3+++ CMakeLists.txt 2015-06-18 17:55:35 +0000
4@@ -1,9 +1,9 @@
5 project(qtubuntu-media-signals)
6 cmake_minimum_required(VERSION 2.8.9)
7
8-set(SONAME 1)
9-set(VERSION 1.0)
10-set(SOVERSION 1.0.0)
11+set(SONAME 2)
12+set(VERSION 2.0)
13+set(SOVERSION 2.0.0)
14
15 # Instruct CMake to run moc automatically when needed.
16 set(CMAKE_AUTOMOC ON)
17
18=== modified file 'debian/changelog'
19--- debian/changelog 2014-11-04 05:01:05 +0000
20+++ debian/changelog 2015-06-18 17:55:35 +0000
21@@ -1,3 +1,9 @@
22+qtubuntu-media-signals (0.3+15.04.20150618-0ubuntu1) UNRELEASED; urgency=medium
23+
24+ * Add sinkReset signal
25+
26+ -- phablet <phablet@ubuntu-phablet> Thu, 18 Jun 2015 13:49:35 -0400
27+
28 qtubuntu-media-signals (0.3+15.04.20141104-0ubuntu1) vivid; urgency=low
29
30 * New rebuild forced
31
32=== modified file 'src/qtubuntu_media_signals.h'
33--- src/qtubuntu_media_signals.h 2014-10-13 19:35:49 +0000
34+++ src/qtubuntu_media_signals.h 2015-06-18 17:55:35 +0000
35@@ -43,6 +43,11 @@
36 static SharedSignal* instance();
37
38 Q_SIGNALS:
39+ /** Thrown by qtubuntu-media to signal to qtvideo-node when the video sink
40+ * has been reset. This allows qtvideo-node to take appropriate action to
41+ * reset some of its internal state.
42+ */
43+ void sinkReset();
44 /** Thrown by qtvideo-node to signal when the GL texture has
45 * been successfully created.
46 */

Subscribers

People subscribed via source and target branches

to all changes: