LinGui: missed removing a part of target file size code

[handbrake-jp/handbrake-jp-git.git] / gtk / src / queuehandler.c

diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 2232a21..4b9c9fb 100644 (file)
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
  * callbacks.c
- * Copyright (C) John Stebbins 2008 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2011 <stebbins@stebbins>
  * 
  * callbacks.c is free software.
  * 
@@ -75,7 +75,7 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
        gboolean pass2 = FALSE, keep_aspect, vqtype, turbo;
        gint pic_par;
        gboolean tweaks;
-       gchar *escape;
+       gchar *escape, *escape2;
        
        g_debug("update_queue_list ()");
        if (settings == NULL) return;
@@ -90,6 +90,7 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
        dest = ghb_settings_get_string(settings, "destination");
        basename = g_path_get_basename(dest);
        escape = g_markup_escape_text(basename, -1);
+       escape2 = g_markup_escape_text(vol_name, -1);
 
        vqtype = ghb_settings_get_boolean(settings, "vquality_type_constant");
        if (!vqtype)
@@ -106,11 +107,12 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
                "<big><b>%s</b></big> "
                "<small>(Title %d, %s %d through %d, %d Video %s)"
                " --> %s</small>",
-                vol_name, title, points, start_point, end_point, 
+                escape2, title, points, start_point, end_point, 
                 pass2 ? 2:1, pass2 ? "Passes":"Pass", escape
        );
        g_free(basename);
        g_free(escape);
+       g_free(escape2);
 
        if (piter)
                iter = *piter;
@@ -243,21 +245,10 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
        gdouble vqvalue;
        if (!vqtype)
        {
-               vqtype = ghb_settings_get_boolean(settings, "vquality_type_target");
-               if (!vqtype)
-               {
-                       // Has to be bitrate
-                       vqvalue = ghb_settings_get_int(settings, "VideoAvgBitrate");
-                       vq_desc = "Bitrate:";
-                       vq_units = "kbps";
-               }
-               else
-               {
-                       // Target file size
-                       vqvalue = ghb_settings_get_int(settings, "VideoTargetSize");
-                       vq_desc = "Target Size:";
-                       vq_units = "MB";
-               }
+        // Has to be bitrate
+        vqvalue = ghb_settings_get_int(settings, "VideoAvgBitrate");
+        vq_desc = "Bitrate:";
+        vq_units = "kbps";
                vqstr = g_strdup_printf("%d", (gint)vqvalue);
        }
        else
@@ -409,7 +400,7 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
 
                asettings = ghb_array_get_nth(audio_list, ii);
 
-               acodec = ghb_settings_combo_option(asettings, "AudioEncoder");
+               acodec = ghb_settings_combo_option(asettings, "AudioEncoderActual");
                bitrate = ghb_settings_get_string(asettings, "AudioBitrate");
                sr = ghb_settings_get_double(asettings, "AudioSamplerate");
                samplerate = ghb_settings_get_string(asettings, "AudioSamplerate");
@@ -526,7 +517,7 @@ audio_list_refresh(signal_user_data_t *ud)
                {
                        const gchar *track, *codec, *br, *sr, *mix;
                        gchar *s_drc;
-                       gint itrack, icodec;
+                       gint itrack;
                        gdouble drc;
                        GValue *asettings;
 
@@ -537,8 +528,7 @@ audio_list_refresh(signal_user_data_t *ud)
 
                        track = ghb_settings_combo_option(asettings, "AudioTrack");
                        itrack = ghb_settings_combo_int(asettings, "AudioTrack");
-                       codec = ghb_settings_combo_option(asettings, "AudioEncoder");
-                       icodec = ghb_settings_combo_int(asettings, "AudioEncoder");
+                       codec = ghb_settings_combo_option(asettings, "AudioEncoderActual");
                        br = ghb_settings_combo_option(asettings, "AudioBitrate");
                        sr = ghb_settings_combo_option(asettings, "AudioSamplerate");
                        mix = ghb_settings_combo_option(asettings, "AudioMixdown");
@@ -549,9 +539,6 @@ audio_list_refresh(signal_user_data_t *ud)
                        else
                                s_drc = g_strdup_printf("%.1f", drc);
 
-                       if (icodec == HB_ACODEC_ANY)
-                               codec = ghb_select_audio_codec_str(ud->settings, icodec, itrack);
-
                        gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
                                // These are displayed in list
                                0, track,
@@ -1047,6 +1034,11 @@ ghb_queue_buttons_grey(signal_user_data_t *ud)
 
        paused = queue_state & GHB_STATE_PAUSED;
 
+       widget = GHB_WIDGET(ud->builder, "queue_add");
+       gtk_widget_set_sensitive(widget, show_start);
+       action = GHB_ACTION(ud->builder, "queue_add_menu");
+       gtk_action_set_sensitive(action, show_start);
+
        widget = GHB_WIDGET (ud->builder, "queue_start1");
        if (show_stop)
        {