summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk/src/callbacks.c14
-rw-r--r--gtk/src/hb-backend.c196
-rw-r--r--gtk/src/hb-backend.h4
3 files changed, 120 insertions, 94 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 1b887bafc..3a9445681 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -977,7 +977,7 @@ adjust_audio_rate_combos(signal_user_data_t *ud)
{
gint br = ainfo.bitrate / 1000;
// Set the values for bitrate and samplerate to the input rates
- ghb_set_passthru_rate_opts (ud->builder, br);
+ ghb_set_passthru_bitrate_opts (ud->builder, br);
ghb_ui_update(ud, "audio_bitrate", ghb_int64_value(br));
ghb_ui_update(ud, "audio_rate", ghb_int64_value(0));
ghb_ui_update(ud, "audio_mix", ghb_int64_value(0));
@@ -988,9 +988,19 @@ adjust_audio_rate_combos(signal_user_data_t *ud)
ghb_ui_update(ud, "audio_mix", ghb_int64_value(0));
}
}
+ else if (acodec == HB_ACODEC_FAAC)
+ {
+ gint br;
+
+ widget = GHB_WIDGET(ud->builder, "audio_bitrate");
+ br = ghb_widget_int(widget);
+ if (br > 160)
+ ghb_ui_update(ud, "audio_bitrate", ghb_int64_value(160));
+ ghb_set_default_bitrate_opts (ud->builder, 160);
+ }
else
{
- ghb_set_default_rate_opts (ud->builder);
+ ghb_set_default_bitrate_opts (ud->builder, -1);
}
}
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index 0a2fa6a64..8b5b8dbd1 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -381,6 +381,8 @@ static const iso639_lang_t language_table[] =
};
#define LANG_TABLE_SIZE (sizeof(language_table)/ sizeof(iso639_lang_t))
+static void audio_bitrate_opts_set(GtkBuilder *builder, const gchar *name);
+
static void
del_tree(const gchar *name, gboolean del_top)
{
@@ -1109,59 +1111,6 @@ init_combo_box_entry(GtkBuilder *builder, const gchar *name)
}
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++)
- {
- 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,
- 4, rates[ii].string,
- -1);
- }
-}
-
-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, 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);
- }
- return changed;
-}
-
-static void
audio_samplerate_opts_set(GtkBuilder *builder, const gchar *name, hb_rate_t *rates, gint count)
{
GtkTreeIter iter;
@@ -1374,32 +1323,6 @@ find_combo_item_by_int(GtkTreeModel *store, gint value, GtkTreeIter *iter)
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 ("%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);
- return TRUE;
- }
- return FALSE;
-}
-
void
audio_track_opts_set(GtkBuilder *builder, const gchar *name, gint titleindex)
{
@@ -1641,7 +1564,7 @@ ghb_update_ui_combo_box(GtkBuilder *builder, const gchar *name, gint user_data,
}
}
if (all || strcmp(name, "audio_bitrate") == 0)
- audio_bitrate_opts_set(builder, "audio_bitrate", hb_audio_bitrates, hb_audio_bitrates_count);
+ audio_bitrate_opts_set(builder, "audio_bitrate");
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)
@@ -1787,20 +1710,113 @@ ghb_ac3_in_audio_list(const GValue *audio_list)
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)
{
- gboolean changed = FALSE;
- changed = audio_rate_opts_add(builder, "audio_bitrate", bitrate);
- return changed;
+ 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);
+ }
}
-gboolean
-ghb_set_default_rate_opts(GtkBuilder *builder)
+static void
+audio_bitrate_opts_clean(GtkBuilder *builder, const gchar *name, gint last_rate)
+{
+ 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++;
+ done = !gtk_list_store_remove(store, &iter);
+ }
+ else
+ {
+ ii++;
+ done = !gtk_tree_model_iter_next (GTK_TREE_MODEL(store), &iter);
+ }
+ } while (!done);
+ }
+ for (; ii < hb_audio_bitrates_count; ii++)
+ {
+ if (hb_audio_bitrates[ii].rate <= last)
+ {
+ 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);
+ }
+ }
+}
+
+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)
+{
+ audio_bitrate_opts_add(builder, "audio_bitrate", bitrate);
+}
+
+void
+ghb_set_default_bitrate_opts(GtkBuilder *builder, gint last_rate)
{
- gboolean changed = FALSE;
- changed = audio_bitrate_opts_clean(builder, "audio_bitrate", hb_audio_bitrates, hb_audio_bitrates_count);
- return changed;
+ audio_bitrate_opts_clean(builder, "audio_bitrate", last_rate);
}
static ghb_status_t hb_status;
diff --git a/gtk/src/hb-backend.h b/gtk/src/hb-backend.h
index a67bbb00c..921c822d1 100644
--- a/gtk/src/hb-backend.h
+++ b/gtk/src/hb-backend.h
@@ -109,8 +109,8 @@ gboolean ghb_audio_is_passthru(gint acodec);
gint ghb_get_default_acodec(void);
gboolean ghb_get_audio_info(
ghb_audio_info_t *ainfo, gint titleindex, gint audioindex);
-gboolean ghb_set_passthru_rate_opts(GtkBuilder *builder, gint bitrate);
-gboolean ghb_set_default_rate_opts(GtkBuilder *builder);
+void ghb_set_passthru_bitrate_opts(GtkBuilder *builder, gint bitrate);
+void ghb_set_default_bitrate_opts(GtkBuilder *builder, gint last_rate);
void ghb_grey_combo_options(GtkBuilder *builder);
void ghb_update_ui_combo_box(
GtkBuilder *builder, const gchar *name, gint user_data, gboolean all);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-17 23:22:23 +0000