[Goodies-commits] r5886 - xfburn/trunk/xfburn

[David Mohr]

Author: squisher
Date: 2008-10-31 15:18:17 +0000 (Fri, 31 Oct 2008)
New Revision: 5886

Modified:
   xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c
   xfburn/trunk/xfburn/xfburn-transcoder-gst.c
Log:
Increasing timeouts, try to reset gst state after EOS, switch back to SAO

Modified: xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c	2008-10-31 10:37:24 UTC (rev 5885)
+++ xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c	2008-10-31 15:18:17 UTC (rev 5886)
@@ -454,7 +454,9 @@
     return;
   }
 
+  DBG ("Adding %d tracks to the session", n_tracks);
   for (i=0; i<n_tracks; i++) {
+    DBG ("Track %d has %d sectors", i, track_sectors[i]);
     burn_session_add_track (session, tracks[i], BURN_POS_END);
   }
 
@@ -631,7 +633,7 @@
       device = xfburn_device_box_get_selected_device (XFBURN_DEVICE_BOX (priv->device_box));
       speed = xfburn_device_box_get_speed (XFBURN_DEVICE_BOX (priv->device_box));
       /* cdrskin burns audio with SAO */
-      write_mode = WRITE_MODE_TAO;
+      write_mode = WRITE_MODE_SAO;
 
       /* burn composition */
       params = g_new0 (ThreadBurnCompositionParams, 1);

Modified: xfburn/trunk/xfburn/xfburn-transcoder-gst.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-transcoder-gst.c	2008-10-31 10:37:24 UTC (rev 5885)
+++ xfburn/trunk/xfburn/xfburn-transcoder-gst.c	2008-10-31 15:18:17 UTC (rev 5886)
@@ -125,12 +125,14 @@
 
 /* constants */
 
-#define SIGNAL_WAIT_TIMEOUT_MICROS 1000000
+#define SIGNAL_WAIT_TIMEOUT_MICROS 1500000
 
 #define SIGNAL_SEND_ITERATIONS 10
-#define SIGNAL_SEND_TIMEOUT_MICROS 400000
+/* SIGNAL_SEND_TIMEOUT_MICROS is the total time,
+ * which gets divided into SIGNAL_SEND_ITERATIONS probes */
+#define SIGNAL_SEND_TIMEOUT_MICROS 1000000
 
-#define STATE_CHANGE_TIMEOUT_NANOS 250000000
+#define STATE_CHANGE_TIMEOUT_NANOS 750000000
 
 #define XFBURN_AUDIO_TRACK_GET_GST(atrack) ((XfburnAudioTrackGst *) (atrack)->data)
 
@@ -389,6 +391,10 @@
 
       close (gtrack->fd_in);
 
+      if (gst_element_set_state (priv->pipeline, GST_STATE_NULL) == GST_STATE_CHANGE_FAILURE) {
+        g_warning ("Gstreamer did not want to get ready after EOS!");
+      }
+
       if (!transcode_next_track (trans, &error)) {
         g_warning ("Error while switching track: %s", error->message);
         g_error_free (error);