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

[David Mohr]

Author: squisher
Date: 2008-11-06 06:13:21 +0000 (Thu, 06 Nov 2008)
New Revision: 5991

Modified:
   xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c
   xfburn/trunk/xfburn/xfburn-burn-data-composition-base-dialog.c
   xfburn/trunk/xfburn/xfburn-burn-image-dialog.c
   xfburn/trunk/xfburn/xfburn-perform-burn.c
   xfburn/trunk/xfburn/xfburn-perform-burn.h
Log:
Making fifo info available for the status dialog while burning audio

Modified: xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c	2008-11-06 05:52:55 UTC (rev 5990)
+++ xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c	2008-11-06 06:13:21 UTC (rev 5991)
@@ -492,9 +492,7 @@
   burn_write_opts_set_underrun_proof (burn_options, params->burnfree ? 1 : 0);
   burn_drive_set_buffer_waiting (drive, 1, -1, -1, -1, 75, 95);
 
-  // FIXME: perform_burn_write only takes one fifo as an argument right now
-  //xfburn_perform_burn_write (dialog_progress, drive, params->write_mode, burn_options, disc, srcs, track_sectors);
-  xfburn_perform_burn_write (dialog_progress, drive, params->write_mode, burn_options, disc, NULL, track_sectors);
+  xfburn_perform_burn_write (dialog_progress, drive, params->write_mode, burn_options, disc, srcs, track_sectors);
 
   burn_write_opts_free (burn_options);
 }

Modified: xfburn/trunk/xfburn/xfburn-burn-data-composition-base-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-data-composition-base-dialog.c	2008-11-06 05:52:55 UTC (rev 5990)
+++ xfburn/trunk/xfburn/xfburn-burn-data-composition-base-dialog.c	2008-11-06 06:13:21 UTC (rev 5991)
@@ -528,6 +528,7 @@
   GtkWidget *dialog_progress = params->dialog_progress;
 
   struct burn_write_opts * burn_options;
+  struct burn_source **fifos = NULL;
   gint ret;
   int sectors[1];
 
@@ -576,8 +577,17 @@
 
   sectors[0] = burn_disc_get_sectors (disc);
 
-  xfburn_perform_burn_write (dialog_progress, drive, params->write_mode, burn_options, disc, (params->is_fifo ? params->src : NULL), sectors);
+  if (params->is_fifo) {
+    fifos = g_new(struct burn_source *,1);
+    fifos[0] = params->src;
+  }
 
+  xfburn_perform_burn_write (dialog_progress, drive, params->write_mode, burn_options, disc, fifos, sectors);
+
+  if (params->is_fifo) {
+    g_free (fifos);
+  }
+
   burn_write_opts_free (burn_options);
 }
 

Modified: xfburn/trunk/xfburn/xfburn-burn-image-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-image-dialog.c	2008-11-06 05:52:55 UTC (rev 5990)
+++ xfburn/trunk/xfburn/xfburn-burn-image-dialog.c	2008-11-06 06:13:21 UTC (rev 5991)
@@ -279,6 +279,7 @@
   struct burn_drive *drive;
   struct burn_drive_info *drive_info = NULL;
   struct burn_write_opts * burn_options;
+  struct burn_source **fifos = NULL;
 
   gint ret;
 
@@ -350,7 +351,14 @@
   sectors[0] = burn_disc_get_sectors (disc);
   
   xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG (dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Burning image..."));
-  xfburn_perform_burn_write (dialog_progress, drive, params->write_mode, burn_options, disc, fifo_src, sectors);
+
+  fifos = g_new(struct burn_source *,1);
+  fifos[0] = fifo_src;
+
+  xfburn_perform_burn_write (dialog_progress, drive, params->write_mode, burn_options, disc, fifos, sectors);
+
+  g_free (fifos);
+
   burn_source_free (fifo_src);
   burn_write_opts_free (burn_options);
 

Modified: xfburn/trunk/xfburn/xfburn-perform-burn.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-perform-burn.c	2008-11-06 05:52:55 UTC (rev 5990)
+++ xfburn/trunk/xfburn/xfburn-perform-burn.c	2008-11-06 06:13:21 UTC (rev 5991)
@@ -47,7 +47,7 @@
 void
 xfburn_perform_burn_write (GtkWidget *dialog_progress, 
                            struct burn_drive *drive, XfburnWriteMode write_mode, struct burn_write_opts *burn_options, struct burn_disc *disc,
-                           struct burn_source *fifo, int *track_sectors)
+                           struct burn_source **fifos, int *track_sectors)
 {
   enum burn_disc_status disc_state;
   enum burn_drive_status status;
@@ -172,8 +172,8 @@
 	xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG (dialog_progress), 
 						  cur_speed);
 
-        if (fifo != NULL) {
-          fifo_status = burn_fifo_inquire_status (fifo, &fifo_size, &fifo_free, &fifo_text);
+        if (fifos != NULL) {
+          fifo_status = burn_fifo_inquire_status (fifos[progress.track-1], &fifo_size, &fifo_free, &fifo_text);
           switch (fifo_status) {
             case 0:
               xfburn_progress_dialog_set_fifo_bar_text (XFBURN_PROGRESS_DIALOG (dialog_progress), _("standby"));

Modified: xfburn/trunk/xfburn/xfburn-perform-burn.h
===================================================================
--- xfburn/trunk/xfburn/xfburn-perform-burn.h	2008-11-06 05:52:55 UTC (rev 5990)
+++ xfburn/trunk/xfburn/xfburn-perform-burn.h	2008-11-06 06:13:21 UTC (rev 5991)
@@ -33,6 +33,6 @@
 #include "xfburn-device-box.h"
 
 void xfburn_perform_burn_write (GtkWidget *dialog_progress, struct burn_drive *drive, XfburnWriteMode write_mode, struct burn_write_opts *burn_options, 
-                                struct burn_disc *disc, struct burn_source *fifo, int *track_sectors);
+                                struct burn_disc *disc, struct burn_source **fifos, int *track_sectors);
 
 #endif /* __XFBURN_PERFORM_BURN_H__ */