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

[Jim Hodapp]

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

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:20
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-vivid-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-signals-ci/6/rebuild

review: Approve (continuous-integration)

[lp:~phablet-team/qtubuntu-media-signals/fix-black-video-issues]

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.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:21
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-vivid-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-signals-ci/7/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:22
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-signals-vivid-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-signals-ci/8/rebuild

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-03-12 15:51:11 +0000
+++ CMakeLists.txt	2015-06-18 17:55:35 +0000
@@ -1,9 +1,9 @@
 project(qtubuntu-media-signals)
 cmake_minimum_required(VERSION 2.8.9)
 
-set(SONAME 1)
-set(VERSION 1.0)
-set(SOVERSION 1.0.0)
+set(SONAME 2)
+set(VERSION 2.0)
+set(SOVERSION 2.0.0)
 
 # Instruct CMake to run moc automatically when needed.
 set(CMAKE_AUTOMOC ON)

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-04 05:01:05 +0000
+++ debian/changelog	2015-06-18 17:55:35 +0000
@@ -1,3 +1,9 @@
+qtubuntu-media-signals (0.3+15.04.20150618-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Add sinkReset signal
+
+ -- phablet <phablet@ubuntu-phablet>  Thu, 18 Jun 2015 13:49:35 -0400
+
 qtubuntu-media-signals (0.3+15.04.20141104-0ubuntu1) vivid; urgency=low
 
   * New rebuild forced

=== modified file 'src/qtubuntu_media_signals.h'
--- src/qtubuntu_media_signals.h	2014-10-13 19:35:49 +0000
+++ src/qtubuntu_media_signals.h	2015-06-18 17:55:35 +0000
@@ -43,6 +43,11 @@
     static SharedSignal* instance();
 
 Q_SIGNALS:
+    /** Thrown by qtubuntu-media to signal to qtvideo-node when the video sink
+     * has been reset. This allows qtvideo-node to take appropriate action to
+     * reset some of its internal state.
+     */
+    void sinkReset();
     /** Thrown by qtvideo-node to signal when the GL texture has
      * been successfully created.
      */