#include "hb-backend.h"
#include "settings.h"
#include "callbacks.h"
+#include "values.h"
+#include "lang.h"
typedef struct
{
const gchar *option;
const gchar *shortOpt;
gint ivalue;
- gdouble dvalue;
const gchar *svalue;
} options_map_t;
{
gint count;
options_map_t *map;
- gint *grey_options;
} combo_opts_t;
+static const gchar *index_str[] =
+{
+ "0",
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+};
+
static options_map_t d_container_opts[] =
{
- {"MKV", "mkv", HB_MUX_MKV, 0.0, "mkv"},
- {"MP4", "mp4", HB_MUX_MP4, 0.0, "mp4"},
- {"M4V", "m4v", HB_MUX_MP4, 0.0, "m4v"},
- {"AVI", "avi", HB_MUX_AVI, 0.0, "avi"},
- {"OGM", "ogm", HB_MUX_OGM, 0.0, "ogm"},
+ {"MKV", "mkv", HB_MUX_MKV, "mkv"},
+ {"MP4", "mp4", HB_MUX_MP4, "mp4"},
+ {"M4V", "m4v", HB_MUX_MP4, "m4v"},
+ {"AVI", "avi", HB_MUX_AVI, "avi"},
+ {"OGM", "ogm", HB_MUX_OGM, "ogm"},
};
combo_opts_t container_opts =
{
static options_map_t d_deint_opts[] =
{
- {"None", "none", 0, 0.0, ""},
- {"Fast", "fast", 1, 0.0, "-1:-1:-1:0:1"},
- {"Slow", "slow", 2, 0.0, "2:-1:-1:0:1"},
- {"Slower", "slower", 3, 0.0, "0:-1:-1:0:1"},
+ {"None", "none", 0, ""},
+ {"Fast", "fast", 1, "-1:-1:-1:0:1"},
+ {"Slow", "slow", 2, "2:-1:-1:0:1"},
+ {"Slower", "slower", 3, "0:-1:-1:0:1"},
};
combo_opts_t deint_opts =
{
static options_map_t d_denoise_opts[] =
{
- {"None", "none", 0, 0.0, ""},
- {"Weak", "weak", 1, 0.0, "2:1:2:3"},
- {"Medium", "medium", 2, 0.0, "3:2:2:3"},
- {"Strong", "strong", 3, 0.0, "7:7:5:5"},
+ {"None", "none", 0, ""},
+ {"Weak", "weak", 1, "2:1:2:3"},
+ {"Medium", "medium", 2, "3:2:2:3"},
+ {"Strong", "strong", 3, "7:7:5:5"},
};
combo_opts_t denoise_opts =
{
static options_map_t d_vcodec_opts[] =
{
- {"H.264 (x264)", "x264", HB_VCODEC_X264, 0.0, ""},
- {"MPEG-4 (XviD)", "xvid", HB_VCODEC_XVID, 0.0, ""},
- {"MPEG-4 (FFMPEG)", "ffmpeg", HB_VCODEC_FFMPEG, 0.0, ""},
- {"Theora", "theora", HB_VCODEC_THEORA, 0.0, ""},
+ {"H.264 (x264)", "x264", HB_VCODEC_X264, ""},
+ {"MPEG-4 (XviD)", "xvid", HB_VCODEC_XVID, ""},
+ {"MPEG-4 (FFMPEG)", "ffmpeg", HB_VCODEC_FFMPEG, ""},
+ {"Theora", "theora", HB_VCODEC_THEORA, ""},
};
combo_opts_t vcodec_opts =
{
static options_map_t d_acodec_opts[] =
{
- {"AAC (faac)", "faac", HB_ACODEC_FAAC, 0.0, "faac"},
- {"MP3 (lame)", "lame", HB_ACODEC_LAME, 0.0, "lame"},
- {"Vorbis", "vorbis", HB_ACODEC_VORBIS, 0.0, "vorbis"},
- {"AC3 (pass-thru)", "ac3", HB_ACODEC_AC3, 0.0, "ac3"},
+ {"AAC (faac)", "faac", HB_ACODEC_FAAC, "faac"},
+ {"MP3 (lame)", "lame", HB_ACODEC_LAME, "lame"},
+ {"Vorbis", "vorbis", HB_ACODEC_VORBIS, "vorbis"},
+ {"AC3 (pass-thru)", "ac3", HB_ACODEC_AC3, "ac3"},
};
combo_opts_t acodec_opts =
{
static options_map_t d_direct_opts[] =
{
- {"None", "none", 0, 0.0, "none"},
- {"Spatial", "spatial", 1, 0.0, "spatial"},
- {"Temporal", "temporal", 2, 0.0, "temporal"},
- {"Automatic", "auto", 3, 0.0, "auto"},
+ {"None", "none", 0, "none"},
+ {"Spatial", "spatial", 1, "spatial"},
+ {"Temporal", "temporal", 2, "temporal"},
+ {"Automatic", "auto", 3, "auto"},
};
combo_opts_t direct_opts =
{
static options_map_t d_me_opts[] =
{
- {"Diamond", "dia", 0, 0.0, "dia"},
- {"Hexagon", "hex", 1, 0.0, "hex"},
- {"Uneven Multi-Hexagon", "umh", 2, 0.0, "umh"},
- {"Exhaustive", "esa", 3, 0.0, "esa"},
+ {"Diamond", "dia", 0, "dia"},
+ {"Hexagon", "hex", 1, "hex"},
+ {"Uneven Multi-Hexagon", "umh", 2, "umh"},
+ {"Exhaustive", "esa", 3, "esa"},
};
combo_opts_t me_opts =
{
static options_map_t d_subme_opts[] =
{
- {"1", "1", 1, 0.0, "1"},
- {"2", "2", 2, 0.0, "2"},
- {"3", "3", 3, 0.0, "3"},
- {"4", "4", 4, 0.0, "4"},
- {"5", "5", 5, 0.0, "5"},
- {"6", "6", 6, 0.0, "6"},
- {"7", "7", 7, 0.0, "7"},
+ {"1", "1", 1, "1"},
+ {"2", "2", 2, "2"},
+ {"3", "3", 3, "3"},
+ {"4", "4", 4, "4"},
+ {"5", "5", 5, "5"},
+ {"6", "6", 6, "6"},
+ {"7", "7", 7, "7"},
+ {"8", "8", 8, "8"},
+ {"9", "9", 9, "9"},
};
combo_opts_t subme_opts =
{
static options_map_t d_analyse_opts[] =
{
- {"Some", "some", 0, 0.0, "some"},
- {"None", "none", 1, 0.0, "none"},
- {"All", "all", 2, 0.0, "all"},
- {"Custom", "custom", 3, 0.0, "all"},
+ {"Some", "some", 0, "some"},
+ {"None", "none", 1, "none"},
+ {"All", "all", 2, "all"},
+ {"Custom", "custom", 3, "all"},
};
combo_opts_t analyse_opts =
{
static options_map_t d_trellis_opts[] =
{
- {"Disabled", "0", 0, 0.0, "0"},
- {"Final Macro Block", "1", 1, 0.0, "1"},
- {"Always", "2", 2, 0.0, "2"},
+ {"Disabled", "0", 0, "0"},
+ {"Final Macro Block", "1", 1, "1"},
+ {"Always", "2", 2, "2"},
};
combo_opts_t trellis_opts =
{
d_trellis_opts
};
+combo_opts_t subtitle_opts =
+{
+ 0,
+ NULL
+};
+
+combo_opts_t title_opts =
+{
+ 0,
+ NULL
+};
+
+combo_opts_t audio_track_opts =
+{
+ 0,
+ NULL
+};
+
+typedef struct
+{
+ const gchar *name;
+ combo_opts_t *opts;
+} combo_name_map_t;
+
+combo_name_map_t combo_name_map[] =
+{
+ {"FileFormat", &container_opts},
+ {"PictureDeinterlace", &deint_opts},
+ {"tweak_PictureDeinterlace", &deint_opts},
+ {"PictureDenoise", &denoise_opts},
+ {"tweak_PictureDenoise", &denoise_opts},
+ {"VideoEncoder", &vcodec_opts},
+ {"AudioEncoder", &acodec_opts},
+ {"x264_direct", &direct_opts},
+ {"x264_me", &me_opts},
+ {"x264_subme", &subme_opts},
+ {"x264_analyse", &analyse_opts},
+ {"x264_trellis", &trellis_opts},
+ {"Subtitles", &subtitle_opts},
+ {"title", &title_opts},
+ {"AudioTrack", &audio_track_opts},
+ {NULL, NULL}
+};
+
+#if 0
typedef struct iso639_lang_t
{
char * eng_name; /* Description in English */
char * iso639_2; /* ISO-639-2/t (3 character) code */
char * iso639_2b; /* ISO-639-2/b code (if different from above) */
} iso639_lang_t;
+#endif
-static const iso639_lang_t language_table[] =
+const iso639_lang_t ghb_language_table[] =
{
{ "Any", "", "zz", "und" },
- { "Afar", "", "aa", "aar" },
+ { "Afar", "", "aa", "aar" },
{ "Abkhazian", "", "ab", "abk" },
{ "Afrikaans", "", "af", "afr" },
{ "Akan", "", "ak", "aka" },
{ "Yoruba", "", "yo", "yor" },
{ "Zhuang", "", "za", "zha" },
{ "Zulu", "", "zu", "zul" },
+ {NULL, NULL, NULL, NULL}
};
-#define LANG_TABLE_SIZE (sizeof(language_table)/ sizeof(iso639_lang_t))
+#define LANG_TABLE_SIZE (sizeof(ghb_language_table)/ sizeof(iso639_lang_t)-1)
+
+static void audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name);
static void
del_tree(const gchar *name, gboolean del_top)
}
if (del_top)
g_rmdir(name);
+ g_dir_close(gdir);
}
else
{
}
void
-ghb_vquality_range(signal_user_data_t *ud, gint *min, gint *max)
+ghb_vquality_range(
+ signal_user_data_t *ud,
+ gdouble *min,
+ gdouble *max,
+ gdouble *step,
+ gdouble *page,
+ gint *digits)
{
- if (ghb_settings_get_bool(ud->settings, "directqp"))
+ if (ghb_settings_get_boolean(ud->settings, "directqp"))
{
- gint vcodec = ghb_settings_get_int(ud->settings, "video_codec");
+ gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
// Only x264 and ffmpeg currently support direct qp/crf entry
+ *step = 1;
+ *page = 10;
+ *digits = 0;
if (vcodec == HB_VCODEC_X264)
{
*min = 0;
else
{
*min = 0;
- *max = 100;
+ *max = 1.0;
+ *step = 0.001;
+ *page = 0.1;
+ *digits = 3;
}
}
else
{
*min = 0;
- *max = 100;
+ *max = 1.0;
+ *step = 0.001;
+ *page = 0.1;
+ *digits = 3;
}
}
-gint
-ghb_lookup_acodec(const gchar *acodec)
+static gint
+lookup_generic_int(combo_opts_t *opts, const GValue *gval)
{
gint ii;
+ gchar *str;
+ gint result = -1;
- for (ii = 0; ii < acodec_opts.count; ii++)
+ str = ghb_value_string(gval);
+ for (ii = 0; ii < opts->count; ii++)
{
- if (strcmp(acodec_opts.map[ii].shortOpt, acodec) == 0)
+ if (strcmp(opts->map[ii].shortOpt, str) == 0)
{
- return acodec_opts.map[ii].ivalue;
+ result = opts->map[ii].ivalue;
+ break;
}
}
- return HB_ACODEC_FAAC;
+ g_free(str);
+ return result;
}
-gint
-ghb_lookup_bitrate(const gchar *bitrate)
+static const gchar*
+lookup_generic_option(combo_opts_t *opts, const GValue *gval)
{
gint ii;
+ gchar *str;
+ const gchar *result = "";
- for (ii = 0; ii < hb_audio_bitrates_count; ii++)
+ str = ghb_value_string(gval);
+ for (ii = 0; ii < opts->count; ii++)
{
- if (strcmp(hb_audio_bitrates[ii].string, bitrate) == 0)
+ if (strcmp(opts->map[ii].shortOpt, str) == 0)
{
- return hb_audio_bitrates[ii].rate * 1000;
+ result = opts->map[ii].option;
+ break;
}
}
- return 160 * 1000;
+ g_free(str);
+ return result;
}
-gint
-ghb_lookup_rate(const gchar *rate)
+static gint
+lookup_mix_int(const GValue *mix)
{
gint ii;
+ gchar *str;
+ gint result = 0;
+
+ str = ghb_value_string(mix);
+ for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+ {
+ if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0)
+ {
+ result = hb_audio_mixdowns[ii].amixdown;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static const gchar*
+lookup_mix_option(const GValue *mix)
+{
+ gint ii;
+ gchar *str;
+ gchar *result = "None";
+
+
+ str = ghb_value_string(mix);
+ for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+ {
+ if (strcmp(hb_audio_mixdowns[ii].short_name, str) == 0)
+ {
+ result = hb_audio_mixdowns[ii].human_readable_name;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static gint
+lookup_video_rate_int(const GValue *vrate)
+{
+ gint ii;
+ gchar *str;
+ gint result = 0;
+
+ str = ghb_value_string(vrate);
+ for (ii = 0; ii < hb_video_rates_count; ii++)
+ {
+ if (strcmp(hb_video_rates[ii].string, str) == 0)
+ {
+ result = hb_video_rates[ii].rate;
+ break;
+ }
+ }
+ g_free(str);
+ // Default to "same as source"
+ return result;
+}
+
+static const gchar*
+lookup_video_rate_option(const GValue *vrate)
+{
+ gint ii;
+ gchar *str;
+ const gchar *result = "Same as source";
+
+ str = ghb_value_string(vrate);
+ for (ii = 0; ii < hb_video_rates_count; ii++)
+ {
+ if (strcmp(hb_video_rates[ii].string, str) == 0)
+ {
+ result = hb_video_rates[ii].string;
+ break;
+ }
+ }
+ g_free(str);
+ // Default to "same as source"
+ return result;
+}
+
+static gint
+lookup_audio_rate_int(const GValue *rate)
+{
+ gint ii;
+ gchar *str;
+ gint result = 0;
+
+ // Coincidentally, the string "source" will return 0
+ // which is our flag to use "same as source"
+ str = ghb_value_string(rate);
for (ii = 0; ii < hb_audio_rates_count; ii++)
{
- if (strcmp(hb_audio_rates[ii].string, rate) == 0)
+ if (strcmp(hb_audio_rates[ii].string, str) == 0)
{
- return hb_audio_rates[ii].rate;
+ result = hb_audio_rates[ii].rate;
+ break;
}
}
+ g_free(str);
+ return result;
+}
+
+static const gchar*
+lookup_audio_rate_option(const GValue *rate)
+{
+ gint ii;
+ gchar *str;
+ const gchar *result = "Same as source";
+
// Coincidentally, the string "source" will return 0
// which is our flag to use "same as source"
- return 0;
+ str = ghb_value_string(rate);
+ for (ii = 0; ii < hb_audio_rates_count; ii++)
+ {
+ if (strcmp(hb_audio_rates[ii].string, str) == 0)
+ {
+ result = hb_audio_rates[ii].string;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
}
-gint
-ghb_lookup_mix(const gchar *mix)
+static gint
+lookup_audio_bitrate_int(const GValue *rate)
{
gint ii;
+ gchar *str;
+ gint result = 0;
- for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
+ // Coincidentally, the string "source" will return 0
+ // which is our flag to use "same as source"
+ str = ghb_value_string(rate);
+ for (ii = 0; ii < hb_audio_bitrates_count; ii++)
+ {
+ if (strcmp(hb_audio_bitrates[ii].string, str) == 0)
+ {
+ result = hb_audio_bitrates[ii].rate;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static const gchar*
+lookup_audio_bitrate_option(const GValue *rate)
+{
+ gint ii;
+ gchar *str;
+ const gchar *result = "Same as source";
+
+ // Coincidentally, the string "source" will return 0
+ // which is our flag to use "same as source"
+ str = ghb_value_string(rate);
+ for (ii = 0; ii < hb_audio_bitrates_count; ii++)
+ {
+ if (strcmp(hb_audio_bitrates[ii].string, str) == 0)
+ {
+ result = hb_audio_bitrates[ii].string;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
+}
+
+static gint
+lookup_audio_lang_int(const GValue *rate)
+{
+ gint ii;
+ gchar *str;
+ gint result = 0;
+
+ // Coincidentally, the string "source" will return 0
+ // which is our flag to use "same as source"
+ str = ghb_value_string(rate);
+ for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
{
- if (strcmp(hb_audio_mixdowns[ii].short_name, mix) == 0)
+ if (strcmp(ghb_language_table[ii].iso639_2, str) == 0)
{
- return hb_audio_mixdowns[ii].amixdown;
+ result = ii;
+ break;
}
}
- return HB_AMIXDOWN_DOLBYPLII;
+ g_free(str);
+ return result;
}
-gdouble
-ghb_lookup_drc(const gchar *drc)
+static const gchar*
+lookup_audio_lang_option(const GValue *rate)
{
- gdouble dval;
- dval = g_strtod(drc, NULL);
- if (dval < 1.0) dval = 1.0;
- if (dval > 4.0) dval = 4.0;
- return dval;
+ gint ii;
+ gchar *str;
+ const gchar *result = "Same as source";
+
+ // Coincidentally, the string "source" will return 0
+ // which is our flag to use "same as source"
+ str = ghb_value_string(rate);
+ for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
+ {
+ if (strcmp(ghb_language_table[ii].iso639_2, str) == 0)
+ {
+ result = ghb_language_table[ii].eng_name;
+ break;
+ }
+ }
+ g_free(str);
+ return result;
}
-static setting_value_t*
+static GValue*
get_acodec_value(gint val)
{
- setting_value_t *value = NULL;
+ GValue *value = NULL;
gint ii;
for (ii = 0; ii < acodec_opts.count; ii++)
{
if (acodec_opts.map[ii].ivalue == val)
{
- value = g_malloc(sizeof(setting_value_t));
- value->option = g_strdup(acodec_opts.map[ii].option);
- value->shortOpt = g_strdup(acodec_opts.map[ii].shortOpt);
- value->svalue = g_strdup(acodec_opts.map[ii].svalue);
- value->index = ii;
- value->ivalue = acodec_opts.map[ii].ivalue;
- value->dvalue = acodec_opts.map[ii].dvalue;
+ value = ghb_string_value_new(acodec_opts.map[ii].shortOpt);
+ break;
+ }
+ }
+ return value;
+}
+
+static GValue*
+get_abitrate_value(gint val)
+{
+ GValue *value = NULL;
+ gint ii;
+
+ for (ii = 0; ii < hb_audio_bitrates_count; ii++)
+ {
+ if (hb_audio_bitrates[ii].rate == val)
+ {
+ value = ghb_string_value_new(hb_audio_bitrates[ii].string);
break;
}
}
return value;
}
-static setting_value_t*
+static GValue*
get_amix_value(gint val)
{
- setting_value_t *value = NULL;
+ GValue *value = NULL;
gint ii;
for (ii = 0; ii < hb_audio_mixdowns_count; ii++)
{
if (hb_audio_mixdowns[ii].amixdown == val)
{
- value = g_malloc(sizeof(setting_value_t));
- value->option = g_strdup(hb_audio_mixdowns[ii].human_readable_name);
- value->shortOpt = g_strdup(hb_audio_mixdowns[ii].short_name);
- value->svalue = g_strdup(hb_audio_mixdowns[ii].internal_name);
- value->index = ii;
- value->ivalue = hb_audio_mixdowns[ii].amixdown;
- value->dvalue = hb_audio_mixdowns[ii].amixdown;
+ value = ghb_string_value_new(hb_audio_mixdowns[ii].short_name);
break;
}
}
}
// Handle for libhb. Gets set by ghb_backend_init()
-static hb_handle_t * h = NULL;
+static hb_handle_t * h_scan = NULL;
+static hb_handle_t * h_queue = NULL;
extern void hb_get_tempory_directory(hb_handle_t *h, char path[512]);
{
char dir[512];
- hb_get_tempory_directory(h, dir);
+ hb_get_tempory_directory(h_scan, dir);
del_tree(dir, !partial);
}
+gint
+ghb_get_title_number(gint titleindex)
+{
+ hb_list_t * list;
+ hb_title_t * title;
+
+ if (h_scan == NULL) return 1;
+ list = hb_get_titles( h_scan );
+ if( !hb_list_count( list ) )
+ {
+ /* No valid title, stop right there */
+ return 1;
+ }
+ title = hb_list_item( list, titleindex );
+ if (title == NULL) return 1; // Bad titleindex
+ return title->index;
+}
+
static hb_audio_config_t*
get_hb_audio(gint titleindex, gint track)
{
hb_title_t * title;
hb_audio_config_t *audio = NULL;
- if (h == NULL) return NULL;
- list = hb_get_titles( h );
+ if (h_scan == NULL) return NULL;
+ list = hb_get_titles( h_scan );
if( !hb_list_count( list ) )
{
/* No valid title, stop right there */
gint container, track, titleindex, acodec;
gboolean httpopt;
hb_audio_config_t *audio = NULL;
+ GValue *gval;
widget = GHB_WIDGET (builder, "title");
- titleindex = ghb_widget_int(widget);
- widget = GHB_WIDGET (builder, "audio_track");
- track = ghb_widget_int(widget);
+ gval = ghb_widget_value(widget);
+ titleindex = ghb_lookup_combo_int("title", gval);
+ ghb_value_free(gval);
+ widget = GHB_WIDGET (builder, "AudioTrack");
+ gval = ghb_widget_value(widget);
+ track = ghb_lookup_combo_int("AudioTrack", gval);
+ ghb_value_free(gval);
audio = get_hb_audio(titleindex, track);
- widget = GHB_WIDGET (builder, "container");
- container = ghb_widget_int(widget);
- widget = GHB_WIDGET (builder, "http_optimize_mp4");
- httpopt = ghb_widget_int(widget);
-
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_FAAC, FALSE);
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_LAME, FALSE);
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_VORBIS, FALSE);
+ widget = GHB_WIDGET (builder, "FileFormat");
+ gval = ghb_widget_value(widget);
+ container = ghb_lookup_combo_int("FileFormat", gval);
+ ghb_value_free(gval);
+ widget = GHB_WIDGET (builder, "Mp4HttpOptimize");
+ httpopt = ghb_widget_boolean(widget);
+
+ grey_combo_box_item(builder, "x264_analyse", 3, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_FAAC, FALSE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_LAME, FALSE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_VORBIS, FALSE);
gboolean allow_ac3 = TRUE;
allow_ac3 =
if (allow_ac3)
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, FALSE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_AC3, FALSE);
}
else
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_AC3, TRUE);
}
if (audio && audio->in.codec != HB_ACODEC_AC3)
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_AC3, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_AC3, TRUE);
}
- grey_combo_box_item(builder, "video_codec", HB_VCODEC_THEORA, FALSE);
+ grey_combo_box_item(builder, "VideoEncoder", HB_VCODEC_THEORA, FALSE);
- widget = GHB_WIDGET (builder, "audio_codec");
- acodec = ghb_widget_int(widget);
+ widget = GHB_WIDGET (builder, "AudioEncoder");
+ gval = ghb_widget_value(widget);
+ acodec = ghb_lookup_combo_int("AudioEncoder", gval);
+ ghb_value_free(gval);
if (acodec != HB_ACODEC_AC3)
{
- grey_combo_box_item(builder, "audio_mix", 0, TRUE);
+ grey_combo_box_item(builder, "AudioMixdown", 0, TRUE);
}
if (container == HB_MUX_MP4)
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_LAME, TRUE);
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_VORBIS, TRUE);
- grey_combo_box_item(builder, "video_codec", HB_VCODEC_THEORA, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_LAME, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_VORBIS, TRUE);
+ grey_combo_box_item(builder, "VideoEncoder", HB_VCODEC_THEORA, TRUE);
}
else if (container == HB_MUX_AVI)
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_FAAC, TRUE);
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_VORBIS, TRUE);
- grey_combo_box_item(builder, "video_codec", HB_VCODEC_THEORA, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_FAAC, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_VORBIS, TRUE);
+ grey_combo_box_item(builder, "VideoEncoder", HB_VCODEC_THEORA, TRUE);
}
else if (container == HB_MUX_OGM)
{
- grey_combo_box_item(builder, "audio_codec", HB_ACODEC_FAAC, TRUE);
+ grey_combo_box_item(builder, "AudioEncoder", HB_ACODEC_FAAC, TRUE);
}
gboolean allow_mono = TRUE;
(layout == HB_INPUT_CH_LAYOUT_3F2R) &&
(audio->in.channel_layout & HB_INPUT_CH_LAYOUT_HAS_LFE);
}
- grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_MONO, !allow_mono);
- grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_STEREO, !allow_stereo);
- grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_DOLBY, !allow_dolby);
- grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_DOLBYPLII, !allow_dpl2);
- grey_combo_box_item(builder, "audio_mix", HB_AMIXDOWN_6CH, !allow_6ch);
+ grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_MONO, !allow_mono);
+ grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_STEREO, !allow_stereo);
+ grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_DOLBY, !allow_dolby);
+ grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_DOLBYPLII, !allow_dpl2);
+ grey_combo_box_item(builder, "AudioMixdown", HB_AMIXDOWN_6CH, !allow_6ch);
}
gint
G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING);
gtk_combo_box_set_model(combo, GTK_TREE_MODEL(store));
- gtk_cell_layout_clear(GTK_CELL_LAYOUT(combo));
- cell = GTK_CELL_RENDERER(gtk_cell_renderer_text_new());
- gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), cell, TRUE);
- gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), cell,
- "text", 0, "sensitive", 1, NULL);
-}
-
-static void
-audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rates, gint count)
-{
- GtkTreeIter iter;
- GtkListStore *store;
- gint ii;
-
- g_debug("audio_bitrate_opts_set ()\n");
- store = get_combo_box_store(builder, name);
- gtk_list_store_clear(store);
- for (ii = 0; ii < count; ii++)
+ if (GTK_WIDGET_TYPE(combo) == GTK_TYPE_COMBO_BOX)
{
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- 0, rates[ii].string,
- 1, TRUE,
- 2, rates[ii].string,
- 3, rates[ii].rate * 1000,
- 4, rates[ii].string,
- -1);
+ gtk_cell_layout_clear(GTK_CELL_LAYOUT(combo));
+ cell = GTK_CELL_RENDERER(gtk_cell_renderer_text_new());
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), cell, TRUE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), cell,
+ "text", 0, "sensitive", 1, NULL);
}
-}
-
-static gboolean
-audio_bitrate_opts_clean(GtkBuilder *builder, const gchar *name, hb_rate_t *rates, gint count)
-{
- GtkTreeIter iter;
- GtkListStore *store;
- gint ivalue;
- gboolean done = FALSE;
- gboolean changed = FALSE;
-
- g_debug("audio_bitrate_opts_clean ()\n");
- store = get_combo_box_store(builder, name);
- if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL(store), &iter))
- {
- do
- {
- gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 3, &ivalue, -1);
- if (search_rates(rates, ivalue/1000, count) < 0)
- {
- done = !gtk_list_store_remove(store, &iter);
- changed = TRUE;
- }
- else
- {
- done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
- }
- } while (!done);
+ else
+ { // Combo box entry
+ gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0);
}
- return changed;
-}
+}
static void
audio_samplerate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rates, gint count)
{
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- 0, language_table[ii].eng_name,
+ 0, ghb_language_table[ii].eng_name,
1, TRUE,
- 2, language_table[ii].iso639_2,
+ 2, ghb_language_table[ii].iso639_2,
3, ii,
- 4, language_table[ii].iso639_1,
+ 4, ghb_language_table[ii].iso639_1,
-1);
}
}
+static gchar **titles = NULL;
+
void
title_opts_set(GtkBuilder *builder, const gchar *name)
{
GtkTreeIter iter;
GtkListStore *store;
- hb_list_t * list;
- hb_title_t * title;
+ hb_list_t * list = NULL;
+ hb_title_t * title = NULL;
gint ii;
gint count = 0;
g_debug("title_opts_set ()\n");
store = get_combo_box_store(builder, name);
gtk_list_store_clear(store);
- if (h != NULL)
+ if (h_scan != NULL)
{
- list = hb_get_titles( h );
+ list = hb_get_titles( h_scan );
count = hb_list_count( list );
if (count > 100) count = 100;
}
+ if (titles) g_strfreev(titles);
+ if (title_opts.map) g_free(title_opts.map);
+ if (count > 0)
+ {
+ title_opts.count = count;
+ title_opts.map = g_malloc(count*sizeof(options_map_t));
+ titles = g_malloc((count+1) * sizeof(gchar*));
+ }
+ else
+ {
+ title_opts.count = 1;
+ title_opts.map = g_malloc(sizeof(options_map_t));
+ titles = NULL;
+ }
if( count <= 0 )
{
// No titles. Fill in a default.
3, -1,
4, "none",
-1);
+ title_opts.map[0].option = "No Titles";
+ title_opts.map[0].shortOpt = "none";
+ title_opts.map[0].ivalue = -1;
+ title_opts.map[0].svalue = "none";
return;
}
for (ii = 0; ii < count; ii++)
{
- gchar *option;
-
title = (hb_title_t*)hb_list_item(list, ii);
if (title->duration != 0)
{
- option = g_strdup_printf ("%d - %02dh%02dm%02ds",
+ titles[ii] = g_strdup_printf ("%d - %02dh%02dm%02ds",
title->index, title->hours, title->minutes, title->seconds);
}
else
{
- option = g_strdup_printf ("%d - Unknown Length", title->index);
+ titles[ii] = g_strdup_printf ("%d - Unknown Length", title->index);
}
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- 0, option,
+ 0, titles[ii],
1, TRUE,
- 2, option,
+ 2, titles[ii],
3, ii,
- 4, option,
+ 4, titles[ii],
-1);
+ title_opts.map[ii].option = titles[ii];
+ title_opts.map[ii].shortOpt = titles[ii];
+ title_opts.map[ii].ivalue = ii;
+ title_opts.map[ii].svalue = titles[ii];
}
+ titles[ii] = NULL;
}
static gboolean
return foundit;
}
-static gboolean
-audio_rate_opts_add(GtkBuilder *builder, const gchar *name, gint rate)
-{
- GtkTreeIter iter;
- GtkListStore *store;
- gchar *str;
-
- g_debug("audio_rate_opts_add ()\n");
- store = get_combo_box_store(builder, name);
- if (!find_combo_item_by_int(GTK_TREE_MODEL(store), rate, &iter))
- {
- str = g_strdup_printf ("%.8g", (gdouble)rate/1000.0);
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- 0, str,
- 1, TRUE,
- 2, str,
- 3, rate,
- 4, str,
- -1);
- return TRUE;
- }
- return FALSE;
-}
-
void
audio_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
{
GtkTreeIter iter;
GtkListStore *store;
- hb_list_t * list;
- hb_title_t * title;
+ hb_list_t * list = NULL;
+ hb_title_t * title = NULL;
hb_audio_config_t * audio;
gint ii;
gint count = 0;
g_debug("audio_track_opts_set ()\n");
store = get_combo_box_store(builder, name);
gtk_list_store_clear(store);
- if (h != NULL)
+ if (h_scan != NULL)
{
- list = hb_get_titles( h );
+ list = hb_get_titles( h_scan );
title = (hb_title_t*)hb_list_item( list, titleindex );
if (title != NULL)
{
}
}
if (count > 10) count = 10;
+ if (audio_track_opts.map) g_free(audio_track_opts.map);
+ if (count > 0)
+ {
+ audio_track_opts.count = count;
+ audio_track_opts.map = g_malloc(count*sizeof(options_map_t));
+ }
+ else
+ {
+ audio_track_opts.count = 1;
+ audio_track_opts.map = g_malloc(sizeof(options_map_t));
+ }
if( count <= 0 )
{
// No audio. set some default
3, -1,
4, "none",
-1);
+ audio_track_opts.map[0].option = "No Audio";
+ audio_track_opts.map[0].shortOpt = "none";
+ audio_track_opts.map[0].ivalue = -1;
+ audio_track_opts.map[0].svalue = "none";
return;
}
for (ii = 0; ii < count; ii++)
gtk_list_store_set(store, &iter,
0, audio->lang.description,
1, TRUE,
- 2, audio->lang.description,
+ 2, index_str[ii],
3, ii,
- 4, audio->lang.description,
+ 4, index_str[ii],
-1);
+ audio_track_opts.map[ii].option = audio->lang.description,
+ audio_track_opts.map[ii].shortOpt = index_str[ii];
+ audio_track_opts.map[ii].ivalue = ii;
+ audio_track_opts.map[ii].svalue = index_str[ii];
}
}
+
void
subtitle_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
{
GtkTreeIter iter;
GtkListStore *store;
- hb_list_t * list;
- hb_title_t * title;
+ hb_list_t * list = NULL;
+ hb_title_t * title = NULL;
hb_subtitle_t * subtitle;
gint ii;
gint count = 0;
- g_debug("subtitle_opts_set ()\n");
+ g_debug("subtitle_opts_set () %s\n", name);
store = get_combo_box_store(builder, name);
gtk_list_store_clear(store);
- if (h != NULL)
+ if (h_scan != NULL)
{
- list = hb_get_titles( h );
+ list = hb_get_titles( h_scan );
title = (hb_title_t*)hb_list_item( list, titleindex );
if (title != NULL)
{
}
}
if (count > 10) count = 10;
+ if (subtitle_opts.map) g_free(subtitle_opts.map);
+ if (count > 0)
+ {
+ subtitle_opts.count = count+2;
+ subtitle_opts.map = g_malloc((count+2)*sizeof(options_map_t));
+ }
+ else
+ {
+ subtitle_opts.count = LANG_TABLE_SIZE+2;
+ subtitle_opts.map = g_malloc((LANG_TABLE_SIZE+2)*sizeof(options_map_t));
+ }
// Add options for "none" and "autoselect"
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
3, -2,
4, "none",
-1);
+ subtitle_opts.map[0].option = "None";
+ subtitle_opts.map[0].shortOpt = "none";
+ subtitle_opts.map[0].ivalue = -2;
+ subtitle_opts.map[0].svalue = "none";
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- 0, "Same As Audio",
+ 0, "Autoselect",
1, TRUE,
2, "auto",
3, -1,
4, "auto",
-1);
- for (ii = 0; ii < count; ii++)
- {
- subtitle = (hb_subtitle_t *) hb_list_item( title->list_subtitle, ii );
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- 0, subtitle->lang,
- 1, TRUE,
- 2, subtitle->iso639_2,
- 3, ii,
- 4, subtitle->iso639_2,
- -1);
+ subtitle_opts.map[0].option = "Same as audio";
+ subtitle_opts.map[0].shortOpt = "auto";
+ subtitle_opts.map[0].ivalue = -1;
+ subtitle_opts.map[0].svalue = "auto";
+ if (count >0)
+ {
+ for (ii = 0; ii < count; ii++)
+ {
+ subtitle = (hb_subtitle_t *)hb_list_item(title->list_subtitle, ii);
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ 0, subtitle->lang,
+ 1, TRUE,
+ 2, subtitle->iso639_2,
+ 3, ii,
+ 4, subtitle->iso639_2,
+ -1);
+ subtitle_opts.map[ii+2].option = subtitle->lang;
+ subtitle_opts.map[ii+2].shortOpt = subtitle->iso639_2;
+ subtitle_opts.map[ii+2].ivalue = ii;
+ subtitle_opts.map[ii+2].svalue = subtitle->iso639_2;
+ }
}
- if (titleindex == -1)
+ else
{
for (ii = 0; ii < LANG_TABLE_SIZE; ii++)
{
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- 0, language_table[ii].eng_name,
+ 0, ghb_language_table[ii].eng_name,
1, TRUE,
- 2, language_table[ii].iso639_2,
+ 2, ghb_language_table[ii].iso639_2,
3, ii,
- 4, language_table[ii].iso639_2,
+ 4, ghb_language_table[ii].iso639_2,
-1);
+ subtitle_opts.map[ii+2].option = ghb_language_table[ii].eng_name;
+ subtitle_opts.map[ii+2].shortOpt = ghb_language_table[ii].iso639_2;
+ subtitle_opts.map[ii+2].ivalue = ii;
+ subtitle_opts.map[ii+2].svalue = ghb_language_table[ii].iso639_2;
}
}
}
gint titleindex = 0;
g_debug("ghb_longest_title ()\n");
- if (h == NULL) return 0;
- list = hb_get_titles( h );
+ if (h_scan == NULL) return 0;
+ list = hb_get_titles( h_scan );
count = hb_list_count( list );
if (count > 100) count = 100;
for (ii = 0; ii < count; ii++)
gint match = 0;
g_debug("find_audio_track ()\n");
- if (h != NULL)
+ if (h_scan != NULL)
{
- list = hb_get_titles( h );
+ list = hb_get_titles( h_scan );
title = (hb_title_t*)hb_list_item( list, titleindex );
if (title != NULL)
{
gint ii;
g_debug("generic_opts_set ()\n");
+ if (name == NULL || opts == NULL) return;
store = get_combo_box_store(builder, name);
gtk_list_store_clear(store);
for (ii = 0; ii < opts->count; ii++)
}
}
+combo_opts_t*
+find_combo_table(const gchar *name)
+{
+ gint ii;
+
+ for (ii = 0; combo_name_map[ii].name != NULL; ii++)
+ {
+ if (strcmp(name, combo_name_map[ii].name) == 0)
+ {
+ return combo_name_map[ii].opts;
+ }
+ }
+ return NULL;
+}
+
+gint
+ghb_lookup_combo_int(const gchar *name, const GValue *gval)
+{
+ if (strcmp(name, "AudioBitrate") == 0)
+ return lookup_audio_bitrate_int(gval);
+ else if (strcmp(name, "AudioSamplerate") == 0)
+ return lookup_audio_rate_int(gval);
+ else if (strcmp(name, "VideoFramerate") == 0)
+ return lookup_video_rate_int(gval);
+ else if (strcmp(name, "AudioMixdown") == 0)
+ return lookup_mix_int(gval);
+ else if (strcmp(name, "SourceAudioLang") == 0)
+ return lookup_audio_lang_int(gval);
+ else
+ {
+ return lookup_generic_int(find_combo_table(name), gval);
+ }
+ g_warning("ghb_lookup_combo_int() couldn't find %s", name);
+ return 0;
+}
+
+const gchar*
+ghb_lookup_combo_option(const gchar *name, const GValue *gval)
+{
+ if (strcmp(name, "AudioBitrate") == 0)
+ return lookup_audio_bitrate_option(gval);
+ else if (strcmp(name, "AudioSamplerate") == 0)
+ return lookup_audio_rate_option(gval);
+ else if (strcmp(name, "VideoFramerate") == 0)
+ return lookup_video_rate_option(gval);
+ else if (strcmp(name, "AudioMixdown") == 0)
+ return lookup_mix_option(gval);
+ else if (strcmp(name, "SourceAudioLang") == 0)
+ return lookup_audio_lang_option(gval);
+ else
+ {
+ return lookup_generic_option(find_combo_table(name), gval);
+ }
+ g_warning("ghb_lookup_combo_int() couldn't find %s", name);
+ return 0;
+}
+
void
ghb_update_ui_combo_box(GtkBuilder *builder, const gchar *name, gint user_data, gboolean all)
{
}
}
}
- if (all || strcmp(name, "audio_bitrate") == 0)
- audio_bitrate_opts_set(builder, "audio_bitrate", hb_audio_bitrates, hb_audio_bitrates_count);
- if (all || strcmp(name, "audio_rate") == 0)
- audio_samplerate_opts_set(builder, "audio_rate", hb_audio_rates, hb_audio_rates_count);
- if (all || strcmp(name, "framerate") == 0)
- video_rate_opts_set(builder, "framerate", hb_video_rates, hb_video_rates_count);
- if (all || strcmp(name, "audio_mix") == 0)
- mix_opts_set(builder, "audio_mix");
- if (all || strcmp(name, "source_audio_lang") == 0)
- language_opts_set(builder, "source_audio_lang");
- if (all || strcmp(name, "subtitle_lang") == 0)
- subtitle_opts_set(builder, "subtitle_lang", user_data);
- if (all || strcmp(name, "title") == 0)
+ if (all)
+ {
+ audio_bitrate_opts_set(builder, "AudioBitrate");
+ audio_samplerate_opts_set(builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count);
+ video_rate_opts_set(builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
+ mix_opts_set(builder, "AudioMixdown");
+ language_opts_set(builder, "SourceAudioLang");
+ subtitle_opts_set(builder, "Subtitles", user_data);
title_opts_set(builder, "title");
- if (all || strcmp(name, "audio_track") == 0)
- audio_track_opts_set(builder, "audio_track", user_data);
- if (all || strcmp(name, "container") == 0)
- generic_opts_set(builder, "container", &container_opts);
- if (all || strcmp(name, "deinterlace") == 0)
- generic_opts_set(builder, "deinterlace", &deint_opts);
- if (all || strcmp(name, "denoise") == 0)
- generic_opts_set(builder, "denoise", &denoise_opts);
- if (all || strcmp(name, "video_codec") == 0)
- generic_opts_set(builder, "video_codec", &vcodec_opts);
- if (all || strcmp(name, "audio_codec") == 0)
- generic_opts_set(builder, "audio_codec", &acodec_opts);
- if (all || strcmp(name, "x264_direct") == 0)
+ audio_track_opts_set(builder, "AudioTrack", user_data);
+ generic_opts_set(builder, "FileFormat", &container_opts);
+ generic_opts_set(builder, "PictureDeinterlace", &deint_opts);
+ generic_opts_set(builder, "tweak_PictureDeinterlace", &deint_opts);
+ generic_opts_set(builder, "PictureDenoise", &denoise_opts);
+ generic_opts_set(builder, "tweak_PictureDenoise", &denoise_opts);
+ generic_opts_set(builder, "VideoEncoder", &vcodec_opts);
+ generic_opts_set(builder, "AudioEncoder", &acodec_opts);
generic_opts_set(builder, "x264_direct", &direct_opts);
- if (all || strcmp(name, "x264_me") == 0)
generic_opts_set(builder, "x264_me", &me_opts);
- if (all || strcmp(name, "x264_subme") == 0)
generic_opts_set(builder, "x264_subme", &subme_opts);
- if (all || strcmp(name, "x264_analyse") == 0)
generic_opts_set(builder, "x264_analyse", &analyse_opts);
- if (all || strcmp(name, "x264_trellis") == 0)
generic_opts_set(builder, "x264_trellis", &trellis_opts);
+ }
+ else
+ {
+ if (strcmp(name, "AudioBitrate") == 0)
+ audio_bitrate_opts_set(builder, "AudioBitrate");
+ else if (strcmp(name, "AudioSamplerate") == 0)
+ audio_samplerate_opts_set(builder, "AudioSamplerate", hb_audio_rates, hb_audio_rates_count);
+ else if (strcmp(name, "VideoFramerate") == 0)
+ video_rate_opts_set(builder, "VideoFramerate", hb_video_rates, hb_video_rates_count);
+ else if (strcmp(name, "AudioMixdown") == 0)
+ mix_opts_set(builder, "AudioMixdown");
+ else if (strcmp(name, "SourceAudioLang") == 0)
+ language_opts_set(builder, "SourceAudioLang");
+ else if (strcmp(name, "Subtitles") == 0)
+ subtitle_opts_set(builder, "Subtitles", user_data);
+ else if (strcmp(name, "title") == 0)
+ title_opts_set(builder, "title");
+ else if (strcmp(name, "AudioTrack") == 0)
+ audio_track_opts_set(builder, "AudioTrack", user_data);
+ else
+ generic_opts_set(builder, name, find_combo_table(name));
+ }
if (handler_id > 0)
{
g_signal_handler_unblock ((gpointer)combo, handler_id);
static void
init_ui_combo_boxes(GtkBuilder *builder)
{
- init_combo_box(builder, "audio_bitrate");
- init_combo_box(builder, "audio_rate");
- init_combo_box(builder, "framerate");
- init_combo_box(builder, "audio_mix");
- init_combo_box(builder, "source_audio_lang");
- init_combo_box(builder, "subtitle_lang");
+ gint ii;
+
+ init_combo_box(builder, "AudioBitrate");
+ init_combo_box(builder, "AudioSamplerate");
+ init_combo_box(builder, "VideoFramerate");
+ init_combo_box(builder, "AudioMixdown");
+ init_combo_box(builder, "SourceAudioLang");
+ init_combo_box(builder, "Subtitles");
init_combo_box(builder, "title");
- init_combo_box(builder, "audio_track");
- init_combo_box(builder, "container");
- init_combo_box(builder, "deinterlace");
- init_combo_box(builder, "denoise");
- init_combo_box(builder, "video_codec");
- init_combo_box(builder, "audio_codec");
- init_combo_box(builder, "x264_direct");
- init_combo_box(builder, "x264_me");
- init_combo_box(builder, "x264_subme");
- init_combo_box(builder, "x264_analyse");
- init_combo_box(builder, "x264_trellis");
+ init_combo_box(builder, "AudioTrack");
+ for (ii = 0; combo_name_map[ii].name != NULL; ii++)
+ {
+ init_combo_box(builder, combo_name_map[ii].name);
+ }
}
static const char * turbo_opts =
// Construct the x264 options string
// The result is allocated, so someone must free it at some point.
gchar*
-ghb_build_x264opts_string(GHashTable *settings)
+ghb_build_x264opts_string(GValue *settings)
{
gchar *result;
- const gchar *opts = ghb_settings_get_string(settings, "x264_options");
+ gchar *opts = ghb_settings_get_string(settings, "x264Option");
if (opts != NULL)
{
- result = g_strdup(opts);
+ result = opts;
}
else
{
return result;
}
-gchar **
+GValue*
ghb_get_chapters(gint titleindex)
{
hb_list_t * list;
hb_title_t * title;
hb_chapter_t * chapter;
gint count, ii;
- gchar **result = NULL;
+ GValue *chapters = NULL;
g_debug("ghb_get_chapters (title = %d)\n", titleindex);
- if (h == NULL) return NULL;
- list = hb_get_titles( h );
+ if (h_scan == NULL) return NULL;
+ list = hb_get_titles( h_scan );
title = (hb_title_t*)hb_list_item( list, titleindex );
if (title == NULL) return NULL;
count = hb_list_count( title->list_chapter );
- result = g_malloc((count+1) * sizeof(gchar*));
+ chapters = ghb_array_value_new(count);
for (ii = 0; ii < count; ii++)
{
chapter = hb_list_item(title->list_chapter, ii);
if (chapter == NULL) break;
if (chapter->title == NULL || chapter->title[0] == 0)
- result[ii] = g_strdup_printf ("Chapter %2d", ii);
+ {
+ gchar *str;
+ str = g_strdup_printf ("Chapter %2d", ii+1);
+ ghb_array_append(chapters, ghb_string_value_new(str));
+ g_free(str);
+ }
else
- result[ii] = g_strdup(chapter->title);
+ {
+ ghb_array_append(chapters, ghb_string_value_new(chapter->title));
+ }
}
- result[ii] = NULL;
- return result;
+ return chapters;
}
gboolean
-ghb_ac3_in_audio_list(GSList *audio_list)
+ghb_ac3_in_audio_list(const GValue *audio_list)
{
- GSList *link;
+ gint count, ii;
- link = audio_list;
- while (link != NULL)
+ count = ghb_array_len(audio_list);
+ for (ii = 0; ii < count; ii++)
{
- GHashTable *asettings;
+ GValue *asettings;
gint acodec;
- asettings = (GHashTable*)link->data;
- acodec = ghb_settings_get_int(asettings, "audio_codec");
+ asettings = ghb_array_get_nth(audio_list, ii);
+ acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
if (acodec == HB_ACODEC_AC3)
return TRUE;
- link = link->next;
}
return FALSE;
}
-gboolean
-ghb_set_passthru_rate_opts(GtkBuilder *builder, gint bitrate)
+static void
+audio_bitrate_opts_add(GtkBuilder *builder, const gchar *name, gint rate)
+{
+ GtkTreeIter iter;
+ GtkListStore *store;
+ gchar *str;
+
+ g_debug("audio_rate_opts_add ()\n");
+ store = get_combo_box_store(builder, name);
+ if (!find_combo_item_by_int(GTK_TREE_MODEL(store), rate, &iter))
+ {
+ str = g_strdup_printf ("%d", rate);
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ 0, str,
+ 1, TRUE,
+ 2, str,
+ 3, rate,
+ 4, str,
+ -1);
+ g_free(str);
+ }
+}
+
+static void
+audio_bitrate_opts_clean(GtkBuilder *builder, const gchar *name, gint last_rate)
{
- gboolean changed = FALSE;
- changed = audio_rate_opts_add(builder, "audio_bitrate", bitrate);
- return changed;
+ GtkTreeIter iter;
+ GtkListStore *store;
+ gint ivalue;
+ gboolean done = FALSE;
+ gint ii = 0;
+ guint last = (guint)last_rate;
+
+ g_debug("audio_bitrate_opts_clean ()\n");
+ store = get_combo_box_store(builder, name);
+ if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL(store), &iter))
+ {
+ do
+ {
+ gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 3, &ivalue, -1);
+ if (search_rates(
+ hb_audio_bitrates, ivalue, hb_audio_bitrates_count) < 0)
+ {
+ done = !gtk_list_store_remove(store, &iter);
+ }
+ else if (ivalue > last)
+ {
+ ii++;
+ gtk_list_store_set(store, &iter, 1, FALSE, -1);
+ done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
+ }
+ else
+ {
+ ii++;
+ gtk_list_store_set(store, &iter, 1, TRUE, -1);
+ done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
+ }
+ } while (!done);
+ }
}
-gboolean
-ghb_set_default_rate_opts(GtkBuilder *builder)
+static void
+audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name)
+{
+ GtkTreeIter iter;
+ GtkListStore *store;
+ gint ii;
+
+ g_debug("audio_bitrate_opts_set ()\n");
+ store = get_combo_box_store(builder, name);
+ gtk_list_store_clear(store);
+ for (ii = 0; ii < hb_audio_bitrates_count; ii++)
+ {
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ 0, hb_audio_bitrates[ii].string,
+ 1, TRUE,
+ 2, hb_audio_bitrates[ii].string,
+ 3, hb_audio_bitrates[ii].rate,
+ 4, hb_audio_bitrates[ii].string,
+ -1);
+ }
+}
+
+void
+ghb_set_passthru_bitrate_opts(GtkBuilder *builder, gint bitrate)
{
- gboolean changed = FALSE;
- changed = audio_bitrate_opts_clean(builder, "audio_bitrate", hb_audio_bitrates, hb_audio_bitrates_count);
- return changed;
+ audio_bitrate_opts_add(builder, "AudioBitrate", bitrate);
+}
+
+void
+ghb_set_default_bitrate_opts(GtkBuilder *builder, gint last_rate)
+{
+ audio_bitrate_opts_clean(builder, "AudioBitrate", last_rate);
}
static ghb_status_t hb_status;
ghb_backend_init(GtkBuilder *builder, gint debug, gint update)
{
/* Init libhb */
- h = hb_init( debug, update );
+ h_scan = hb_init( debug, update );
+ h_queue = hb_init( debug, 0 );
// Set up the list model for the combos
init_ui_combo_boxes(builder);
// Populate all the combos
}
void
+ghb_backend_close()
+{
+ hb_close(&h_queue);
+ hb_close(&h_scan);
+}
+
+void
ghb_backend_scan(const gchar *path, gint titleindex)
{
- hb_scan( h, path, titleindex );
+ hb_scan( h_scan, path, titleindex );
hb_status.state |= GHB_STATE_SCANNING;
// initialize count and cur to something that won't cause FPE
// when computing progress
hb_status.title_cur = 0;
}
+void
+ghb_backend_queue_scan(const gchar *path, gint titlenum)
+{
+ g_debug("ghb_backend_queue_scan()");
+ hb_scan( h_queue, path, titlenum );
+ hb_status.queue_state |= GHB_STATE_SCANNING;
+}
+
gint
ghb_get_state()
{
return hb_status.state;
}
+gint
+ghb_get_queue_state()
+{
+ return hb_status.queue_state;
+}
+
void
ghb_clear_state(gint state)
{
}
void
+ghb_clear_queue_state(gint state)
+{
+ hb_status.queue_state &= ~state;
+}
+
+void
ghb_set_state(gint state)
{
hb_status.state |= state;
}
void
+ghb_set_queue_state(gint state)
+{
+ hb_status.queue_state |= state;
+}
+
+void
ghb_get_status(ghb_status_t *status)
{
memcpy(status, &hb_status, sizeof(ghb_status_t));
ghb_track_status()
{
hb_state_t s;
- static gint scan_complete_count = 0;
- gint scans;
+ hb_state_t s_queue;
- if (h == NULL) return;
- hb_get_state( h, &s );
- scans = hb_get_scancount(h);
- if (scans > scan_complete_count)
- {
- hb_status.state &= ~GHB_STATE_SCANNING;
- hb_status.state |= GHB_STATE_SCANDONE;
- scan_complete_count = hb_get_scancount(h);
- }
+ if (h_scan == NULL) return;
+ hb_get_state( h_scan, &s );
switch( s.state )
{
- case HB_STATE_IDLE:
- /* Nothing to do */
- break;
-
#define p s.param.scanning
case HB_STATE_SCANNING:
{
hb_status.state |= GHB_STATE_SCANDONE;
} break;
-#define p s.param.working
+ }
+ hb_get_state( h_queue, &s_queue );
+ switch( s_queue.state )
+ {
+ case HB_STATE_SCANNING:
+ {
+ hb_status.queue_state |= GHB_STATE_SCANNING;
+ } break;
+
+ case HB_STATE_SCANDONE:
+ {
+ hb_status.queue_state &= ~GHB_STATE_SCANNING;
+ hb_status.queue_state |= GHB_STATE_SCANDONE;
+ } break;
+
+#define p s_queue.param.working
case HB_STATE_WORKING:
- hb_status.state |= GHB_STATE_WORKING;
- hb_status.state &= ~GHB_STATE_PAUSED;
+ hb_status.queue_state |= GHB_STATE_WORKING;
+ hb_status.queue_state &= ~GHB_STATE_PAUSED;
hb_status.job_cur = p.job_cur;
hb_status.job_count = p.job_count;
hb_status.progress = p.progress;
#undef p
case HB_STATE_PAUSED:
- hb_status.state |= GHB_STATE_PAUSED;
+ hb_status.queue_state |= GHB_STATE_PAUSED;
break;
-#define p s.param.muxing
case HB_STATE_MUXING:
{
- hb_status.state |= GHB_STATE_MUXING;
+ hb_status.queue_state |= GHB_STATE_MUXING;
} break;
-#undef p
-#define p s.param.workdone
+#define p s_queue.param.workdone
case HB_STATE_WORKDONE:
{
hb_job_t *job;
- hb_status.state |= GHB_STATE_WORKDONE;
- hb_status.state &= ~GHB_STATE_MUXING;
- hb_status.state &= ~GHB_STATE_PAUSED;
- hb_status.state &= ~GHB_STATE_WORKING;
+ hb_status.queue_state |= GHB_STATE_WORKDONE;
+ hb_status.queue_state &= ~GHB_STATE_MUXING;
+ hb_status.queue_state &= ~GHB_STATE_PAUSED;
+ hb_status.queue_state &= ~GHB_STATE_WORKING;
switch (p.error)
{
case HB_ERROR_NONE:
// When a job is stopped, libhb removes it from the job list,
// but does not remove other jobs that may be associated with it.
// Associated jobs are taged in the sequence id.
- while (((job = hb_job(h, 0)) != NULL) && ((job->sequence_id >> 24) != 0) )
- hb_rem( h, job );
+ while ((job = hb_job(h_queue, 0)) != NULL)
+ hb_rem( h_queue, job );
} break;
#undef p
}
hb_list_t * list;
hb_title_t * title;
- if (h == NULL) return FALSE;
- list = hb_get_titles( h );
+ if (h_scan == NULL) return FALSE;
+ list = hb_get_titles( h_scan );
if( !hb_list_count( list ) )
{
/* No valid title, stop right there */
hb_list_t * list;
hb_title_t * title;
hb_job_t * job;
- GHashTable *settings = ud->settings;
gboolean keep_aspect, round_dims, anamorphic;
gboolean autocrop, autoscale, noscale;
gint crop[4], width, height, par_width, par_height;
g_debug("ghb_set_scale ()\n");
- if (h == NULL) return;
- list = hb_get_titles( h );
+ if (h_scan == NULL) return;
+ list = hb_get_titles( h_scan );
if( !hb_list_count( list ) )
{
/* No valid title, stop right there */
return;
}
- gint titleindex = ghb_settings_get_index(settings, "title");
+ gint titleindex;
+
+ titleindex = ghb_settings_combo_int(ud->settings, "title");
title = hb_list_item( list, titleindex );
if (title == NULL) return;
job = title->job;
if (job == NULL) return;
// First configure widgets
- round_dims = ghb_settings_get_bool(ud->settings, "round_dimensions");
- anamorphic = ghb_settings_get_bool(ud->settings, "anamorphic");
- keep_aspect = ghb_settings_get_bool(ud->settings, "keep_aspect");
- autocrop = ghb_settings_get_bool(ud->settings, "autocrop");
- autoscale = ghb_settings_get_bool(ud->settings, "autoscale");
+ round_dims = ghb_settings_get_boolean(ud->settings, "ModDimensions");
+ anamorphic = ghb_settings_get_boolean(ud->settings, "anamorphic");
+ keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
+ autocrop = ghb_settings_get_boolean(ud->settings, "PictureAutoCrop");
+ autoscale = ghb_settings_get_boolean(ud->settings, "autoscale");
// "Noscale" is a flag that says we prefer to crop extra to satisfy
// alignment constraints rather than scaling to satisfy them.
- noscale = ghb_settings_get_bool(ud->settings, "noscale");
+ noscale = ghb_settings_get_boolean(ud->settings, "noscale");
// Align dimensions to either 16 or 2 pixels
// The scaler crashes if the dimensions are not divisible by 2
// x264 also will not accept dims that are not multiple of 2
crop[2] += need1;
crop[3] += need2;
}
- ghb_ui_update_int (ud, "crop_top", crop[0]);
- ghb_ui_update_int (ud, "crop_bottom", crop[1]);
- ghb_ui_update_int (ud, "crop_left", crop[2]);
- ghb_ui_update_int (ud, "crop_right", crop[3]);
+ ghb_ui_update(ud, "PictureTopCrop", ghb_int64_value(crop[0]));
+ ghb_ui_update(ud, "PictureBottomCrop", ghb_int64_value(crop[1]));
+ ghb_ui_update(ud, "PictureLeftCrop", ghb_int64_value(crop[2]));
+ ghb_ui_update(ud, "PictureRightCrop", ghb_int64_value(crop[3]));
}
}
- crop[0] = ghb_settings_get_int(ud->settings, "crop_top");
- crop[1] = ghb_settings_get_int(ud->settings, "crop_bottom");
- crop[2] = ghb_settings_get_int(ud->settings, "crop_left");
- crop[3] = ghb_settings_get_int(ud->settings, "crop_right");
+ crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+ crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+ crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+ crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
hb_reduce(&aspect_n, &aspect_d,
title->width * title->pixel_aspect_width,
title->height * title->pixel_aspect_height);
{
width = ghb_settings_get_int(ud->settings, "scale_width");
height = ghb_settings_get_int(ud->settings, "scale_height");
- max_width = ghb_settings_get_int(ud->settings, "max_width");
- max_height = ghb_settings_get_int(ud->settings, "max_width");
+ max_width = ghb_settings_get_int(ud->settings, "PictureWidth");
+ max_height = ghb_settings_get_int(ud->settings, "PictureHeight");
// Align max dims
max_width = (max_width >> modshift) << modshift;
max_height = (max_height >> modshift) << modshift;
job->maxHeight = max_height;
job->crop[0] = crop[0]; job->crop[1] = crop[1];
job->crop[2] = crop[2]; job->crop[3] = crop[3];
- hb_set_anamorphic_size( job, &width, &height, &par_width, &par_height );
+ hb_set_anamorphic_size( job, &width, &height,
+ &par_width, &par_height );
}
else
{
width = ((width + modround) >> modshift) << modshift;
height = ((height + modround) >> modshift) << modshift;
}
- ghb_ui_update_int (ud, "scale_width", width);
- ghb_ui_update_int (ud, "scale_height", height);
+ ghb_ui_update(ud, "scale_width", ghb_int64_value(width));
+ ghb_ui_update(ud, "scale_height", ghb_int64_value(height));
}
static void
-set_preview_job_settings(hb_job_t *job, GHashTable *settings)
+set_preview_job_settings(hb_job_t *job, GValue *settings)
{
- job->crop[0] = ghb_settings_get_int(settings, "crop_top");
- job->crop[1] = ghb_settings_get_int(settings, "crop_bottom");
- job->crop[2] = ghb_settings_get_int(settings, "crop_left");
- job->crop[3] = ghb_settings_get_int(settings, "crop_right");
+ job->crop[0] = ghb_settings_get_int(settings, "PictureTopCrop");
+ job->crop[1] = ghb_settings_get_int(settings, "PictureBottomCrop");
+ job->crop[2] = ghb_settings_get_int(settings, "PictureLeftCrop");
+ job->crop[3] = ghb_settings_get_int(settings, "PictureRightCrop");
- gboolean anamorphic = ghb_settings_get_bool(settings, "anamorphic");
- gboolean round_dimensions = ghb_settings_get_bool(settings, "round_dimensions");
+ gboolean anamorphic, round_dimensions;
+ anamorphic = ghb_settings_get_boolean(settings, "anamorphic");
+ round_dimensions = ghb_settings_get_boolean(settings, "ModDimensions");
if (round_dimensions && anamorphic)
{
job->modulus = 16;
}
job->width = ghb_settings_get_int(settings, "scale_width");
job->height = ghb_settings_get_int(settings, "scale_height");
- gint deint = ghb_settings_get_int(settings, "deinterlace");
- gboolean decomb = ghb_settings_get_bool(settings, "decomb");
+ gint deint = ghb_settings_combo_int(settings, "PictureDeinterlace");
+ gboolean decomb = ghb_settings_get_boolean(settings, "PictureDecomb");
job->deinterlace = (!decomb && deint == 0) ? 0 : 1;
}
gint
-ghb_calculate_target_bitrate(GHashTable *settings, gint titleindex)
+ghb_calculate_target_bitrate(GValue *settings, gint titleindex)
{
hb_list_t * list;
hb_title_t * title;
hb_job_t * job;
gint size;
- if (h == NULL) return 2000;
- list = hb_get_titles( h );
+ if (h_scan == NULL) return 1500;
+ list = hb_get_titles( h_scan );
title = hb_list_item( list, titleindex );
- if (title == NULL) return 2000;
+ if (title == NULL) return 1500;
job = title->job;
- if (job == NULL) return 2000;
- size = ghb_settings_get_int(settings, "video_target_size");
+ if (job == NULL) return 1500;
+ size = ghb_settings_get_int(settings, "VideoTargetSize");
return hb_calc_bitrate( job, size );
}
-gint
-ghb_guess_bitrate(GHashTable *settings)
-{
- gint bitrate;
- if (ghb_settings_get_bool(settings, "vquality_type_constant"))
- {
- // This is really rough. I'm trying to err on the high
- // side since this is used to estimate if there is
- // sufficient disk space left
- gint vcodec = ghb_settings_get_int(settings, "video_codec");
- gdouble vquality = ghb_settings_get_dbl(settings, "video_quality")/100;
- if (vcodec == HB_VCODEC_X264 &&
- !ghb_settings_get_bool(settings, "linear_vquality"))
- {
- vquality = 51.0 - vquality * 51.0;
- // Convert log curve to linear
- vquality = exp2((vquality-12)/6);
- // Don't let it go to 0
- if (vquality >= 31) vquality = 30;
- vquality = (31 - vquality) / 31;
- }
- // bitrate seems to be a log relasionship to quality
- // with typical source material
- // This is a real wag
- bitrate = 20*1024*1024*exp10(vquality*14)/exp10(14);
- // Add some bits for audio
- bitrate += 500*1024;
- }
- else
- {
- // Add some fudge to the bitrate to leave breathing room
- bitrate = ghb_settings_get_int(settings, "video_bitrate")*1024;
- // Add some bits for audio
- bitrate += 500*1024;
- }
- return bitrate;
-}
-
gboolean
ghb_validate_filter_string(const gchar *str, gint max_fields)
{
gint fields = 0;
- gboolean in_field = FALSE;
+ gchar *end;
+ gdouble val;
+
if (str == NULL || *str == 0) return TRUE;
while (*str)
{
- if (*str >= '0' && *str <= '9')
- {
- if (!in_field)
- {
- fields++;
- // negative max_fields means infinate
- if (max_fields >= 0 && fields > max_fields) return FALSE;
- in_field = TRUE;
- }
+ val = g_strtod(str, &end);
+ if (str != end)
+ { // Found a numeric value
+ fields++;
+ // negative max_fields means infinate
+ if (max_fields >= 0 && fields > max_fields) return FALSE;
+ if (*end == 0)
+ return TRUE;
+ if (*end != ':')
+ return FALSE;
+ str = end + 1;
}
- else if (!in_field) return FALSE;
- else if (*str != ':') return FALSE;
- else in_field = FALSE;
- str++;
+ else
+ return FALSE;
}
- return TRUE;
+ return FALSE;
}
gboolean
ghb_validate_filters(signal_user_data_t *ud)
{
gboolean tweaks;
- const gchar *str;
+ gchar *str;
+ gint index;
gchar *message;
gboolean enabled;
- tweaks = ghb_settings_get_bool(ud->settings, "allow_tweaks");
+ tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
if (tweaks)
{
// detele 6
- str = ghb_settings_get_string(ud->settings, "tweak_detelecine");
- enabled = ghb_settings_get_bool(ud->settings, "detelecine");
+ str = ghb_settings_get_string(ud->settings, "tweak_PictureDetelecine");
+ enabled = ghb_settings_get_boolean(ud->settings, "PictureDetelecine");
if (enabled && !ghb_validate_filter_string(str, 6))
{
message = g_strdup_printf(
"Invalid Detelecine Settings:\n\n%s\n",
str);
ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ g_free(str);
g_free(message);
return FALSE;
}
+ g_free(str);
// decomb 7
- str = ghb_settings_get_string(ud->settings, "tweak_decomb");
- enabled = ghb_settings_get_bool(ud->settings, "decomb");
+ str = ghb_settings_get_string(ud->settings, "tweak_PictureDecomb");
+ enabled = ghb_settings_get_boolean(ud->settings, "PictureDecomb");
if (enabled && !ghb_validate_filter_string(str, 7))
{
message = g_strdup_printf(
"Invalid Decomb Settings:\n\n%s\n",
str);
ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ g_free(str);
g_free(message);
return FALSE;
}
+ g_free(str);
// deinte 4
- str = ghb_settings_get_string(ud->settings, "tweak_deinterlace");
- enabled = ghb_settings_get_bool(ud->settings, "deinterlace");
- if (enabled && !ghb_validate_filter_string(str, 4))
- {
- message = g_strdup_printf(
- "Invalid Deinterlace Settings:\n\n%s\n",
- str);
- ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
- g_free(message);
- return FALSE;
- }
- // debloc 2
- str = ghb_settings_get_string(ud->settings, "tweak_deblock");
- enabled = ghb_settings_get_bool(ud->settings, "deblock");
- if (enabled && !ghb_validate_filter_string(str, 2))
+ index = ghb_lookup_combo_int("tweak_PictureDeinterlace",
+ ghb_settings_get_value(ud->settings, "tweak_PictureDeinterlace"));
+ if (index < 0)
{
- message = g_strdup_printf(
- "Invalid Deblock Settings:\n\n%s\n",
- str);
- ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
- g_free(message);
- return FALSE;
+ str = ghb_settings_get_string(ud->settings, "tweak_PictureDeinterlace");
+ if (!ghb_validate_filter_string(str, 4))
+ {
+ message = g_strdup_printf(
+ "Invalid Deinterlace Settings:\n\n%s\n",
+ str);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ g_free(message);
+ g_free(str);
+ return FALSE;
+ }
+ g_free(str);
}
// denois 4
- str = ghb_settings_get_string(ud->settings, "tweak_denoise");
- enabled = ghb_settings_get_bool(ud->settings, "denoise");
- if (enabled && !ghb_validate_filter_string(str, 4))
+ index = ghb_lookup_combo_int("tweak_PictureDenoise",
+ ghb_settings_get_value(ud->settings, "tweak_PictureDenoise"));
+ if (index < 0)
{
- message = g_strdup_printf(
- "Invalid Denoise Settings:\n\n%s\n",
- str);
- ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
- g_free(message);
- return FALSE;
+ str = ghb_settings_get_string(ud->settings, "tweak_PictureDenoise");
+ if (!ghb_validate_filter_string(str, 4))
+ {
+ message = g_strdup_printf(
+ "Invalid Denoise Settings:\n\n%s\n",
+ str);
+ ghb_message_dialog(GTK_MESSAGE_ERROR, message, "Cancel", NULL);
+ g_free(str);
+ g_free(message);
+ return FALSE;
+ }
+ g_free(str);
}
}
return TRUE;
gboolean
ghb_validate_video(signal_user_data_t *ud)
{
- GHashTable *settings = ud->settings;
gint vcodec, mux;
gchar *message;
- mux = ghb_settings_get_int(settings, "container");
- vcodec = ghb_settings_get_int(settings, "video_codec");
+ mux = ghb_settings_combo_int(ud->settings, "FileFormat");
+ vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
if ((mux == HB_MUX_MP4 || mux == HB_MUX_AVI) &&
(vcodec == HB_VCODEC_THEORA))
{
}
g_free(message);
vcodec = HB_VCODEC_XVID;
- ghb_ui_update_int(ud, "video_codec", vcodec);
- }
- gboolean decomb = ghb_settings_get_bool(settings, "decomb");
- gboolean vfr = ghb_settings_get_bool(settings, "variable_frame_rate");
- if (decomb && !vfr)
- {
- message = g_strdup_printf(
- "Decomb is intended to be used in conjunction\n"
- "with variable frame rate.\n\n"
- "Would you like me to enable VFR for you?");
- if (ghb_message_dialog(GTK_MESSAGE_WARNING, message, "No", "Yes"))
- {
- ghb_ui_update_int(ud, "variable_frame_rate", TRUE);
- }
- g_free(message);
+ ghb_ui_update(ud, "VideoEncoder", ghb_int64_value(vcodec));
}
return TRUE;
}
gint container;
gchar *message;
- container = ghb_settings_get_bool(ud->settings, "container");
+ container = ghb_settings_combo_int(ud->settings, "FileFormat");
if (container == HB_MUX_MP4)
{
+ const GValue *audio_list;
gboolean httpopt;
- httpopt = ghb_settings_get_bool(ud->settings, "http_optimize_mp4");
- if (httpopt && ghb_ac3_in_audio_list(ud->audio_settings))
+
+ audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+ httpopt = ghb_settings_get_boolean(ud->settings, "Mp4HttpOptimize");
+ if (httpopt && ghb_ac3_in_audio_list(audio_list))
{
message = g_strdup_printf(
"AC3 audio in HTTP optimized MP4 is not supported.\n\n"
return FALSE;
}
g_free(message);
- GSList *link = ud->audio_settings;
- while (link != NULL)
+
+ gint count, ii;
+
+ count = ghb_array_len(audio_list);
+ for (ii = 0; ii < count; ii++)
{
- GHashTable *asettings;
- asettings = (GHashTable*)link->data;
- gint acodec = ghb_settings_get_int(asettings, "audio_codec");
+ GValue *asettings;
+
+ asettings = ghb_array_get_nth(audio_list, ii);
+ gint acodec = ghb_settings_combo_int(asettings, "AudioEncoder");
if (acodec == HB_ACODEC_AC3)
{
- setting_value_t *value;
+ GValue *value;
value = get_acodec_value(HB_ACODEC_FAAC);
- ghb_settings_set(asettings, "audio_codec", value);
+ ghb_settings_take_value(asettings, "AudioEncoder", value);
+ value = get_abitrate_value(160);
+ ghb_settings_take_value(asettings, "AudioBitrate", value);
}
- link = link->next;
}
}
}
{
hb_list_t * list;
hb_title_t * title;
- GHashTable *settings = ud->settings;
gchar *message;
- setting_value_t *value;
+ GValue *value;
- if (h == NULL) return FALSE;
- list = hb_get_titles( h );
+ if (h_scan == NULL) return FALSE;
+ list = hb_get_titles( h_scan );
if( !hb_list_count( list ) )
{
/* No valid title, stop right there */
return FALSE;
}
- gint titleindex = ghb_settings_get_index(settings, "title");
+ gint titleindex;
+
+ titleindex = ghb_settings_combo_int(ud->settings, "title");
title = hb_list_item( list, titleindex );
if (title == NULL) return FALSE;
- GSList *link = ud->audio_settings;
- gint mux = ghb_settings_get_int(settings, "container");
- while (link != NULL)
+ gint mux = ghb_settings_combo_int(ud->settings, "FileFormat");
+
+ const GValue *audio_list;
+ gint count, ii;
+
+ audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+ count = ghb_array_len(audio_list);
+ for (ii = 0; ii < count; ii++)
{
- GHashTable *asettings;
+ GValue *asettings;
hb_audio_config_t *taudio;
- asettings = (GHashTable*)link->data;
- gint track = ghb_settings_get_index(asettings, "audio_track");
- gint codec = ghb_settings_get_int(asettings, "audio_codec");
- taudio = (hb_audio_config_t *) hb_list_audio_config_item( title->list_audio, track );
+ asettings = ghb_array_get_nth(audio_list, ii);
+ gint track = ghb_settings_combo_int(asettings, "AudioTrack");
+ gint codec = ghb_settings_combo_int(asettings, "AudioEncoder");
+ taudio = (hb_audio_config_t *) hb_list_audio_config_item(
+ title->list_audio, track );
if ((taudio->in.codec != HB_ACODEC_AC3) && (codec == HB_ACODEC_AC3))
{
// Not supported. AC3 is passthrough only, so input must be AC3
codec = HB_ACODEC_FAAC;
}
value = get_acodec_value(codec);
- ghb_settings_set(asettings, "audio_codec", value);
+ ghb_settings_take_value(asettings, "AudioEncoder", value);
}
gchar *a_unsup = NULL;
gchar *mux_s = NULL;
}
g_free(message);
value = get_acodec_value(codec);
- ghb_settings_set(asettings, "audio_codec", value);
+ ghb_settings_take_value(asettings, "AudioEncoder", value);
}
- gint mix = ghb_settings_get_int (asettings, "audio_mix");
+ gint mix = ghb_settings_combo_int (asettings, "AudioMixdown");
gboolean allow_mono = TRUE;
gboolean allow_stereo = TRUE;
gboolean allow_dolby = TRUE;
g_free(message);
mix = ghb_get_best_mix(titleindex, track, codec, mix);
value = get_amix_value(mix);
- ghb_settings_set(asettings, "audio_mix", value);
+ ghb_settings_take_value(asettings, "AudioMixdown", value);
}
- link = link->next;
}
return TRUE;
}
gboolean
-ghb_validate_vquality(GHashTable *settings)
+ghb_validate_vquality(GValue *settings)
{
gint vcodec;
gchar *message;
gint min, max;
- if (ghb_settings_get_bool(settings, "nocheckvquality")) return TRUE;
- vcodec = ghb_settings_get_int(settings, "video_codec");
- if (ghb_settings_get_bool(settings, "vquality_type_constant"))
+ if (ghb_settings_get_boolean(settings, "nocheckvquality")) return TRUE;
+ vcodec = ghb_settings_combo_int(settings, "VideoEncoder");
+ gdouble vquality;
+ vquality = ghb_settings_get_double(settings, "VideoQualitySlider");
+ if (ghb_settings_get_boolean(settings, "vquality_type_constant"))
{
- if (!ghb_settings_get_bool(settings, "directqp"))
+ if (!ghb_settings_get_boolean(settings, "directqp"))
{
- if (vcodec != HB_VCODEC_X264 ||
- ghb_settings_get_bool(settings, "linear_vquality"))
+ vquality *= 100.0;
+ if (vcodec != HB_VCODEC_X264)
{
min = 68;
max = 97;
}
- else if (vcodec == HB_VCODEC_X264)
+ else
{
min = 40;
max = 70;
{
min = 68;
max = 97;
+ vquality *= 100.0;
}
}
- gint vquality = ghb_settings_get_dbl(settings, "video_quality");
if (vquality < min || vquality > max)
{
message = g_strdup_printf(
"Interesting video quality choise: %d\n\n"
"Typical values range from %d to %d.\n"
"Are you sure you wish to use this setting?",
- vquality, min, max);
+ (gint)vquality, min, max);
if (!ghb_message_dialog(GTK_MESSAGE_QUESTION, message,
"Cancel", "Continue"))
{
}
void
-ghb_add_job(job_settings_t *js, gint unique_id)
+ghb_add_job(GValue *js, gint unique_id)
{
hb_list_t * list;
hb_title_t * title;
hb_job_t * job;
- GHashTable *settings = js->settings;
static gchar *x264opts;
gint sub_id = 0;
gboolean tweaks = FALSE;
+ gchar *detel_str = NULL;
+ gchar *decomb_str = NULL;
+ gchar *deint_str = NULL;
+ gchar *deblock_str = NULL;
+ gchar *denoise_str = NULL;
+ gchar *dest_str = NULL;
g_debug("ghb_add_job()\n");
- if (h == NULL) return;
- list = hb_get_titles( h );
+ if (h_queue == NULL) return;
+ list = hb_get_titles( h_queue );
if( !hb_list_count( list ) )
{
/* No valid title, stop right there */
return;
}
- gint titleindex = ghb_settings_get_index(settings, "title");
+ // Since I'm doing a scan of the single title I want just prior
+ // to adding the job, there is only the one title to choose from.
+ //gint titleindex = ghb_settings_get_int(js, "title");
+ gint titleindex = 0;
title = hb_list_item( list, titleindex );
if (title == NULL) return;
job = title->job;
if (job == NULL) return;
- tweaks = ghb_settings_get_int(settings, "allow_tweaks");
- job->mux = ghb_settings_get_int(settings, "container");
+ tweaks = ghb_settings_get_boolean(js, "allow_tweaks");
+ job->mux = ghb_settings_combo_int(js, "FileFormat");
if (job->mux == HB_MUX_MP4)
{
- job->largeFileSize = ghb_settings_get_bool(settings, "large_mp4");
- job->mp4_optimize = ghb_settings_get_bool(settings, "http_optimize_mp4");
+ job->largeFileSize = ghb_settings_get_boolean(js, "Mp4LargeFile");
+ job->mp4_optimize = ghb_settings_get_boolean(js, "Mp4HttpOptimize");
}
else
{
job->mp4_optimize = FALSE;
}
gint chapter_start, chapter_end;
- chapter_start = ghb_settings_get_int(settings, "start_chapter");
- chapter_end = ghb_settings_get_int(settings, "end_chapter");
+ chapter_start = ghb_settings_get_int(js, "start_chapter");
+ chapter_end = ghb_settings_get_int(js, "end_chapter");
gint num_chapters = hb_list_count(title->list_chapter);
job->chapter_start = MIN( num_chapters, chapter_start );
job->chapter_end = MAX( job->chapter_start, chapter_end );
- job->chapter_markers = ghb_settings_get_bool(settings, "chapter_markers");
+ job->chapter_markers = ghb_settings_get_boolean(js, "ChapterMarkers");
if ( job->chapter_markers )
{
- gint chapter;
+ GValue *chapters;
+ GValue *chapter;
+ gint chap;
+ gint count;
- for(chapter = chapter_start; chapter <= chapter_end; chapter++)
+ chapters = ghb_settings_get_value(js, "chapter_list");
+ count = ghb_array_len(chapters);
+ for(chap = chapter_start; chap <= chapter_end; chap++)
{
hb_chapter_t * chapter_s;
gchar *name;
- if (js->chapter_list == NULL || js->chapter_list[chapter-1] == 0)
+ name = NULL;
+ if (chap-1 < count)
{
- name = g_strdup_printf ("Chapter %2d", chapter);
+ chapter = ghb_array_get_nth(chapters, chap-1);
+ name = ghb_value_string(chapter);
}
- else
+ if (name == NULL)
{
- name = g_strdup(js->chapter_list[chapter-1]);
+ name = g_strdup_printf ("Chapter %2d", chap);
}
- chapter_s = hb_list_item( job->title->list_chapter, chapter - 1);
+ chapter_s = hb_list_item( job->title->list_chapter, chap - 1);
strncpy(chapter_s->title, name, 1023);
chapter_s->title[1023] = '\0';
g_free(name);
}
}
- job->crop[0] = ghb_settings_get_int(settings, "crop_top");
- job->crop[1] = ghb_settings_get_int(settings, "crop_bottom");
- job->crop[2] = ghb_settings_get_int(settings, "crop_left");
- job->crop[3] = ghb_settings_get_int(settings, "crop_right");
+ job->crop[0] = ghb_settings_get_int(js, "PictureTopCrop");
+ job->crop[1] = ghb_settings_get_int(js, "PictureBottomCrop");
+ job->crop[2] = ghb_settings_get_int(js, "PictureLeftCrop");
+ job->crop[3] = ghb_settings_get_int(js, "PictureRightCrop");
- gboolean decomb = ghb_settings_get_bool(settings, "decomb");
- gint deint = ghb_settings_get_int(settings, "deinterlace");
+ gboolean decomb = ghb_settings_get_boolean(js, "PictureDecomb");
+ gint deint = ghb_settings_combo_int(js,
+ tweaks ? "tweak_PictureDeinterlace":"PictureDeinterlace");
if (!decomb)
- job->deinterlace = (deint == 0) ? 0 : 1;
+ job->deinterlace = (deint != 0) ? 1 : 0;
else
job->deinterlace = 0;
- job->grayscale = ghb_settings_get_bool(settings, "grayscale");
+ job->grayscale = ghb_settings_get_boolean(js, "VideoGrayScale");
- gboolean anamorphic = ghb_settings_get_bool(settings, "anamorphic");
- gboolean round_dimensions = ghb_settings_get_bool(settings, "round_dimensions");
+ gboolean anamorphic = ghb_settings_get_boolean(js, "anamorphic");
+ gboolean round_dimensions = ghb_settings_get_boolean(js, "ModDimensions");
if (round_dimensions && anamorphic)
{
job->pixel_ratio = 2;
job->pixel_ratio = 0;
job->modulus = 2;
}
- job->vfr = ghb_settings_get_bool(settings, "variable_frame_rate");
/* Add selected filters */
job->filters = hb_list_init();
- if( ghb_settings_get_bool(settings, "detelecine" ) || job->vfr )
+ gint vrate = ghb_settings_combo_int(js, "VideoFramerate");
+ if( vrate == 0 && ghb_settings_get_boolean(js, "PictureDetelecine" ) )
+ job->vfr = 1;
+ else
+ job->vfr = 0;
+
+ if( ghb_settings_get_boolean(js, "PictureDetelecine" ) )
{
hb_filter_detelecine.settings = NULL;
if (tweaks)
{
- const gchar *str;
- str = ghb_settings_get_string(settings, "tweak_detelecine");
- if (str && str[0])
+ detel_str = ghb_settings_get_string(js, "tweak_PictureDetelecine");
+ if (detel_str && detel_str[0])
{
- hb_filter_detelecine.settings = (gchar*)str;
+ hb_filter_detelecine.settings = detel_str;
}
}
hb_list_add( job->filters, &hb_filter_detelecine );
hb_filter_decomb.settings = NULL;
if (tweaks)
{
- const gchar *str;
- str = ghb_settings_get_string(settings, "tweak_decomb");
- if (str && str[0])
+ decomb_str = ghb_settings_get_string(js, "tweak_PictureDecomb");
+ if (decomb_str && decomb_str[0])
{
- hb_filter_decomb.settings = (gchar*)str;
+ hb_filter_decomb.settings = (gchar*)decomb_str;
}
}
hb_list_add( job->filters, &hb_filter_decomb );
}
if( job->deinterlace )
{
- hb_filter_deinterlace.settings = (gchar*)ghb_settings_get_string(settings, "deinterlace");
- if (tweaks)
- {
- const gchar *str;
- str = ghb_settings_get_string(settings, "tweak_deinterlace");
- if (str && str[0])
- {
- hb_filter_deinterlace.settings = (gchar*)str;
- }
- }
+ if (deint > 0)
+ deint_str = g_strdup(deint_opts.map[deint].svalue);
+ else
+ deint_str = ghb_settings_get_string(js,
+ tweaks ? "tweak_PictureDeinterlace" : "PictureDeinterlace");
+ hb_filter_deinterlace.settings = deint_str;
hb_list_add( job->filters, &hb_filter_deinterlace );
}
- if( ghb_settings_get_bool(settings, "deblock") )
+ gint deblock = ghb_settings_get_int(js, "PictureDeblock");
+ if( deblock >= 5 )
{
- hb_filter_deblock.settings = NULL;
- if (tweaks)
- {
- const gchar *str;
- str = ghb_settings_get_string(settings, "tweak_deblock");
- if (str && str[0])
- {
- hb_filter_deblock.settings = (gchar*)str;
- }
- }
+ deblock_str = g_strdup_printf("%d", deblock);
+ hb_filter_deblock.settings = deblock_str;
hb_list_add( job->filters, &hb_filter_deblock );
}
- gint denoise = ghb_settings_get_int(settings, "denoise");
+ gint denoise = ghb_settings_combo_int(js,
+ tweaks ? "tweak_PictureDenoise" : "PictureDenoise");
if( denoise != 0 )
{
- hb_filter_denoise.settings = (gchar*)ghb_settings_get_string(settings, "denoise");
- if (tweaks)
- {
- const gchar *str;
- str = ghb_settings_get_string(settings, "tweak_denoise");
- if (str && str[0])
- {
- hb_filter_denoise.settings = (gchar*)str;
- }
- }
+ if (denoise > 0)
+ denoise_str = g_strdup(denoise_opts.map[denoise].svalue);
+ else
+ denoise_str = (gchar*)ghb_settings_get_string(
+ js, tweaks ? "tweak_PictureDenoise" : "PictureDenoise");
+ hb_filter_denoise.settings = denoise_str;
hb_list_add( job->filters, &hb_filter_denoise );
}
- job->width = ghb_settings_get_int(settings, "scale_width");
- job->height = ghb_settings_get_int(settings, "scale_height");
+ job->width = ghb_settings_get_int(js, "scale_width");
+ job->height = ghb_settings_get_int(js, "scale_height");
- job->vcodec = ghb_settings_get_int(settings, "video_codec");
+ job->vcodec = ghb_settings_combo_int(js, "VideoEncoder");
if ((job->mux == HB_MUX_MP4 || job->mux == HB_MUX_AVI) &&
(job->vcodec == HB_VCODEC_THEORA))
{
}
if ((job->vcodec == HB_VCODEC_X264) && (job->mux == HB_MUX_MP4))
{
- job->ipod_atom = ghb_settings_get_bool(settings, "ipod_file");
+ job->ipod_atom = ghb_settings_get_boolean(js, "Mp4iPodCompatible");
}
- if (ghb_settings_get_bool(settings, "vquality_type_constant"))
+ if (ghb_settings_get_boolean(js, "vquality_type_constant"))
{
- gdouble vquality = ghb_settings_get_dbl(settings, "video_quality");
- if (!ghb_settings_get_bool(settings, "directqp"))
+ gdouble vquality;
+ vquality = ghb_settings_get_double(js, "VideoQualitySlider");
+ if (!ghb_settings_get_boolean(js, "directqp"))
{
- vquality /= 100.0;
- if (ghb_settings_get_bool(settings, "linear_vquality"))
- {
- if (job->vcodec == HB_VCODEC_X264)
- {
- // Adjust to same range as xvid and ffmpeg
- vquality = 31.0 - vquality * 31.0;
- if (vquality > 0)
- {
- // Convert linear to log curve
- vquality = 12 + 6 * log2(vquality);
- if (vquality > 51) vquality = 51;
- if (vquality < 1) vquality = 1;
- }
- else
- vquality = 0;
- }
- }
- else
- {
- if (vquality == 0.0) vquality = 0.01;
- if (vquality == 1.0) vquality = 0.0;
- }
+ if (vquality == 0.0) vquality = 0.01;
+ if (vquality == 1.0) vquality = 0.0;
}
job->vquality = vquality;
job->vbitrate = 0;
}
- else if (ghb_settings_get_bool(settings, "vquality_type_bitrate"))
+ else if (ghb_settings_get_boolean(js, "vquality_type_bitrate"))
{
job->vquality = -1.0;
- job->vbitrate = ghb_settings_get_int(settings, "video_bitrate");
+ job->vbitrate = ghb_settings_get_int(js, "VideoAvgBitrate");
}
// AVI container does not support variable frame rate.
if (job->mux == HB_MUX_AVI)
{
job->vfr = FALSE;
+ job->cfr = 1;
}
- gint vrate = ghb_settings_get_int(settings, "framerate");
- if( vrate == 0 || job->vfr )
+ if( vrate == 0 )
{
job->vrate = title->rate;
job->vrate_base = title->rate_base;
hb_audio_t *audio = (hb_audio_t*)hb_list_item(job->list_audio, 0);
hb_list_rem(job->list_audio, audio);
}
- GSList *link = js->audio_settings;
- gint count = 0;
- while (link != NULL)
+
+ const GValue *audio_list;
+ gint count;
+ gint tcount = 0;
+
+ audio_list = ghb_settings_get_value(js, "audio_list");
+ count = ghb_array_len(audio_list);
+ for (ii = 0; ii < count; ii++)
{
- GHashTable *asettings;
+ GValue *asettings;
hb_audio_config_t audio;
hb_audio_config_t *taudio;
hb_audio_config_init(&audio);
- asettings = (GHashTable*)link->data;
- audio.in.track = ghb_settings_get_index(asettings, "audio_track");
- audio.out.track = count;
- audio.out.codec = ghb_settings_get_int(asettings, "audio_codec");
- taudio = (hb_audio_config_t *) hb_list_audio_config_item( title->list_audio, audio.in.track );
+ asettings = ghb_array_get_nth(audio_list, ii);
+ audio.in.track = ghb_settings_get_int(asettings, "AudioTrack");
+ audio.out.track = tcount;
+ audio.out.codec = ghb_settings_combo_int(asettings, "AudioEncoder");
+ taudio = (hb_audio_config_t *) hb_list_audio_config_item(
+ title->list_audio, audio.in.track );
if ((taudio->in.codec != HB_ACODEC_AC3) && (audio.out.codec == HB_ACODEC_AC3))
{
// Not supported. AC3 is passthrough only, so input must be AC3
// ogm/faac|ac3 combination is not supported.
audio.out.codec = HB_ACODEC_VORBIS;
}
- audio.out.dynamic_range_compression = ghb_settings_get_dbl(asettings, "audio_drc");
+ audio.out.dynamic_range_compression =
+ ghb_settings_get_double(asettings, "AudioTrackDRCSlider");
// It would be better if this were done in libhb for us, but its not yet.
if (audio.out.codec == HB_ACODEC_AC3 || audio.out.codec == HB_ACODEC_DCA)
{
}
else
{
- audio.out.mixdown = ghb_settings_get_int (asettings, "audio_mix");
+ audio.out.mixdown = ghb_settings_combo_int(asettings, "AudioMixdown");
// Make sure the mixdown is valid and pick a new one if not.
- audio.out.mixdown = ghb_get_best_mix(titleindex, audio.in.track, audio.out.codec,
- audio.out.mixdown);
- audio.out.bitrate = ghb_settings_get_int(asettings, "audio_bitrate") / 1000;
- gint srate = ghb_settings_get_int(asettings, "audio_rate");
+ audio.out.mixdown = ghb_get_best_mix(titleindex,
+ audio.in.track, audio.out.codec, audio.out.mixdown);
+ audio.out.bitrate =
+ ghb_settings_combo_int(asettings, "AudioBitrate");
+ gint srate = ghb_settings_combo_int(asettings, "AudioSamplerate");
if (srate == 0) // 0 is same as source
audio.out.samplerate = taudio->in.samplerate;
else
// Add it to the jobs audio list
hb_audio_add( job, &audio );
- count++;
- link = link->next;
+ tcount++;
}
// I was tempted to move this up with the reset of the video quality
// settings, but I suspect the settings above need to be made
// first in order for hb_calc_bitrate to be accurate.
- if (ghb_settings_get_bool(settings, "vquality_type_target"))
+ if (ghb_settings_get_boolean(js, "vquality_type_target"))
{
gint size;
- size = ghb_settings_get_int(settings, "video_target_size");
+ size = ghb_settings_get_int(js, "VideoTargetSize");
job->vbitrate = hb_calc_bitrate( job, size );
job->vquality = -1.0;
}
- job->file = ghb_settings_get_string(settings, "destination");
- job->crf = ghb_settings_get_bool(settings, "constant_rate_factor");
+ dest_str = ghb_settings_get_string(js, "destination");
+ job->file = dest_str;
+ job->crf = ghb_settings_get_boolean(js, "constant_rate_factor");
// TODO: libhb holds onto a reference to the x264opts and is not
// finished with it until encoding the job is done. But I can't
// find a way to get at the job before it is removed in order to
// free up the memory I am allocating here.
// The short story is THIS LEAKS.
- x264opts = ghb_build_x264opts_string(settings);
+ x264opts = ghb_build_x264opts_string(js);
if( x264opts != NULL && *x264opts != '\0' )
{
{
job->x264opts = NULL;
}
- gint subtitle = ghb_settings_get_int(settings, "subtitle_lang");
- gboolean forced_subtitles = ghb_settings_get_bool (settings, "forced_subtitles");
+ gint subtitle;
+ gchar *slang = ghb_settings_get_string(js, "Subtitles");
+ subtitle = -2; // default to none
+ if (strcmp(slang, "auto") == 0)
+ {
+ subtitle = -1;
+ }
+ else
+ {
+ gint scount;
+ hb_subtitle_t * subt;
+
+ scount = hb_list_count(title->list_subtitle);
+ for (ii = 0; ii < scount; ii++)
+ {
+ subt = (hb_subtitle_t *)hb_list_item(title->list_subtitle, ii);
+ if (strcmp(slang, subt->iso639_2) == 0)
+ {
+ subtitle = ii;
+ break;
+ }
+ }
+ }
+ gboolean forced_subtitles = ghb_settings_get_boolean(js, "SubtitlesForced");
job->subtitle_force = forced_subtitles;
if (subtitle >= 0)
job->subtitle = subtitle;
* Add the pre-scan job
*/
job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
- hb_add( h, job );
+ hb_add( h_queue, job );
//if (job->x264opts != NULL)
// g_free(job->x264opts);
{
job->select_subtitle = NULL;
}
- if( ghb_settings_get_bool(settings, "two_pass") &&
- !ghb_settings_get_bool(settings, "vquality_type_constant"))
+ if( ghb_settings_get_boolean(js, "VideoTwoPass") &&
+ !ghb_settings_get_boolean(js, "vquality_type_constant"))
{
/*
* If subtitle_scan is enabled then only turn it on
* If turbo options have been selected then append them
* to the x264opts now (size includes one ':' and the '\0')
*/
- if( ghb_settings_get_bool(settings, "turbo") )
+ if( ghb_settings_get_boolean(js, "VideoTurboTwoPass") )
{
char *tmp_x264opts;
job->x264opts = x264opts;
}
job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
- hb_add( h, job );
+ hb_add( h_queue, job );
//if (job->x264opts != NULL)
// g_free(job->x264opts);
job->indepth_scan = 0;
job->x264opts = x264opts2;
job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
- hb_add( h, job );
+ hb_add( h_queue, job );
//if (job->x264opts != NULL)
// g_free(job->x264opts);
}
job->indepth_scan = 0;
job->pass = 0;
job->sequence_id = (unique_id & 0xFFFFFF) | (sub_id++ << 24);
- hb_add( h, job );
+ hb_add( h_queue, job );
//if (job->x264opts != NULL)
// g_free(job->x264opts);
}
+ if (detel_str) g_free(detel_str);
+ if (decomb_str) g_free(decomb_str);
+ if (deint_str) g_free(deint_str);
+ if (deblock_str) g_free(deblock_str);
+ if (denoise_str) g_free(denoise_str);
+ if (dest_str) g_free(dest_str);
}
void
// Multiples passes all get the same id
// remove them all.
// Go backwards through list, so reordering doesn't screw me.
- ii = hb_count(h) - 1;
- while ((job = hb_job(h, ii--)) != NULL)
+ ii = hb_count(h_queue) - 1;
+ while ((job = hb_job(h_queue, ii--)) != NULL)
{
if ((job->sequence_id & 0xFFFFFF) == unique_id)
- hb_rem(h, job);
+ hb_rem(h_queue, job);
}
}
void
ghb_start_queue()
{
- hb_start( h );
+ hb_start( h_queue );
}
void
ghb_stop_queue()
{
- hb_stop( h );
+ hb_stop( h_queue );
}
void
ghb_pause_queue()
{
hb_state_t s;
- hb_get_state2( h, &s );
+ hb_get_state2( h_queue, &s );
if( s.state == HB_STATE_PAUSED )
{
- hb_resume( h );
+ hb_resume( h_queue );
}
else
{
- hb_pause( h );
+ hb_pause( h_queue );
}
}
GdkPixbuf*
-ghb_get_preview_image(gint titleindex, gint index, GHashTable *settings, gboolean borders)
+ghb_get_preview_image(
+ gint titleindex,
+ gint index,
+ GValue *settings,
+ gboolean borders)
{
hb_title_t *title;
hb_list_t *list;
- list = hb_get_titles( h );
+ list = hb_get_titles( h_scan );
if( !hb_list_count( list ) )
{
/* No valid title, stop right there */
bufferSize = newSize;
buffer = (guint8*) g_realloc( buffer, bufferSize );
}
- hb_get_preview( h, title, index, buffer );
+ hb_get_preview( h_scan, title, index, buffer );
// Create an GdkPixbuf and copy the libhb image into it, converting it from
// libhb's format something suitable. Along the way, we'll strip off the
// Got it, but hb_get_preview doesn't compensate for anamorphic, so lets
// scale
gint width, height, par_width, par_height;
- gboolean anamorphic = ghb_settings_get_bool (settings, "anamorphic");
+ gboolean anamorphic = ghb_settings_get_boolean(settings, "anamorphic");
if (anamorphic)
{
hb_set_anamorphic_size( title->job, &width, &height, &par_width, &par_height );
OSDN Git Service
