server/gstdecode.c: Dissect the message more portably.

[disorder] / server / gstdecode.c

diff --git a/server/gstdecode.c b/server/gstdecode.c
index 7d540526c14616f648f67d2bee147ef2a596be65..0ebe83a0323d2f5d7581f92ca0ca00b92c0986f9 100644 (file)
--- a/server/gstdecode.c
+++ b/server/gstdecode.c
@@ -314,16 +314,11 @@ static void prepare_pipeline(void)
 static void bus_message(GstBus UNUSED *bus, GstMessage *msg,
                         gpointer UNUSED u)
 {
 static void bus_message(GstBus UNUSED *bus, GstMessage *msg,
                         gpointer UNUSED u)
 {

-  switch(msg->type) {
+  switch(GST_MESSAGE_TYPE(msg)) {

   case GST_MESSAGE_ERROR:
   case GST_MESSAGE_ERROR:

-#ifdef HAVE_GSTREAMER_0_10
-    disorder_fatal(0, "%s",
-                   gst_structure_get_string(msg->structure, "debug"));
-#else

     disorder_fatal(0, "%s",
                    gst_structure_get_string(gst_message_get_structure(msg),
                                             "debug"));
     disorder_fatal(0, "%s",
                    gst_structure_get_string(gst_message_get_structure(msg),
                                             "debug"));

-#endif

   default:
     break;
   }
   default:
     break;
   }