remove crf flag and all uses of it

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

diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index fbe7cce..7610723 100644 (file)
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -256,7 +256,7 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
                vqvalue = ghb_settings_get_double(settings, "VideoQualitySlider");
                vq_desc = "Constant Quality:";
                vqstr = g_strdup_printf("%d", (gint)vqvalue);
-               vq_units = "(crf)";
+               vq_units = "(RF)";
        }
        fps = ghb_settings_get_string(settings, "VideoFramerate");
        if (strcmp("source", fps) == 0)
@@ -283,8 +283,10 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
                 source_width, source_height, width, height, aspect_desc);
 
        gint decomb, detel;
+       gboolean decomb_deint;
        gboolean filters = FALSE;
 
+       decomb_deint = ghb_settings_get_boolean(settings, "PictureDecombDeinterlace");
        decomb = ghb_settings_combo_int(settings, "PictureDecomb");
        g_string_append_printf(str, "<b>Filters:</b><small>");
        detel = ghb_settings_combo_int(settings, "PictureDetelecine");
@@ -300,7 +302,7 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
                }
                filters = TRUE;
        }
-       if (decomb)
+       if (decomb_deint && decomb)
        {
                g_string_append_printf(str, " - Decomb");
                if (decomb == 1)
@@ -312,7 +314,7 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
                }
                filters = TRUE;
        }
-       else
+       else if (!decomb_deint)
        {
                gint deint = ghb_settings_combo_int(settings, "PictureDeinterlace");
                if (deint)
@@ -509,6 +511,7 @@ audio_list_refresh(signal_user_data_t *ud)
                {
                        const gchar *track, *codec, *br, *sr, *mix;
                        gchar *drc, *s_track, *s_codec, *s_br, *s_sr, *s_mix;
+                       gint itrack, icodec;
                        gdouble s_drc;
                        GValue *asettings;
 
@@ -518,7 +521,9 @@ audio_list_refresh(signal_user_data_t *ud)
                        asettings = ghb_array_get_nth(audio_list, row);
 
                        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");
                        br = ghb_settings_combo_option(asettings, "AudioBitrate");
                        sr = ghb_settings_combo_option(asettings, "AudioSamplerate");
                        mix = ghb_settings_combo_option(asettings, "AudioMixdown");
@@ -534,6 +539,9 @@ audio_list_refresh(signal_user_data_t *ud)
                        else
                                drc = g_strdup_printf("%.1f", s_drc);
 
+                       if (icodec == HB_ACODEC_MASK)
+                               codec = ghb_select_audio_codec_str(ud, itrack);
+
                        gtk_list_store_set(GTK_LIST_STORE(store), &iter, 
                                // These are displayed in list
                                0, track,
@@ -783,7 +791,7 @@ queue_remove_clicked_cb(GtkWidget *widget, gchar *path, signal_user_data_t *ud)
                if (status == GHB_QUEUE_RUNNING)
                {
                        // Ask if wants to stop encode.
-                       if (!ghb_cancel_encode(NULL))
+                       if (!ghb_cancel_encode2(ud, NULL))
                        {
                                return;
                        }
@@ -1196,8 +1204,8 @@ queue_start_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
        state = ghb_get_queue_state();
        if (state & (GHB_STATE_WORKING | GHB_STATE_SCANNING | GHB_STATE_MUXING))
        {
-               ud->cancel_encode = TRUE;
-               ghb_cancel_encode(NULL);
+               ghb_cancel_encode(ud, "You are currently encoding.  "
+                                                               "What would you like to do?");
                return;
        }
 
@@ -1269,6 +1277,8 @@ ghb_reload_queue(signal_user_data_t *ud)
                {
                        GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
                        gtk_widget_show (widget);
+                       widget = GHB_WIDGET (ud->builder, "show_queue");
+                       gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
 
                        ud->queue = queue;
                        // First get rid of any old items we don't want
@@ -1345,7 +1355,7 @@ queue_key_press_cb(
                if (status == GHB_QUEUE_RUNNING)
                {
                        // Ask if wants to stop encode.
-                       if (!ghb_cancel_encode(NULL))
+                       if (!ghb_cancel_encode2(ud, NULL))
                        {
                                return TRUE;
                        }
@@ -1405,6 +1415,10 @@ queue_edit_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
                        // Remove the corresponding item from the queue list
                        ghb_array_remove(ud->queue, row);
                }
+               else
+               {
+                       ghb_queue_edit_settings = ghb_value_dup(ghb_queue_edit_settings);
+               }
                gchar *source;
                source = ghb_settings_get_string(ghb_queue_edit_settings, "source");
                ghb_do_scan(ud, source, 0, FALSE);