Author: pollux
Date: 2007-01-15 19:16:16 +0000 (Mon, 15 Jan 2007)
New Revision: 24488
Modified:
xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c
xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c
Log:
show device buffer usage
Modified:
xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c
===================================================================
--- xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c
2007-01-15 18:05:28 UTC (rev 24487)
+++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-data-composition-dialog.c
2007-01-15 19:16:16 UTC (rev 24488)
@@ -470,19 +470,18 @@
usleep(1002);
time_start = time (NULL);
while ((status = burn_drive_get_status (drive, &progress)) !=
BURN_DRIVE_IDLE) {
- gdouble percent = 0.0;
time_t time_now = time (NULL);
switch (status) {
case BURN_DRIVE_WRITING:
xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG
(dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Burning
composition..."));
- // DBG ("buffer capacity: %d", progress.buffer_capacity);
- // DBG ("buffer available: %d", progress.buffer_available);
- // DBG ("buffer: %f", ((gdouble) progress.buffer_available /
(gdouble) progress.buffer_capacity));
if (progress.sectors > 0 && progress.sector >= 0) {
+ gdouble percent = 0.0;
+
+ percent = (gdouble) (progress.buffer_capacity -
progress.buffer_available) / (gdouble) progress.buffer_capacity;
+ xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), percent);
+
percent = 1.0 + ((gdouble) progress.sector+1.0) / ((gdouble)
progress.sectors) * 98.0;
-
- xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), ((gdouble) progress.buffer_available / (gdouble)
progress.buffer_capacity));
xfburn_progress_dialog_set_progress_bar_fraction
(XFBURN_PROGRESS_DIALOG (dialog_progress), percent / 100.0);
xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG
(dialog_progress),
@@ -492,26 +491,31 @@
case BURN_DRIVE_WRITING_LEADIN:
xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG
(dialog_progress),
XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Writing Lead-In..."));
+ xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
break;
case BURN_DRIVE_WRITING_LEADOUT:
xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG
(dialog_progress),
XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Writing Lead-Out..."));
+ xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
break;
case BURN_DRIVE_WRITING_PREGAP:
xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG
(dialog_progress),
XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Writing pregap..."));
+ xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
break;
case BURN_DRIVE_CLOSING_TRACK:
xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG
(dialog_progress),
XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Closing track..."));
+ xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
break;
case BURN_DRIVE_CLOSING_SESSION:
xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG
(dialog_progress),
XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Closing session..."));
+ xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
break;
default:
Modified: xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c
===================================================================
--- xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c
2007-01-15 18:05:28 UTC (rev 24487)
+++ xfburn/branches/libburn_trial/xfburn/xfburn-burn-image-dialog.c
2007-01-15 19:16:16 UTC (rev 24488)
@@ -327,19 +327,18 @@
usleep(1002);
time_start = time (NULL);
while ((status = burn_drive_get_status (drive, &progress)) !=
BURN_DRIVE_IDLE) {
- gdouble percent = 0.0;
time_t time_now = time (NULL);
switch (status) {
case BURN_DRIVE_WRITING:
xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG
(dialog_progress), XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Burning
composition..."));
- // DBG ("buffer capacity: %d", progress.buffer_capacity);
- // DBG ("buffer available: %d", progress.buffer_available);
- // DBG ("buffer: %f", ((gdouble) progress.buffer_available /
(gdouble) progress.buffer_capacity));
if (progress.sectors > 0 && progress.sector >= 0) {
+ gdouble percent = 0.0;
+
+ percent = (gdouble) (progress.buffer_capacity -
progress.buffer_available) / (gdouble) progress.buffer_capacity;
+ xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), percent);
+
percent = 1.0 + ((gdouble) progress.sector+1.0) / ((gdouble)
progress.sectors) * 98.0;
-
- xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), ((gdouble) progress.buffer_available / (gdouble)
progress.buffer_capacity));
xfburn_progress_dialog_set_progress_bar_fraction
(XFBURN_PROGRESS_DIALOG (dialog_progress), percent / 100.0);
xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG
(dialog_progress),
@@ -349,26 +348,31 @@
case BURN_DRIVE_WRITING_LEADIN:
xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG
(dialog_progress),
XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Writing Lead-In..."));
+ xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
break;
case BURN_DRIVE_WRITING_LEADOUT:
xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG
(dialog_progress),
XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Writing Lead-Out..."));
+ xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
break;
case BURN_DRIVE_WRITING_PREGAP:
xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG
(dialog_progress),
XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Writing pregap..."));
+ xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
break;
case BURN_DRIVE_CLOSING_TRACK:
xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG
(dialog_progress),
XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Closing track..."));
+ xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
break;
case BURN_DRIVE_CLOSING_SESSION:
xfburn_progress_dialog_set_status_with_text (XFBURN_PROGRESS_DIALOG
(dialog_progress),
XFBURN_PROGRESS_DIALOG_STATUS_RUNNING, _("Closing session..."));
+ xfburn_progress_dialog_set_buffer_bar_fraction (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
xfburn_progress_dialog_set_writing_speed (XFBURN_PROGRESS_DIALOG
(dialog_progress), -1);
break;
default:
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
