LinGui: fix a small scanning status display problem and a compiler warning.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1785 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 28d62ba8d6eb5052da64fc237775a3b1d38d9cb2..c8d5e9cbeb29fb204696beace3f792f1bf1c6a2a 100644 (file)
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -1520,8 +1520,15 @@ ghb_backend_events(signal_user_data_t *ud)
        // Then handle the status of the queue
        if (status.state & GHB_STATE_SCANNING)
        {
-               status_str = g_strdup_printf ("Scanning title %d of %d...", 
+               if (status.title_cur == 0)
+               {
+                       status_str = g_strdup ("Scanning...");
+               }
+               else
+               {
+                       status_str = g_strdup_printf ("Scanning title %d of %d...", 
                                                                  status.title_cur, status.title_count );
+               }
                gtk_progress_bar_set_text (progress, status_str);
                g_free(status_str);
                if (status.title_count > 0)

diff --git a/gtk/src/x264handler.c b/gtk/src/x264handler.c
index 4a75520f0368990bbb40240c9cb27d40d4b1e2db..8f8576c94efb203bb71fa2e9c2264aed1ecbf7aa 100644 (file)
--- a/gtk/src/x264handler.c
+++ b/gtk/src/x264handler.c
@@ -16,6 +16,7 @@
 #include "settings.h"
 #include "values.h"
 #include "callbacks.h"
+#include "presets.h"
 #include "x264handler.h"
 
 static void x264_opt_update(signal_user_data_t *ud, GtkWidget *widget);