← Back to branch summary

~mfisch/brasero/update-to-3.8.0

« back to all changes in this revision

Viewing changes to src/brasero-progress.c

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2008-11-18 11:30:50 UTC
  • mto: (1.4.1 experimental)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: james.westby@ubuntu.com-20081118113050-yhrskmatlel0gzfm
Tags: upstream-0.8.3
Import upstream version 0.8.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/brasero-progress.c
193
193
brasero_burn_progress_display_session_info (BraseroBurnProgress *obj,
194
194
                                            glong time,
195
195
                                            gint64 rate,
196
 
                                            gboolean is_DVD,
 
196
                                            BraseroMedia media,
197
197
                                            gint written)
198
198
{
199
199
        GtkWidget *label;
253
253
                                  0,
254
254
                                  0);
255
255
 
256
 
                if (is_DVD)
 
256
                if (media & BRASERO_MEDIUM_DVD)
257
257
                        speed = (gfloat) BRASERO_RATE_TO_SPEED_DVD (rate);
 
258
                else if (media & BRASERO_MEDIUM_BD)
 
259
                        speed = (gfloat) BRASERO_RATE_TO_SPEED_BD (rate);
258
260
                else
259
261
                        speed = (gfloat) BRASERO_RATE_TO_SPEED_CD (rate);
260
262
 
277
279
        gtk_box_pack_start (GTK_BOX (obj), table, TRUE, TRUE, 20);
278
280
        gtk_widget_show_all (table);
279
281
 
280
 
        if (written > 1024 * 1024)
281
 
                text = g_strdup_printf (_("%i MiB"), written / 1024 / 1024);
282
 
        else if (written > 1024)
283
 
                text = g_strdup_printf (_("%i KiB"), written / 1024);
284
 
        else if (written > 0)
285
 
                text = g_strdup_printf (_("%i bytes"), written);
286
 
        else
287
 
                return;
288
 
 
 
282
        text = g_format_size_for_display (written);
289
283
        gtk_label_set_text (GTK_LABEL (obj->priv->bytes_written), text);
290
284
        gtk_widget_show (obj->priv->bytes_written);
291
285
        g_free (text);
428
422
 
429
423
void
430
424
brasero_burn_progress_set_status (BraseroBurnProgress *self,
431
 
                                  gboolean is_DVD,
 
425
                                  BraseroMedia media,
432
426
                                  gdouble overall_progress,
433
427
                                  gdouble action_progress,
434
428
                                  glong remaining,
491
485
        if (rate > 0 && self->priv->speed) {
492
486
                gfloat speed;
493
487
 
494
 
                if (rate >= 0 && is_DVD)
 
488
                if (media & BRASERO_MEDIUM_DVD)
495
489
                        speed = (gfloat) BRASERO_RATE_TO_SPEED_DVD (rate);
 
490
                else if (media & BRASERO_MEDIUM_BD)
 
491
                        speed = (gfloat) BRASERO_RATE_TO_SPEED_BD (rate);
496
492
                else
497
493
                        speed = (gfloat) BRASERO_RATE_TO_SPEED_CD (rate);
498
494