diff options
Diffstat (limited to 'src/gstplayer.cpp')
| -rw-r--r-- | src/gstplayer.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp index 4f82067..ebf7b0d 100644 --- a/src/gstplayer.cpp +++ b/src/gstplayer.cpp @@ -75,7 +75,7 @@ static const char *dvd_device; static const char *vcd_device; static GstElement *gst_elm_play; static GstBus *gst_bus; -static unsigned int /*GstMessageType*/ ignore_messages_tqmask; +static unsigned int /*GstMessageType*/ ignore_messages_mask; static GstXOverlay *xoverlay; static GstColorBalance *color_balance; static gulong gst_bus_sync; @@ -217,7 +217,7 @@ static void gstTag (const GstTagList *, const gchar *tag, gpointer) { static void gstBusMessage (GstBus *, GstMessage * message, gpointer) { GstMessageType msg_type = GST_MESSAGE_TYPE (message); /* somebody else is handling the message, probably in gstPolForStateChange*/ - if (ignore_messages_tqmask & msg_type) + if (ignore_messages_mask & msg_type) return; switch (msg_type) { case GST_MESSAGE_ERROR: @@ -310,14 +310,14 @@ static bool gstPollForStateChange (GstElement *element, GstState state, gint64 t GError **error = 0L; events = GST_MESSAGE_STATE_CHANGED | GST_MESSAGE_ERROR | GST_MESSAGE_EOS; - saved_events = ignore_messages_tqmask; + saved_events = ignore_messages_mask; if (element && element == gst_elm_play) { /* we do want the main handler to process state changed messages for * playbin as well, otherwise it won't hook up the timeout etc. */ - ignore_messages_tqmask |= (events ^ GST_MESSAGE_STATE_CHANGED); + ignore_messages_mask |= (events ^ GST_MESSAGE_STATE_CHANGED); } else { - ignore_messages_tqmask |= events; + ignore_messages_mask |= events; } while (true) { @@ -367,14 +367,14 @@ static bool gstPollForStateChange (GstElement *element, GstState state, gint64 t success: /* state change succeeded */ fprintf (stderr, "state change to %s succeeded\n", gst_element_state_get_name (state)); - ignore_messages_tqmask = saved_events; + ignore_messages_mask = saved_events; return true; timed_out: /* it's taking a long time to open -- just tell totem it was ok, this allows * the user to stop the loading process with the normal stop button */ fprintf (stderr, "state change to %s timed out, returning success and handling errors asynchroneously\n", gst_element_state_get_name (state)); - ignore_messages_tqmask = saved_events; + ignore_messages_mask = saved_events; return true; error: @@ -382,7 +382,7 @@ error: gst_element_state_get_name (state), (error && *error) ? (*error)->message : "unknown"); /* already set *error */ - ignore_messages_tqmask = saved_events; + ignore_messages_mask = saved_events; TQApplication::postEvent (gstapp, new TQEvent ((TQEvent::Type) event_error)); return false; } @@ -573,7 +573,7 @@ void KGStreamerPlayer::play (int repeat) { fprintf (stderr, "couldn't create playbin\n"); goto fail; } - ignore_messages_tqmask = 0; + ignore_messages_mask = 0; gst_bus = gst_element_get_bus (gst_elm_play); gst_bus_add_signal_watch (gst_bus); |