Commit c1a144df authored by Antoine Cellerier's avatar Antoine Cellerier

Add option to disable embedded video in the simple prefs.

parent 446be1c2
...@@ -188,6 +188,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, ...@@ -188,6 +188,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONFIG_GENERIC( "video-on-top", Bool, NULL, alwaysOnTop ); CONFIG_GENERIC( "video-on-top", Bool, NULL, alwaysOnTop );
CONFIG_GENERIC( "video-deco", Bool, NULL, windowDecorations ); CONFIG_GENERIC( "video-deco", Bool, NULL, windowDecorations );
CONFIG_GENERIC( "skip-frames" , Bool, NULL, skipFrames ); CONFIG_GENERIC( "skip-frames" , Bool, NULL, skipFrames );
CONFIG_GENERIC( "embedded-video", Bool, NULL, embeddedVideo );
CONFIG_GENERIC( "vout", Module, NULL, outputModule ); CONFIG_GENERIC( "vout", Module, NULL, outputModule );
#ifdef WIN32 #ifdef WIN32
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>408</width> <width>526</width>
<height>513</height> <height>513</height>
</rect> </rect>
</property> </property>
...@@ -69,10 +69,10 @@ ...@@ -69,10 +69,10 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" colspan="2" > <item row="4" column="1" colspan="2" >
<widget class="QComboBox" name="outputModule" /> <widget class="QComboBox" name="outputModule" />
</item> </item>
<item row="3" column="0" > <item row="4" column="0" >
<widget class="QLabel" name="label_4" > <widget class="QLabel" name="label_4" >
<property name="text" > <property name="text" >
<string>_("Output")</string> <string>_("Output")</string>
...@@ -105,6 +105,13 @@ ...@@ -105,6 +105,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2" >
<widget class="QCheckBox" name="embeddedVideo" >
<property name="text" >
<string>_("Embedded video")</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
...@@ -141,6 +148,10 @@ ...@@ -141,6 +148,10 @@
</widget> </widget>
</item> </item>
</layout> </layout>
<zorder>dXdisplayDevice</zorder>
<zorder>label_5</zorder>
<zorder>wallpaperMode</zorder>
<zorder>displayBox</zorder>
</widget> </widget>
</item> </item>
<item> <item>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment