From 13025c05c7471127873a3dc9928579387d1361ca Mon Sep 17 00:00:00 2001 From: Sami Rosendahl Date: Mon, 26 Mar 2012 14:05:27 +0300 Subject: Deliver GStreamer signals through Qt event loop Emitting a Qt signal directly from GLib callback causes issues to clients. Queue the GStreamer signal and forward it to as a Qt signal from a handler that is invoked via the Qt event loop. Task-number: QTBUG-24927 Change-Id: I3c91efcce1261caf7b643fbff10663e1b093f2a8 Reviewed-by: Dmytro Poplavskiy --- src/gsttools/qgstreamerbushelper.cpp | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/src/gsttools/qgstreamerbushelper.cpp b/src/gsttools/qgstreamerbushelper.cpp index 68c8795ce..751e805ba 100644 --- a/src/gsttools/qgstreamerbushelper.cpp +++ b/src/gsttools/qgstreamerbushelper.cpp @@ -98,17 +98,20 @@ private: void processMessage(GstMessage* message) { QGstreamerMessage msg(message); - foreach (QGstreamerBusMessageFilter *filter, busFilters) { - if (filter->processBusMessage(msg)) - break; - } - emit m_helper->message(msg); + doProcessMessage(msg); + } + + void queueMessage(GstMessage* message) + { + QGstreamerMessage msg(message); + QMetaObject::invokeMethod(this, "doProcessMessage", Qt::QueuedConnection, + Q_ARG(QGstreamerMessage, msg)); } static gboolean busCallback(GstBus *bus, GstMessage *message, gpointer data) { Q_UNUSED(bus); - reinterpret_cast(data)->processMessage(message); + reinterpret_cast(data)->queueMessage(message); return TRUE; } @@ -117,6 +120,16 @@ private: QGstreamerBusHelper* m_helper; QTimer* m_intervalTimer; +private slots: + void doProcessMessage(const QGstreamerMessage& msg) + { + foreach (QGstreamerBusMessageFilter *filter, busFilters) { + if (filter->processBusMessage(msg)) + break; + } + emit m_helper->message(msg); + } + public: QMutex filterMutex; QList syncFilters; -- cgit v1.2.3