LinGui: fix a collection of duplicate widget ids in the gtkbuilder xml

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

diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index a6c9f46..d47a2aa 100644 (file)
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -406,15 +406,61 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
                }
                track = ghb_settings_get_string(asettings, "AudioTrackDescription");
                mix = ghb_settings_combo_option(asettings, "AudioMixdown");
+               if (count == 1)
+                       g_string_append_printf(str, "<b>Audio:</b>");
+               else if (ii == 0)
+                       g_string_append_printf(str, "<b>Audio:</b>\n");
+               if (count != 1)
+                       g_string_append_printf(str, "\t");
+
                g_string_append_printf(str,
-                       "<b>Audio:</b><small> %s, Encoder: %s, Mixdown: %s, SampleRate: %s, Bitrate: %s</small>",
+                       "<small> %s, Encoder: %s, Mixdown: %s, SampleRate: %s, Bitrate: %s</small>\n",
                         track, acodec, mix, samplerate, bitrate);
-               if (ii < count-1)
-                       g_string_append_printf(str, "\n");
                g_free(track);
                g_free(bitrate);
                g_free(samplerate);
        }
+
+       // Add the audios
+       const GValue *sub_list;
+
+       sub_list = ghb_settings_get_value(settings, "subtitle_list");
+       count = ghb_array_len(sub_list);
+       for (ii = 0; ii < count; ii++)
+       {
+               GValue *settings;
+               gchar *track;
+               gboolean force, burn, def;
+               gint source;
+
+               settings = ghb_array_get_nth(sub_list, ii);
+               track = ghb_settings_get_string(settings, "SubtitleTrackDescription");
+               source = ghb_settings_get_int(settings, "SubtitleSource");
+               force = ghb_settings_get_boolean(settings, "SubtitleForced");
+               burn = ghb_settings_get_boolean(settings, "SubtitleBurned");
+               def = ghb_settings_get_boolean(settings, "SubtitleDefaultTrack");
+               if (count == 1)
+                       g_string_append_printf(str, "<b>Subtitle:</b>");
+               else if (ii == 0)
+                       g_string_append_printf(str, "<b>Subtitles:</b>\n");
+               if (count != 1)
+                       g_string_append_printf(str, "\t");
+
+               if (source != SRTSUB)
+               {
+                       g_string_append_printf(str,
+                               "<small> %s%s%s%s</small>",
+                               track, 
+                               force ? " (Force)":"",
+                               burn  ? " (Burn)":"",
+                               def   ? " (Default)":""
+                       );
+               }
+               if (ii < count-1)
+                       g_string_append_printf(str, "\n");
+               g_free(track);
+       }
+
        info = g_string_free(str, FALSE);
        gtk_tree_store_append(store, &citer, &iter);
        gtk_tree_store_set(store, &citer, 1, info, -1);
@@ -465,7 +511,7 @@ audio_list_refresh(signal_user_data_t *ud)
                        s_sr = ghb_settings_get_string(asettings, "AudioSamplerate");
                        s_mix = ghb_settings_get_string(asettings, "AudioMixdown");
                        s_drc = ghb_settings_get_double(asettings, "AudioTrackDRCSlider");
-                       if (s_drc < 0.1)
+                       if (s_drc < 1.0)
                                drc = g_strdup("Off");
                        else
                                drc = g_strdup_printf("%.1f", s_drc);
@@ -550,6 +596,8 @@ validate_settings(signal_user_data_t *ud)
                g_free(destdir);
                return FALSE;
        }
+#if !defined(_WIN32)
+       // This doesn't work properly on windows
        if (g_access(destdir, R_OK|W_OK) != 0)
        {
                message = g_strdup_printf(
@@ -562,6 +610,7 @@ validate_settings(signal_user_data_t *ud)
                g_free(destdir);
                return FALSE;
        }
+#endif
        GFile *gfile;
        GFileInfo *info;
        guint64 size;
@@ -625,6 +674,11 @@ validate_settings(signal_user_data_t *ud)
        {
                return FALSE;
        }
+       // Validate audio settings
+       if (!ghb_validate_subtitles(ud))
+       {
+               return FALSE;
+       }
        // Validate video settings
        if (!ghb_validate_video(ud))
        {
@@ -653,11 +707,6 @@ queue_add(signal_user_data_t *ud)
                return FALSE;
        }
 
-       GtkStatusIcon *si;
-
-       si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
-       gtk_status_icon_set_from_icon_name(si, "hb-status");
-
        if (ud->queue == NULL)
                ud->queue = ghb_array_value_new(32);
        // Make a copy of current settings to be used for the new job
@@ -781,7 +830,7 @@ queue_drag_motion_cb(
        GtkWidget *widget;
 
        widget = gtk_drag_get_source_widget(ctx);
-       if (widget == NULL || widget != tv)
+       if (widget == NULL || widget != GTK_WIDGET(tv))
                return TRUE;
 
        // This bit checks to see if the source is allowed to be