qt-gstreamer: qtvideosink: fix some minor details

[George Kiagiadakis]

Module: qt-gstreamer
Branch: master
Commit: 0b6dc6456d44b8a1e57512c3a3a9660da7732f03
URL:    http://cgit.freedesktop.org/gstreamer/qt-gstreamer/commit/?id=0b6dc6456d44b8a1e57512c3a3a9660da7732f03

Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Tue Feb  7 00:15:03 2012 +0200

qtvideosink: fix some minor details

---

 elements/gstqtvideosink/gstqtglvideosink.cpp     |    2 +-
 elements/gstqtvideosink/gstqtglvideosinkbase.cpp |    3 ++-
 elements/gstqtvideosink/gstqtvideosink.cpp       |    2 +-
 elements/gstqtvideosink/gstqtvideosinkbase.cpp   |    3 ++-
 elements/gstqtvideosink/qtvideosinkdelegate.cpp  |    4 ++++
 elements/gstqtvideosink/qtvideosinkdelegate.h    |    2 +-
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/elements/gstqtvideosink/gstqtglvideosink.cpp b/elements/gstqtvideosink/gstqtglvideosink.cpp
index 2c02cb2..cb8c213 100644
--- a/elements/gstqtvideosink/gstqtglvideosink.cpp
+++ b/elements/gstqtvideosink/gstqtglvideosink.cpp
@@ -28,7 +28,7 @@ DEFINE_TYPE(GstQtGLVideoSink, GST_TYPE_QT_GL_VIDEO_SINK_BASE)
 
 void GstQtGLVideoSink::emit_update(gpointer sink)
 {
-    g_signal_emit(sink, GstQtGLVideoSink::s_signals[UPDATE_SIGNAL], 0);
+    g_signal_emit(sink, GstQtGLVideoSink::s_signals[UPDATE_SIGNAL], 0, NULL);
 }
 
 //------------------------------
diff --git a/elements/gstqtvideosink/gstqtglvideosinkbase.cpp b/elements/gstqtvideosink/gstqtglvideosinkbase.cpp
index cbce129..3c3cb66 100644
--- a/elements/gstqtvideosink/gstqtglvideosinkbase.cpp
+++ b/elements/gstqtvideosink/gstqtglvideosinkbase.cpp
@@ -118,7 +118,8 @@ gboolean GstQtGLVideoSinkBase::start(GstBaseSink *base)
 
 GstCaps *GstQtGLVideoSinkBase::get_caps(GstBaseSink *base)
 {
-    GstQtVideoSinkBase *sink = GST_QT_VIDEO_SINK_BASE(base);
+    Q_UNUSED(base);
+
     GstCaps *caps = gst_caps_new_empty();
 
     Q_FOREACH(GstVideoFormat format, OpenGLSurfacePainter::supportedPixelFormats()) {
diff --git a/elements/gstqtvideosink/gstqtvideosink.cpp b/elements/gstqtvideosink/gstqtvideosink.cpp
index 693f58b..3afffd1 100644
--- a/elements/gstqtvideosink/gstqtvideosink.cpp
+++ b/elements/gstqtvideosink/gstqtvideosink.cpp
@@ -36,7 +36,7 @@ DEFINE_TYPE(GstQtVideoSink, GST_TYPE_QT_VIDEO_SINK_BASE)
 
 void GstQtVideoSink::emit_update(gpointer sink)
 {
-    g_signal_emit(sink, GstQtVideoSink::s_signals[UPDATE_SIGNAL], 0);
+    g_signal_emit(sink, GstQtVideoSink::s_signals[UPDATE_SIGNAL], 0, NULL);
 }
 
 //------------------------------
diff --git a/elements/gstqtvideosink/gstqtvideosinkbase.cpp b/elements/gstqtvideosink/gstqtvideosinkbase.cpp
index 552f71f..18d0782 100644
--- a/elements/gstqtvideosink/gstqtvideosinkbase.cpp
+++ b/elements/gstqtvideosink/gstqtvideosinkbase.cpp
@@ -154,7 +154,8 @@ GstStateChangeReturn GstQtVideoSinkBase::change_state(GstElement *element, GstSt
 
 GstCaps *GstQtVideoSinkBase::get_caps(GstBaseSink *base)
 {
-    GstQtVideoSinkBase *sink = GST_QT_VIDEO_SINK_BASE(base);
+    Q_UNUSED(base);
+
     GstCaps *caps = gst_caps_new_empty();
 
     Q_FOREACH(GstVideoFormat format, GenericSurfacePainter::supportedPixelFormats()) {
diff --git a/elements/gstqtvideosink/qtvideosinkdelegate.cpp b/elements/gstqtvideosink/qtvideosinkdelegate.cpp
index e8b7bf4..9515493 100644
--- a/elements/gstqtvideosink/qtvideosinkdelegate.cpp
+++ b/elements/gstqtvideosink/qtvideosinkdelegate.cpp
@@ -411,5 +411,9 @@ void QtVideoSinkDelegate::update()
         GstQtGLVideoSink::emit_update(m_sink);
     } else
 #endif
+    if (G_TYPE_CHECK_INSTANCE_TYPE(m_sink, GST_TYPE_QT_VIDEO_SINK)) {
         GstQtVideoSink::emit_update(m_sink);
+    } else {
+        Q_ASSERT(false);
+    }
 }
diff --git a/elements/gstqtvideosink/qtvideosinkdelegate.h b/elements/gstqtvideosink/qtvideosinkdelegate.h
index b3e157d..7ddec6e 100644
--- a/elements/gstqtvideosink/qtvideosinkdelegate.h
+++ b/elements/gstqtvideosink/qtvideosinkdelegate.h
@@ -155,7 +155,7 @@ private:
     GstBuffer *m_buffer;
 
 protected:
-    GstQtVideoSinkBase *m_sink;
+    GstQtVideoSinkBase * const m_sink;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QtVideoSinkDelegate::PainterTypes)