summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'gtk')
-rw-r--r--gtk/src/callbacks.c4
-rw-r--r--gtk/src/ghb.ui23
-rw-r--r--gtk/src/hb-backend.c2
-rw-r--r--gtk/src/internal_defaults.xml2
-rw-r--r--gtk/src/queuehandler.c10
-rw-r--r--gtk/src/standard_presets.xml24
6 files changed, 4 insertions, 61 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index 4a0afea64..4dae08a23 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -979,8 +979,7 @@ update_title_duration(signal_user_data_t *ud)
void ghb_show_container_options(signal_user_data_t *ud)
{
- GtkWidget *w1, *w2, *w3;
- w1 = GHB_WIDGET(ud->builder, "Mp4LargeFile");
+ GtkWidget *w2, *w3;
w2 = GHB_WIDGET(ud->builder, "Mp4HttpOptimize");
w3 = GHB_WIDGET(ud->builder, "Mp4iPodCompatible");
@@ -992,7 +991,6 @@ void ghb_show_container_options(signal_user_data_t *ud)
gint enc = ghb_settings_video_encoder_codec(ud->settings, "VideoEncoder");
- gtk_widget_set_visible(w1, (mux->format == HB_MUX_MP4V2));
gtk_widget_set_visible(w2, (mux->format & HB_MUX_MASK_MP4));
gtk_widget_set_visible(w3, (mux->format & HB_MUX_MASK_MP4) &&
(enc == HB_VCODEC_X264));
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index 10cd30d60..fd04f008a 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -1479,7 +1479,7 @@ This is often the feature title of a DVD.</property>
<signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
</object>
<packing>
- <property name="top_attach">0</property>
+ <property name="top_attach">1</property>
<property name="left_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -1505,27 +1505,6 @@ This allows a player to initiate playback before downloading the entire file.</p
<property name="height">1</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="Mp4LargeFile">
- <property name="label" translatable="yes">Large file (&gt;4GB)</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_markup" translatable="yes">Allow 64 bit MP4 file which can be over 4GB.
-
-&lt;b&gt;Caution:&lt;/b&gt; This option may break device compatibility.</property>
- <property name="halign">start</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="left_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/gtk/src/hb-backend.c b/gtk/src/hb-backend.c
index d7a56155e..f84049b1f 100644
--- a/gtk/src/hb-backend.c
+++ b/gtk/src/hb-backend.c
@@ -4210,12 +4210,10 @@ add_job(hb_handle_t *h, GValue *js, gint unique_id, int titleindex)
job->mux = mux->format;
if (job->mux & HB_MUX_MASK_MP4)
{
- job->largeFileSize = ghb_settings_get_boolean(js, "Mp4LargeFile");
job->mp4_optimize = ghb_settings_get_boolean(js, "Mp4HttpOptimize");
}
else
{
- job->largeFileSize = FALSE;
job->mp4_optimize = FALSE;
}
if (!job->start_at_preview)
diff --git a/gtk/src/internal_defaults.xml b/gtk/src/internal_defaults.xml
index fe817a7ff..3a71a1c01 100644
--- a/gtk/src/internal_defaults.xml
+++ b/gtk/src/internal_defaults.xml
@@ -278,8 +278,6 @@
<false />
<key>PictureKeepRatio</key>
<true />
- <key>Mp4LargeFile</key>
- <false />
<key>AudioAllowMP3Pass</key>
<true />
<key>AudioAllowAACPass</key>
diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 69adc81b2..021c56913 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -197,14 +197,13 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
// Next line in the display (Container options)
// Container Options: - Chapter Markers
- gboolean ipod = FALSE, http = FALSE, large = FALSE;
+ gboolean ipod = FALSE, http = FALSE;
if (mux->format & HB_MUX_MASK_MP4)
{
ipod = ghb_settings_get_boolean(settings, "Mp4iPodCompatible");
http = ghb_settings_get_boolean(settings, "Mp4HttpOptimize");
- large = ghb_settings_get_boolean(settings, "Mp4LargeFile");
}
- if (http || ipod || large || markers)
+ if (http || ipod || markers)
{
const char *prefix = " ";
XPRINT(_("<b>Container Options:</b><small>"));
@@ -223,11 +222,6 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
XPRINT(_("%sWeb Optimized"), prefix);
prefix = " - ";
}
- if (large)
- {
- XPRINT(_("%sLarge File Size (>4GB)"), prefix);
- prefix = " - ";
- }
XPRINT("</small>\n");
}
diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index ed6ceafea..066dd3668 100644
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -63,8 +63,6 @@
<false/>
<key>Mp4HttpOptimize</key>
<integer>0</integer>
- <key>Mp4LargeFile</key>
- <integer>0</integer>
<key>Mp4iPodCompatible</key>
<integer>0</integer>
<key>PictureAutoCrop</key>
@@ -194,8 +192,6 @@
<false/>
<key>Mp4HttpOptimize</key>
<integer>0</integer>
- <key>Mp4LargeFile</key>
- <integer>0</integer>
<key>Mp4iPodCompatible</key>
<integer>1</integer>
<key>PictureAutoCrop</key>
@@ -325,8 +321,6 @@
<false/>
<key>Mp4HttpOptimize</key>
<integer>0</integer>
- <key>Mp4LargeFile</key>
- <integer>1</integer>
<key>Mp4iPodCompatible</key>
<integer>0</integer>
<key>PictureAutoCrop</key>
@@ -456,8 +450,6 @@
<false/>
<key>Mp4HttpOptimize</key>
<integer>0</integer>
- <key>Mp4LargeFile</key>
- <integer>1</integer>
<key>Mp4iPodCompatible</key>
<integer>0</integer>
<key>PictureAutoCrop</key>
@@ -603,8 +595,6 @@
<false/>
<key>Mp4HttpOptimize</key>
<integer>0</integer>
- <key>Mp4LargeFile</key>
- <integer>1</integer>
<key>Mp4iPodCompatible</key>
<integer>0</integer>
<key>PictureAutoCrop</key>
@@ -750,8 +740,6 @@
<false/>
<key>Mp4HttpOptimize</key>
<integer>0</integer>
- <key>Mp4LargeFile</key>
- <integer>1</integer>
<key>Mp4iPodCompatible</key>
<integer>0</integer>
<key>PictureAutoCrop</key>
@@ -897,8 +885,6 @@
<false/>
<key>Mp4HttpOptimize</key>
<integer>0</integer>
- <key>Mp4LargeFile</key>
- <integer>1</integer>
<key>Mp4iPodCompatible</key>
<integer>0</integer>
<key>PictureAutoCrop</key>
@@ -1028,8 +1014,6 @@
<false/>
<key>Mp4HttpOptimize</key>
<integer>0</integer>
- <key>Mp4LargeFile</key>
- <integer>0</integer>
<key>Mp4iPodCompatible</key>
<integer>0</integer>
<key>PictureAutoCrop</key>
@@ -1159,8 +1143,6 @@
<false/>
<key>Mp4HttpOptimize</key>
<integer>0</integer>
- <key>Mp4LargeFile</key>
- <integer>0</integer>
<key>Mp4iPodCompatible</key>
<integer>0</integer>
<key>PictureAutoCrop</key>
@@ -1290,8 +1272,6 @@
<false/>
<key>Mp4HttpOptimize</key>
<integer>0</integer>
- <key>Mp4LargeFile</key>
- <integer>0</integer>
<key>Mp4iPodCompatible</key>
<integer>0</integer>
<key>PictureAutoCrop</key>
@@ -1436,8 +1416,6 @@
<false/>
<key>Mp4HttpOptimize</key>
<integer>0</integer>
- <key>Mp4LargeFile</key>
- <integer>0</integer>
<key>Mp4iPodCompatible</key>
<integer>0</integer>
<key>PictureAutoCrop</key>
@@ -1583,8 +1561,6 @@
<false/>
<key>Mp4HttpOptimize</key>
<integer>0</integer>
- <key>Mp4LargeFile</key>
- <integer>1</integer>
<key>Mp4iPodCompatible</key>
<integer>0</integer>
<key>PictureAutoCrop</key>