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

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

Git commit c655af3de5248f210e95b6bb84deb80eaa567ae0 by Casian Andrei.
Committed on 28/02/2011 at 22:28.
Pushed by casianandrei into branch 'master'.

Refactor capture demo's source setup

M  +8    -26   demos/simplecapture/capture.cpp     

http://commits.kde.org/phonon/c655af3de5248f210e95b6bb84deb80eaa567ae0

diff --git a/demos/simplecapture/capture.cpp b/demos/simplecapture/capture.cpp
index 5bd8066..b3ee02e 100644
--- a/demos/simplecapture/capture.cpp
+++ b/demos/simplecapture/capture.cpp
@@ -118,7 +118,6 @@ void CaptureWidget::setupCaptureSource()
         m_audioPath = Phonon::createPath(m_media, m_audioOutput);
         m_videoPath = Phonon::createPath(m_media, m_videoWidget);
     }
-
     if (m_captureNode == m_avcapture) {
         m_audioPath = Phonon::createPath(m_avcapture, m_audioOutput);
         m_videoPath = Phonon::createPath(m_avcapture, m_videoWidget);
@@ -131,39 +130,22 @@ void CaptureWidget::setupCaptureSource()
         QMessageBox::critical(this, "Error", "Your backend may not support video \
capturing.");  }
 
-    Phonon::GlobalConfig pgc;
-
-    const Phonon::AudioCaptureDevice acd = \
                Phonon::AudioCaptureDevice::fromIndex(pgc.audioCaptureDeviceFor(Phonon::NoCategory));
                
-    if (acd.isValid()) {
-        if (m_captureNode == m_media) {
-            // m_media->setCurrentSource(acd);
-        }
-
-        if (m_captureNode == m_avcapture) {
-            m_avcapture->setAudioCaptureDevice(acd);
-        }
-    } else {
-        QMessageBox::warning(this, tr("Warning"), tr("No audio capture devices \
found.")); +    if (m_captureNode == m_media) {
+        Phonon::GlobalConfig pgc;
+        m_media->setCurrentSource(Phonon::VideoCaptureDevice::fromIndex(pgc.videoCaptureDeviceFor(Phonon::NoCategory)));
 +    }
+    if (m_captureNode == m_avcapture) {
+        m_avcapture->setVideoCaptureDevice(Phonon::NoCategory);
     }
 
-    Phonon::VideoCaptureDevice vcd = \
                Phonon::VideoCaptureDevice::fromIndex(pgc.videoCaptureDeviceFor(Phonon::NoCategory));
                
-    if (vcd.isValid()) {
-        if (m_captureNode == m_media) {
-            m_media->setCurrentSource(vcd);
-        }
-
-        if (m_captureNode == m_avcapture) {
-            m_avcapture->setVideoCaptureDevice(vcd);
-        }
-    } else {
-        QMessageBox::warning(this, tr("Warning"), tr("No video capture devices \
found.")); +    if (m_captureNode == m_avcapture) {
+        m_avcapture->setAudioCaptureDevice(Phonon::NoCategory);
     }
 
     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)));


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