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

List:       kde-commits
Subject:    =?utf-8?q?=5Bphonon-gstreamer/plumbing=5D_gstreamer=3A_apply_sig?=
From:       Harald Sitter <sitter () kde ! org>
Date:       2011-06-05 15:06:02
Message-ID: 20110605150602.81B02A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 19986dcfb52ed686007ceed40254a38bbae456ea by Harald Sitter.
Committed on 05/06/2011 at 17:03.
Pushed by sitter into branch 'plumbing'.

apply signature normalization to signals and format the connect lines properly

M  +20   -10   gstreamer/mediaobject.cpp     

http://commits.kde.org/phonon-gstreamer/19986dcfb52ed686007ceed40254a38bbae456ea

diff --git a/gstreamer/mediaobject.cpp b/gstreamer/mediaobject.cpp
index 2935b85..863d327 100644
--- a/gstreamer/mediaobject.cpp
+++ b/gstreamer/mediaobject.cpp
@@ -89,16 +89,26 @@ MediaObject::MediaObject(Backend *backend, QObject *parent)
         m_pipeline = new Pipeline(this);
         m_isValid = true;
 
-        connect(m_pipeline, SIGNAL(eos()), this, SLOT(handleEndOfStream()));
-        connect(m_pipeline, SIGNAL(warning(const QString &)), this, \
                SLOT(logWarning(const QString &)));
-        connect(m_pipeline, SIGNAL(durationChanged(qint64)), this, \
                SIGNAL(totalTimeChanged(qint64)));
-        connect(m_pipeline, SIGNAL(buffering(int)), this, \
                SLOT(handleBuffering(int)));
-        connect(m_pipeline, SIGNAL(stateChanged(GstState, GstState)), this, \
                SLOT(handleStateChange(GstState, GstState)));
-        connect(m_pipeline, SIGNAL(errorMessage(const QString &, \
                Phonon::ErrorType)), this, SLOT(setError(const QString &, \
                Phonon::ErrorType)));
-        connect(m_pipeline, SIGNAL(metaDataChanged(QMultiMap<QString, QString>)), \
                this, SIGNAL(metaDataChanged(QMultiMap<QString, QString>)));
-        connect(m_pipeline, \
SIGNAL(availableMenusChanged(QList<MediaController::NavigationMenu>)), this, \
                SIGNAL(availableMenusChanged(QList<MediaController::NavigationMenu>)));
                
-        connect(m_pipeline, SIGNAL(videoAvailabilityChanged(bool)), this, \
                SIGNAL(hasVideoChanged(bool)));
-        connect(m_pipeline, SIGNAL(seekableChanged(bool)), this, \
SIGNAL(seekableChanged(bool))); +        connect(m_pipeline, SIGNAL(eos()),
+                this, SLOT(handleEndOfStream()));
+        connect(m_pipeline, SIGNAL(warning(QString)),
+                this, SLOT(logWarning(QString)));
+        connect(m_pipeline, SIGNAL(durationChanged(qint64)),
+                this, SIGNAL(totalTimeChanged(qint64)));
+        connect(m_pipeline, SIGNAL(buffering(int)),
+                this, SLOT(handleBuffering(int)));
+        connect(m_pipeline, SIGNAL(stateChanged(GstState,GstState)),
+                this, SLOT(handleStateChange(GstState,GstState)));
+        connect(m_pipeline, SIGNAL(errorMessage(QString,Phonon::ErrorType)),
+                this, SLOT(setError(QString,Phonon::ErrorType)));
+        connect(m_pipeline, SIGNAL(metaDataChanged(QMultiMap<QString,QString>)),
+                this, SIGNAL(metaDataChanged(QMultiMap<QString,QString>)));
+        connect(m_pipeline, \
SIGNAL(availableMenusChanged(QList<MediaController::NavigationMenu>)), +              \
this, SIGNAL(availableMenusChanged(QList<MediaController::NavigationMenu>))); +       \
connect(m_pipeline, SIGNAL(videoAvailabilityChanged(bool)), +                this, \
SIGNAL(hasVideoChanged(bool))); +        connect(m_pipeline, \
SIGNAL(seekableChanged(bool)), +                this, SIGNAL(seekableChanged(bool)));
 
         connect(m_tickTimer, SIGNAL(timeout()), SLOT(emitTick()));
     }


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