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

List:       kde-commits
Subject:    =?utf-8?q?=5Bphonon-vlc=5D_vlc/experimental=3A_Add_state=28=29_a?=
From:       Casian Andrei <skeletk13 () gmail ! com>
Date:       2011-02-28 21:50:32
Message-ID: 20110228215032.016B3A60E6 () git ! kde ! org
[Download RAW message or body]

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

Add state() and pause() to AvCapture

M  +14   -0    vlc/experimental/avcapture.cpp     
M  +2    -0    vlc/experimental/avcapture.h     

http://commits.kde.org/phonon-vlc/85ae54413a2998f9d81f9f9cf34217f6e654c977

diff --git a/vlc/experimental/avcapture.cpp b/vlc/experimental/avcapture.cpp
index b3a962c..79fa573 100644
--- a/vlc/experimental/avcapture.cpp
+++ b/vlc/experimental/avcapture.cpp
@@ -44,12 +44,26 @@ AvCapture::~AvCapture()
     stop();
 }
 
+State AvCapture::state() const
+{
+    if (m_connectedMO)
+        return m_connectedMO->state();
+
+    return ErrorState;
+}
+
 void AvCapture::start()
 {
     m_audioMedia.play();
     m_videoMedia.play();
 }
 
+void AvCapture::pause()
+{
+    m_audioMedia.pause();
+    m_videoMedia.pause();
+}
+
 void AvCapture::stop()
 {
     m_audioMedia.stop();
diff --git a/vlc/experimental/avcapture.h b/vlc/experimental/avcapture.h
index 14d3b07..25a8583 100644
--- a/vlc/experimental/avcapture.h
+++ b/vlc/experimental/avcapture.h
@@ -46,7 +46,9 @@ class AvCapture : public QObject, public Phonon::Experimental::AvCaptureInterfac
         AvCapture(QObject *parent);
         ~AvCapture();
 
+        Phonon::State state() const;
         void start();
+        void pause();
         void stop();
 
         AudioCaptureDevice audioCaptureDevice() const;


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