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

List:       kde-commits
Subject:    [phonon-gstreamer/1.0-porting-for-merge] gstreamer: Revert "add debug to pipe"
From:       Harald Sitter <sitter () kde ! org>
Date:       2013-04-11 19:07:28
Message-ID: 20130411190728.735F0A6061 () git ! kde ! org
[Download RAW message or body]

Git commit b286db90b23fe9cb6de951a91c0859a4525da291 by Harald Sitter.
Committed on 11/04/2013 at 21:07.
Pushed by sitter into branch '1.0-porting-for-merge'.

Revert "add debug to pipe"

This reverts commit 7ea3dd966af68e8943da55649eca63f2b9039535.

M  +0    -24   gstreamer/pipeline.cpp

http://commits.kde.org/phonon-gstreamer/b286db90b23fe9cb6de951a91c0859a4525da291

diff --git a/gstreamer/pipeline.cpp b/gstreamer/pipeline.cpp
index 4efcbbc..7715692 100644
--- a/gstreamer/pipeline.cpp
+++ b/gstreamer/pipeline.cpp
@@ -52,7 +52,6 @@ Pipeline::Pipeline(QObject *parent)
     , m_reader(0) // Lazy init
     , m_resetting(false)
 {
-    DEBUG_BLOCK;
     qRegisterMetaType<GstState>("GstState");
 #if GST_VERSION < GST_VERSION_CHECK (1,0,0,0)
     m_pipeline = GST_PIPELINE(gst_element_factory_make("playbin2", NULL));
@@ -150,31 +149,26 @@ Pipeline::Pipeline(QObject *parent)
 
 GstElement *Pipeline::audioPipe()
 {
-    DEBUG_BLOCK;
     return m_audioPipe;
 }
 
 GstElement *Pipeline::videoPipe()
 {
-    DEBUG_BLOCK;
     return m_videoPipe;
 }
 
 GstElement *Pipeline::audioGraph()
 {
-    DEBUG_BLOCK;
     return m_audioGraph;
 }
 
 GstElement *Pipeline::videoGraph()
 {
-    DEBUG_BLOCK;
     return m_videoGraph;
 }
 
 void Pipeline::setSource(const Phonon::MediaSource &source, bool reset)
 {
-    DEBUG_BLOCK;
     m_isStream = false;
     m_seeking = false;
     m_installer->reset();
@@ -252,7 +246,6 @@ Pipeline::~Pipeline()
 
 GstElement *Pipeline::element() const
 {
-    DEBUG_BLOCK;
     return GST_ELEMENT(m_pipeline);
 }
 
@@ -283,7 +276,6 @@ void Pipeline::writeToDot(MediaObject *media, const QString &type)
 
 bool Pipeline::queryDuration(GstFormat *format, gint64 *duration) const
 {
-    DEBUG_BLOCK;
     return gst_element_query_duration(GST_ELEMENT(m_pipeline),
                                       #if GST_VERSION < GST_VERSION_CHECK (1,0,0,0)
                                       format
@@ -295,7 +287,6 @@ bool Pipeline::queryDuration(GstFormat *format, gint64 *duration) const
 
 GstState Pipeline::state() const
 {
-    DEBUG_BLOCK;
     GstState state;
     gst_element_get_state(GST_ELEMENT(m_pipeline), &state, NULL, 1000);
     return state;
@@ -303,7 +294,6 @@ GstState Pipeline::state() const
 
 gboolean Pipeline::cb_eos(GstBus *bus, GstMessage *gstMessage, gpointer data)
 {
-    DEBUG_BLOCK;
     Q_UNUSED(bus)
     Pipeline *that = static_cast<Pipeline*>(data);
     emit that->eos();
@@ -312,7 +302,6 @@ gboolean Pipeline::cb_eos(GstBus *bus, GstMessage *gstMessage, gpointer data)
 
 gboolean Pipeline::cb_warning(GstBus *bus, GstMessage *gstMessage, gpointer data)
 {
-    DEBUG_BLOCK;
     Q_UNUSED(bus)
     gchar *debug;
     GError *err;
@@ -328,7 +317,6 @@ gboolean Pipeline::cb_warning(GstBus *bus, GstMessage *gstMessage, gpointer data
 
 gboolean Pipeline::cb_duration(GstBus *bus, GstMessage *gstMessage, gpointer data)
 {
-    DEBUG_BLOCK;
     Q_UNUSED(bus)
     gint64 duration;
     GstFormat format;
@@ -354,7 +342,6 @@ qint64 Pipeline::totalDuration() const
 
 gboolean Pipeline::cb_buffering(GstBus *bus, GstMessage *gstMessage, gpointer data)
 {
-    DEBUG_BLOCK;
     Q_UNUSED(bus)
     Pipeline *that = static_cast<Pipeline*>(data);
     gint percent = 0;
@@ -370,7 +357,6 @@ gboolean Pipeline::cb_buffering(GstBus *bus, GstMessage *gstMessage, gpointer da
 
 gboolean Pipeline::cb_state(GstBus *bus, GstMessage *gstMessage, gpointer data)
 {
-    DEBUG_BLOCK;
     Q_UNUSED(bus)
     GstState oldState;
     GstState newState;
@@ -425,7 +411,6 @@ gboolean Pipeline::cb_state(GstBus *bus, GstMessage *gstMessage, gpointer data)
 
 void Pipeline::cb_videoChanged(GstElement *playbin, gpointer data)
 {
-    DEBUG_BLOCK;
     gint videoCount;
     bool videoAvailable;
     Pipeline *that = static_cast<Pipeline*>(data);
@@ -439,14 +424,12 @@ void Pipeline::cb_videoChanged(GstElement *playbin, gpointer data)
 
 void Pipeline::cb_textTagsChanged(GstElement *playbin, gint stream, gpointer data)
 {
-    DEBUG_BLOCK;
     Pipeline *that = static_cast<Pipeline *>(data);
     emit that->textTagChanged(stream);
 }
 
 void Pipeline::cb_audioTagsChanged(GstElement *playbin, gint stream, gpointer data)
 {
-    DEBUG_BLOCK;
     Pipeline *that = static_cast<Pipeline *>(data);
     emit that->audioTagChanged(stream);
 }
@@ -467,7 +450,6 @@ bool Pipeline::audioIsAvailable() const
 
 gboolean Pipeline::cb_element(GstBus *bus, GstMessage *gstMessage, gpointer data)
 {
-    DEBUG_BLOCK;
     Q_UNUSED(bus)
     Pipeline *that = static_cast<Pipeline*>(data);
     const GstStructure *str = gst_message_get_structure(gstMessage);
@@ -538,7 +520,6 @@ void Pipeline::pluginInstallComplete()
 
 gboolean Pipeline::cb_error(GstBus *bus, GstMessage *gstMessage, gpointer data)
 {
-    DEBUG_BLOCK;
     Q_UNUSED(bus)
     Pipeline *that = static_cast<Pipeline*>(data);
     PluginInstaller::InstallStatus status = that->m_installer->checkInstalledPlugins();
@@ -622,7 +603,6 @@ void foreach_tag_function(const GstTagList *list, const gchar *tag, gpointer use
 
 gboolean Pipeline::cb_tag(GstBus *bus, GstMessage *msg, gpointer data)
 {
-    DEBUG_BLOCK;
     Q_UNUSED(bus)
     Pipeline *that = static_cast<Pipeline*>(data);
     QMutexLocker lock(&that->m_tagLock);
@@ -797,7 +777,6 @@ QList<MediaController::NavigationMenu> Pipeline::availableMenus() const
 
 bool Pipeline::seekToMSec(qint64 time)
 {
-    DEBUG_BLOCK;
     m_posAtReset = time;
     if (m_resetting)
         return true;
@@ -810,7 +789,6 @@ bool Pipeline::seekToMSec(qint64 time)
 
 bool Pipeline::isSeekable() const
 {
-    DEBUG_BLOCK;
     gboolean seekable = 0;
     GstQuery *query;
     gboolean result;
@@ -934,7 +912,6 @@ void Pipeline::cb_setupSource(GstElement *playbin, GParamSpec *param, gpointer d
 
 void Pipeline::cb_aboutToFinish(GstElement *appSrc, gpointer data)
 {
-    DEBUG_BLOCK;
     Q_UNUSED(appSrc);
     Pipeline *that = static_cast<Pipeline*>(data);
     emit that->aboutToFinish();
@@ -947,7 +924,6 @@ Phonon::MediaSource Pipeline::currentSource() const
 
 qint64 Pipeline::position() const
 {
-    DEBUG_BLOCK;
     gint64 pos = 0;
     GstFormat format = GST_FORMAT_TIME;
     if (m_resetting)
[prev in list] [next in list] [prev in thread] [next in thread]