OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LinGui: accidentally commited x264 defaults changes prematurely, revert
[handbrake-jp/handbrake-jp-git.git]
/
gtk
/
src
/
presets.c
diff --git
a/gtk/src/presets.c
b/gtk/src/presets.c
index
b419414
..
c17a902
100644
(file)
--- a/
gtk/src/presets.c
+++ b/
gtk/src/presets.c
@@
-1392,6
+1392,8
@@
ghb_prefs_load(signal_user_data_t *ud)
}
ghb_dict_insert(dict,
g_strdup("destination_dir"), ghb_value_dup(ghb_string_value(dir)));
}
ghb_dict_insert(dict,
g_strdup("destination_dir"), ghb_value_dup(ghb_string_value(dir)));
+ ghb_dict_insert(dict,
+ g_strdup("SrtDir"), ghb_value_dup(ghb_string_value(dir)));
#if defined(_WIN32)
gchar *source;
#if defined(_WIN32)
gchar *source;
@@
-1763,7
+1765,7
@@
static value_map_t acodec_xlat[] =
value_map_t container_xlat[] =
{
{"MP4 file", "mp4"},
value_map_t container_xlat[] =
{
{"MP4 file", "mp4"},
- {"M4V file", "m
4v
"},
+ {"M4V file", "m
p4
"},
{"MKV file", "mkv"},
{"AVI file", "mkv"},
{"OGM file", "mkv"},
{"MKV file", "mkv"},
{"AVI file", "mkv"},
{"OGM file", "mkv"},
@@
-3064,7
+3066,7
@@
update_subtitle_presets(signal_user_data_t *ud)
g_debug("update_subtitle_presets");
const GValue *subtitle_list, *subtitle;
GValue *slist, *dict;
g_debug("update_subtitle_presets");
const GValue *subtitle_list, *subtitle;
GValue *slist, *dict;
- gint count, ii;
+ gint count, ii
, source
;
subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
slist = ghb_array_value_new(8);
subtitle_list = ghb_settings_get_value(ud->settings, "subtitle_list");
slist = ghb_array_value_new(8);
@@
-3072,10
+3074,14
@@
update_subtitle_presets(signal_user_data_t *ud)
for (ii = 0; ii < count; ii++)
{
subtitle = ghb_array_get_nth(subtitle_list, ii);
for (ii = 0; ii < count; ii++)
{
subtitle = ghb_array_get_nth(subtitle_list, ii);
- dict = ghb_value_dup(subtitle);
- ghb_array_append(slist, dict);
+ source = ghb_settings_get_int(subtitle, "SubtitleSource");
+ if (source != SRTSUB)
+ {
+ dict = ghb_value_dup(subtitle);
+ ghb_array_append(slist, dict);
+ }
}
}
- ghb_settings_
set
_value(ud->settings, "SubtitleList", slist);
+ ghb_settings_
take
_value(ud->settings, "SubtitleList", slist);
}
void
}
void