diff options
author | sr55 <[email protected]> | 2013-03-01 20:55:10 +0000 |
---|---|---|
committer | sr55 <[email protected]> | 2013-03-01 20:55:10 +0000 |
commit | 3f27ed840bdd9956abdae723422f2b4da7fff8c7 (patch) | |
tree | 38d836742a1d1ebf78984e18b22071d5626aeedc /gtk/src/callbacks.c | |
parent | 06e7a9ace3439f08350a75a6f9a491f1bc4161a3 (diff) |
Merging Trunk into OpenCL
git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/opencl@5279 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/callbacks.c')
-rw-r--r-- | gtk/src/callbacks.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index eb98553e3..6e494f26e 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -2826,15 +2826,21 @@ ghb_backend_events(signal_user_data_t *ud) } else { - status_str = g_strdup_printf ("Scanning title %d of %d...", + if (status.scan.preview_cur == 0) + status_str = g_strdup_printf("Scanning title %d of %d...", status.scan.title_cur, status.scan.title_count ); + else + status_str = g_strdup_printf( + "Scanning title %d of %d preview %d...", + status.scan.title_cur, status.scan.title_count, + status.scan.preview_cur); + } gtk_label_set_text (label, status_str); g_free(status_str); if (status.scan.title_count > 0) { - gtk_progress_bar_set_fraction (scan_prog, - (gdouble)status.scan.title_cur / status.scan.title_count); + gtk_progress_bar_set_fraction (scan_prog, status.scan.progress); } } else if (status.scan.state & GHB_STATE_SCANDONE) |