totem r5139 - in trunk: . src/backend

[tpm]

Author: tpm
Date: Sun Feb 17 11:25:21 2008
New Revision: 5139
URL: http://svn.gnome.org/viewvc/totem?rev=5139&view=rev

Log:
        * src/backend/bacon-video-widget-gst-0.10.c:
          (bacon_video_widget_get_mrls):
          Don't use the GST_TIME_AS_SECONDS macro for now, since
          it only appeared in GStreamer 0.10.16. (Closes: #516853)



Modified:
   trunk/ChangeLog
   trunk/src/backend/bacon-video-widget-gst-0.10.c

Modified: trunk/src/backend/bacon-video-widget-gst-0.10.c
==============================================================================
--- trunk/src/backend/bacon-video-widget-gst-0.10.c     (original)
+++ trunk/src/backend/bacon-video-widget-gst-0.10.c     Sun Feb 17 11:25:21 2008
@@ -4065,13 +4065,13 @@
       g_object_set (element, "device", device, NULL);
       if (gst_element_set_state (element, GST_STATE_PAUSED) != 
GST_STATE_CHANGE_SUCCESS) {
         GST_DEBUG ("Couldn't change the state to PAUSED");
-        g_object_unref (element);
+        gst_object_unref (element);
         return NULL;
       }
       if (gst_element_query_duration (element, &fmt, &num_titles) == FALSE) {
         GST_DEBUG ("Couldn't query the \"duration\" (number of titles)");
        gst_element_set_state (element, GST_STATE_NULL);
-       g_object_unref (element);
+       gst_object_unref (element);
        return NULL;
       }
 
@@ -4096,15 +4096,15 @@
           break;
        }
        /* If it's less than 30 seconds long, we kick it out */
-       if (GST_TIME_AS_SECONDS (len) > 30) {
+       if (len >= (30 * GST_SECOND)) {
          g_ptr_array_add (array, g_strdup_printf ("dvd://%"G_GINT64_FORMAT, 
i));
-         GST_DEBUG ("URI: dvd://%"G_GINT64_FORMAT" (time: %"G_GINT64_FORMAT" 
mins %"G_GINT64_FORMAT" seconds)",
-                    i, GST_TIME_AS_SECONDS (len) / 60, GST_TIME_AS_SECONDS 
(len) % 60);
+         GST_DEBUG ("URI: dvd://%d (time: %" GST_TIME_FORMAT ")",
+              (gint) i, GST_TIME_ARGS (len));
        }
       }
 
       gst_element_set_state (element, GST_STATE_NULL);
-      g_object_unref (element);
+      gst_object_unref (element);
       if (array->len >= 1)
        g_ptr_array_add (array, NULL);
       mrls = (char **) g_ptr_array_free (array, FALSE);
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list

Want to limit the commits to a few modules? Go to above URL, log in to edit 
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development 
mailing list. Email [EMAIL PROTECTED] if interested.