[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bphonon=5D_demos/simplecapture=3A_Configure_stateCha?=
From:       Casian Andrei <skeletk13 () gmail ! com>
Date:       2011-02-28 21:50:21
Message-ID: 20110228215021.C6165A60E2 () git ! kde ! org
[Download RAW message or body]

Git commit 7a819c7fe9d02add8a81811cdea39ad4c89e1c3f by Casian Andrei.
Committed on 28/02/2011 at 21:54.
Pushed by casianandrei into branch 'master'.

Configure stateChanged signal properly for the capture demo

M  +9    -1    demos/simplecapture/capture.cpp     

http://commits.kde.org/phonon/7a819c7fe9d02add8a81811cdea39ad4c89e1c3f

diff --git a/demos/simplecapture/capture.cpp b/demos/simplecapture/capture.cpp
index 48a7091..fb2df5c 100644
--- a/demos/simplecapture/capture.cpp
+++ b/demos/simplecapture/capture.cpp
@@ -159,7 +159,15 @@ void CaptureWidget::setupCaptureSource()
         QMessageBox::warning(this, tr("Warning"), tr("No video capture devices \
found."));  }
 
-    connect(m_media, SIGNAL(stateChanged(Phonon::State, Phonon::State)), this, \
SLOT(mediaStateChanged(Phonon::State, Phonon::State))); +    if (m_captureNode == \
m_media) { +        disconnect(m_avcapture, \
SIGNAL(stateChanged(Phonon::State,Phonon::State))); +        connect(m_media, \
SIGNAL(stateChanged(Phonon::State, Phonon::State)), this, \
SLOT(mediaStateChanged(Phonon::State, Phonon::State))); +    }
+
+    if (m_captureNode == m_avcapture) {
+        disconnect(m_media, SIGNAL(stateChanged(Phonon::State,Phonon::State)));
+        connect(m_avcapture, SIGNAL(stateChanged(Phonon::State,Phonon::State)), \
this, SLOT(mediaStateChanged(Phonon::State,Phonon::State))); +    }
 }
 
 void CaptureWidget::playPause()


[prev in list] [next in list] [prev in thread] [next in thread]