[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [phonon-gstreamer/1.0-porting-for-merge] gstreamer: Constify methods, move publicly-unused methods t
From: Dan_Vrátil <dvratil () redhat ! com>
Date: 2014-08-12 14:39:09
Message-ID: E1XHDED-00073J-0b () scm ! kde ! org
[Download RAW message or body]
Git commit dcf40042b115f01d2bb9b5f017ae3aa2db29881f by Dan Vrátil.
Committed on 12/08/2014 at 14:02.
Pushed by dvratil into branch '1.0-porting-for-merge'.
Constify methods, move publicly-unused methods to private
M +4 -2 gstreamer/abstractrenderer.h
M +7 -2 gstreamer/audiodataoutput.h
M +2 -0 gstreamer/audioeffect.h
M +2 -2 gstreamer/devicemanager.cpp
M +2 -2 gstreamer/devicemanager.h
M +3 -1 gstreamer/effect.h
M +3 -1 gstreamer/glrenderer.h
M +2 -2 gstreamer/medianode.h
M +4 -4 gstreamer/pipeline.cpp
M +3 -5 gstreamer/pipeline.h
M +7 -2 gstreamer/videodataoutput.h
M +1 -1 gstreamer/videographicsobject.h
M +6 -2 gstreamer/widgetrenderer.h
M +1 -1 gstreamer/x11renderer.h
http://commits.kde.org/phonon-gstreamer/dcf40042b115f01d2bb9b5f017ae3aa2db29881f
diff --git a/gstreamer/abstractrenderer.h b/gstreamer/abstractrenderer.h
index eecee07..746bbeb 100644
--- a/gstreamer/abstractrenderer.h
+++ b/gstreamer/abstractrenderer.h
@@ -41,9 +41,11 @@ public:
virtual void scaleModeChanged(Phonon::VideoWidget::ScaleMode scaleMode);
virtual void movieSizeChanged(const QSize &movieSize);
virtual bool eventFilter(QEvent *) = 0;
- virtual void handlePaint(QPaintEvent *) { }
+ virtual void handlePaint(QPaintEvent *)
+ {
+ }
- virtual bool paintsOnWidget() { // Controls overlays
+ virtual bool paintsOnWidget() const { // Controls overlays
return true;
}
diff --git a/gstreamer/audiodataoutput.h b/gstreamer/audiodataoutput.h
index eb26e07..3f6ef87 100644
--- a/gstreamer/audiodataoutput.h
+++ b/gstreamer/audiodataoutput.h
@@ -56,8 +56,13 @@ public:
/// callback function for handling new audio data
static void processBuffer(GstElement*, GstBuffer*, GstPad*, gpointer);
- Phonon::AudioDataOutput* frontendObject() const { return m_frontend; }
- void setFrontendObject(Phonon::AudioDataOutput *frontend) { m_frontend = \
frontend; } + Phonon::AudioDataOutput* frontendObject() const {
+ return m_frontend;
+ }
+
+ void setFrontendObject(Phonon::AudioDataOutput *frontend) {
+ m_frontend = frontend;
+ }
GstElement *audioElement() const {
return m_queue;
diff --git a/gstreamer/audioeffect.h b/gstreamer/audioeffect.h
index 49953eb..3b45d8a 100644
--- a/gstreamer/audioeffect.h
+++ b/gstreamer/audioeffect.h
@@ -47,7 +47,9 @@ protected:
return effectBin();
}
+private:
QString m_effectName;
+
};
} // namespace Gstreamer
diff --git a/gstreamer/devicemanager.cpp b/gstreamer/devicemanager.cpp
index 6ea509d..85d8c1e 100644
--- a/gstreamer/devicemanager.cpp
+++ b/gstreamer/devicemanager.cpp
@@ -370,7 +370,7 @@ AbstractRenderer *DeviceManager::createVideoRenderer(VideoWidget \
*parent) }
#endif //QT_NO_PHONON_VIDEO
-QList<int> DeviceManager::deviceIds(ObjectDescriptionType type)
+QList<int> DeviceManager::deviceIds(Phonon::ObjectDescriptionType type) const
{
DeviceInfo::Capability capability = DeviceInfo::None;
switch (type) {
@@ -396,7 +396,7 @@ QList<int> DeviceManager::deviceIds(ObjectDescriptionType type)
return ids;
}
-QHash<QByteArray, QVariant> DeviceManager::deviceProperties(int id)
+QHash<QByteArray, QVariant> DeviceManager::deviceProperties(int id) const
{
QHash<QByteArray, QVariant> properties;
diff --git a/gstreamer/devicemanager.h b/gstreamer/devicemanager.h
index 87b6cd8..bbfe9b1 100644
--- a/gstreamer/devicemanager.h
+++ b/gstreamer/devicemanager.h
@@ -96,8 +96,8 @@ public:
GstElement *createAudioSink(Category category = NoCategory);
AbstractRenderer *createVideoRenderer(VideoWidget *parent);
- QList<int> deviceIds(ObjectDescriptionType type);
- QHash<QByteArray, QVariant> deviceProperties(int id);
+ QList<int> deviceIds(ObjectDescriptionType type) const;
+ QHash<QByteArray, QVariant> deviceProperties(int id) const;
const DeviceInfo *device(int id) const;
signals:
diff --git a/gstreamer/effect.h b/gstreamer/effect.h
index 739e1b8..f94c6a3 100644
--- a/gstreamer/effect.h
+++ b/gstreamer/effect.h
@@ -34,7 +34,9 @@ namespace Gstreamer
{
class EffectInfo;
- class Effect : public QObject, public Phonon::EffectInterface, public MediaNode
+ class Effect : public QObject,
+ public Phonon::EffectInterface,
+ public MediaNode
{
Q_OBJECT
Q_INTERFACES(Phonon::EffectInterface Phonon::Gstreamer::MediaNode)
diff --git a/gstreamer/glrenderer.h b/gstreamer/glrenderer.h
index fe6aebd..f50d4b7 100644
--- a/gstreamer/glrenderer.h
+++ b/gstreamer/glrenderer.h
@@ -41,7 +41,9 @@ public:
GLRenderer(VideoWidget *control);
~GLRenderer();
bool eventFilter(QEvent * event);
- bool paintsOnWidget() { return false; }
+ bool paintsOnWidget() const {
+ return false;
+ }
private:
GLRenderWidgetImplementation *m_glWindow;
diff --git a/gstreamer/medianode.h b/gstreamer/medianode.h
index fbf7825..d39d46d 100644
--- a/gstreamer/medianode.h
+++ b/gstreamer/medianode.h
@@ -58,11 +58,11 @@ public:
return m_description;
}
- bool isValid() {
+ bool isValid() const {
return m_isValid;
}
- MediaObject *root() {
+ MediaObject *root() const {
return m_root;
}
diff --git a/gstreamer/pipeline.cpp b/gstreamer/pipeline.cpp
index 87f5458..c393c36 100644
--- a/gstreamer/pipeline.cpp
+++ b/gstreamer/pipeline.cpp
@@ -122,22 +122,22 @@ Pipeline::Pipeline(QObject *parent)
connect(m_installer, SIGNAL(success()), this, SLOT(pluginInstallComplete()));
}
-GstElement *Pipeline::audioPipe()
+GstElement *Pipeline::audioPipe() const
{
return m_audioPipe;
}
-GstElement *Pipeline::videoPipe()
+GstElement *Pipeline::videoPipe() const
{
return m_videoPipe;
}
-GstElement *Pipeline::audioGraph()
+GstElement *Pipeline::audioGraph() const
{
return m_audioGraph;
}
-GstElement *Pipeline::videoGraph()
+GstElement *Pipeline::videoGraph() const
{
return m_videoGraph;
}
diff --git a/gstreamer/pipeline.h b/gstreamer/pipeline.h
index 041852c..8a9dea2 100644
--- a/gstreamer/pipeline.h
+++ b/gstreamer/pipeline.h
@@ -47,6 +47,9 @@ class Pipeline : public QObject
GstElement *audioGraph() const;
GstElement *videoElement() const;
GstElement *audioElement() const;
+ GstElement *audioPipe() const;
+ GstElement *videoPipe() const;
+
GstStateChangeReturn setState(GstState state);
GstState state() const;
Phonon::MediaSource currentSource() const;
@@ -72,11 +75,6 @@ class Pipeline : public QObject
static void cb_textTagsChanged(GstElement *playbin, gint stream, gpointer \
data);
static void cb_audioTagsChanged(GstElement *playbin, gint stream, gpointer \
data);
- GstElement *audioPipe();
- GstElement *videoPipe();
- GstElement *audioGraph();
- GstElement *videoGraph();
-
bool videoIsAvailable() const;
bool audioIsAvailable() const;
diff --git a/gstreamer/videodataoutput.h b/gstreamer/videodataoutput.h
index 66040b8..9823aac 100644
--- a/gstreamer/videodataoutput.h
+++ b/gstreamer/videodataoutput.h
@@ -50,8 +50,13 @@ class Backend;
static void processBuffer(GstElement*, GstBuffer*, GstPad*, gpointer);
- Phonon::Experimental::AbstractVideoDataOutput *frontendObject() const { \
return m_frontend; }
- void setFrontendObject(Phonon::Experimental::AbstractVideoDataOutput \
*object) { m_frontend = object; } + \
Phonon::Experimental::AbstractVideoDataOutput *frontendObject() const { + \
return m_frontend; + }
+
+ void setFrontendObject(Phonon::Experimental::AbstractVideoDataOutput \
*object) { + m_frontend = object;
+ }
GstElement *videoElement() const {
return m_queue;
diff --git a/gstreamer/videographicsobject.h b/gstreamer/videographicsobject.h
index ac46cd7..cdaad4c 100644
--- a/gstreamer/videographicsobject.h
+++ b/gstreamer/videographicsobject.h
@@ -54,7 +54,7 @@ public:
const VideoFrame *frame() const;
- GstElement *videoElement()
+ GstElement *videoElement() const
{
debug() << "fishy";
return m_bin;
diff --git a/gstreamer/widgetrenderer.h b/gstreamer/widgetrenderer.h
index b5fdb1b..a362256 100644
--- a/gstreamer/widgetrenderer.h
+++ b/gstreamer/widgetrenderer.h
@@ -39,9 +39,13 @@ public:
bool eventFilter(QEvent * event);
void handlePaint(QPaintEvent *paintEvent);
const QImage& currentFrame() const;
- QRect drawFrameRect() const { return m_drawFrameRect; }
+ QRect drawFrameRect() const {
+ return m_drawFrameRect;
+ }
void setNextFrame(const QByteArray &array, int width, int height);
- bool frameIsSet() { return !m_array.isNull(); }
+ bool frameIsSet() const {
+ return !m_array.isNull();
+ }
void clearFrame();
private:
mutable QImage m_frame;
diff --git a/gstreamer/x11renderer.h b/gstreamer/x11renderer.h
index ab01b8c..b47160a 100644
--- a/gstreamer/x11renderer.h
+++ b/gstreamer/x11renderer.h
@@ -42,7 +42,7 @@ public:
void scaleModeChanged(Phonon::VideoWidget::ScaleMode scaleMode);
void movieSizeChanged(const QSize &movieSize);
bool eventFilter(QEvent *);
- bool paintsOnWidget() {
+ bool paintsOnWidget() const {
return false;
}
bool overlaySet() const {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic