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

List:       kde-commits
Subject:    =?utf-8?q?=5Bphonon-gstreamer=5D_gstreamer=3A_Clean_up_debugging?=
From:       Trever Fischer <wm161 () wm161 ! net>
Date:       2011-05-03 1:09:30
Message-ID: 20110503010930.C4854A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 061243e1b5baa858a9d5ad65bf0d33d4af2bffbb by Trever Fischer.
Committed on 03/05/2011 at 03:04.
Pushed by tdfischer into branch 'master'.

Clean up debugging spew

M  +0    -8    gstreamer/streamreader.cpp     

http://commits.kde.org/phonon-gstreamer/061243e1b5baa858a9d5ad65bf0d33d4af2bffbb

diff --git a/gstreamer/streamreader.cpp b/gstreamer/streamreader.cpp
index 989bb03..c9aa32c 100644
--- a/gstreamer/streamreader.cpp
+++ b/gstreamer/streamreader.cpp
@@ -35,13 +35,11 @@ StreamReader::StreamReader(const Phonon::MediaSource &source, MediaObject *paren
     , m_seekable(false)
     , m_mediaObject(parent)
 {
-    DEBUG_BLOCK;
     connectToSource(source);
 }
 
 StreamReader::~StreamReader()
 {
-    DEBUG_BLOCK;
 }
 
 //------------------------------------------------------------------------------
@@ -85,7 +83,6 @@ void StreamReader::setCurrentPos(qint64 pos)
 void StreamReader::writeData(const QByteArray &data)
 {
     QMutexLocker locker(&m_mutex);
-    DEBUG_BLOCK;
     m_buffer.append(data);
     m_waitingForData.wakeAll();
 }
@@ -93,7 +90,6 @@ void StreamReader::writeData(const QByteArray &data)
 GstFlowReturn StreamReader::read(quint64 pos, int length, char *buffer)
 {
     QMutexLocker locker(&m_mutex);
-    DEBUG_BLOCK;
 
     if (currentPos() != pos) {
         if (!streamSeekable()) {
@@ -139,7 +135,6 @@ GstFlowReturn StreamReader::read(quint64 pos, int length, char *buffer)
 void StreamReader::endOfData()
 {
     QMutexLocker locker(&m_mutex);
-    DEBUG_BLOCK;
     m_eos = true;
     m_waitingForData.wakeAll();
 }
@@ -147,7 +142,6 @@ void StreamReader::endOfData()
 void StreamReader::start()
 {
     QMutexLocker locker(&m_mutex);
-    DEBUG_BLOCK;
     m_buffer.clear();
     m_eos = false;
     m_locked = true;
@@ -160,7 +154,6 @@ void StreamReader::start()
 void StreamReader::stop()
 {
     QMutexLocker locker(&m_mutex);
-    DEBUG_BLOCK;
     enoughData();
     m_waitingForData.wakeAll();
 }
@@ -168,7 +161,6 @@ void StreamReader::stop()
 void StreamReader::unlock()
 {
     QMutexLocker locker(&m_mutex);
-    DEBUG_BLOCK;
     enoughData();
     m_locked = false;
     m_waitingForData.wakeAll();

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