diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/keymaps/remote.xml | 27 | ||||
| -rw-r--r-- | system/settings/android.xml | 43 | ||||
| -rw-r--r-- | system/settings/darwin.xml | 4 | ||||
| -rw-r--r-- | system/settings/darwin_ios.xml | 5 | ||||
| -rw-r--r-- | system/settings/linux.xml | 1 | ||||
| -rw-r--r-- | system/settings/rbp.xml | 22 | ||||
| -rw-r--r-- | system/settings/settings.xml | 59 | ||||
| -rw-r--r-- | system/settings/win32.xml | 5 |
8 files changed, 78 insertions, 88 deletions
diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml index 9e77e7ad40..a0c8edf905 100644 --- a/system/keymaps/remote.xml +++ b/system/keymaps/remote.xml @@ -459,46 +459,31 @@ <back>Close</back> </remote> </TextViewer> - <MyPicturesSettings> + <PlayerSettings> <remote> <back>PreviousMenu</back> </remote> - </MyPicturesSettings> - <MyProgramsSettings> + </PlayerSettings> + <LibrarySettings> <remote> <back>PreviousMenu</back> </remote> - </MyProgramsSettings> - <MyWeatherSettings> - <remote> - <back>PreviousMenu</back> - </remote> - </MyWeatherSettings> - <MyMusicSettings> - <remote> - <back>PreviousMenu</back> - </remote> - </MyMusicSettings> + </LibrarySettings> <SystemSettings> <remote> <back>PreviousMenu</back> </remote> </SystemSettings> - <MyVideosSettings> - <remote> - <back>PreviousMenu</back> - </remote> - </MyVideosSettings> <NetworkSettings> <remote> <back>PreviousMenu</back> </remote> </NetworkSettings> - <AppearanceSettings> + <InterfaceSettings> <remote> <back>PreviousMenu</back> </remote> - </AppearanceSettings> + </InterfaceSettings> <Profiles> <remote> <back>PreviousMenu</back> diff --git a/system/settings/android.xml b/system/settings/android.xml index d8025b0b86..6fb8f680b8 100644 --- a/system/settings/android.xml +++ b/system/settings/android.xml @@ -1,36 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> <settings> - <section id="appearance"> - <category id="locale"> - <group id="2"> - <visible>false</visible> - </group> - </category> - </section> - <section id="videos"> - <category id="videoacceleration"> - <group id="3"> - <setting id="videoplayer.usemediacodecsurface" type="boolean" label="13440" help="36544"> - <visible>HAS_MEDIACODEC</visible> - <level>2</level> - <default>true</default> - <updates> - <update type="change" /> - </updates> - <control type="toggle" /> - </setting> - <setting id="videoplayer.usemediacodec" type="boolean" label="13439" help="36544"> - <visible>HAS_MEDIACODEC</visible> - <level>2</level> - <default>true</default> - <updates> - <update type="change" /> - </updates> - <control type="toggle" /> - </setting> - </group> - </category> - </section> <section id="system"> <category id="videoscreen"> <group id="1"> @@ -52,4 +21,16 @@ </group> </category> </section> + <section id="interface"> + <category id="regional"> + <group id="2"> + <setting id="locale.timezonecountry"> + <visible>false</visible> + </setting> + <setting id="locale.timezone"> + <visible>false</visible> + </setting> + </group> + </category> + </section> </settings> diff --git a/system/settings/darwin.xml b/system/settings/darwin.xml index bb42775982..ac88b27a95 100644 --- a/system/settings/darwin.xml +++ b/system/settings/darwin.xml @@ -7,7 +7,7 @@ </group> </category> <category id="audio"> - <group id="1"> + <group id="1"> <setting id="audiooutput.channels" help="36367" /> </group> <group id="3"> @@ -65,4 +65,4 @@ </group> </category> </section> -</settings>
\ No newline at end of file +</settings> diff --git a/system/settings/darwin_ios.xml b/system/settings/darwin_ios.xml index bc34ad9be9..09f07a9ff4 100644 --- a/system/settings/darwin_ios.xml +++ b/system/settings/darwin_ios.xml @@ -7,7 +7,7 @@ <visible>false</visible> </setting> </group> - <group id="4"> + <group id="4"> <setting id="videoplayer.hqscalers"> <visible>false</visible> </setting> @@ -32,7 +32,7 @@ <visible>false</visible> </setting> </group> - </category> + </category> <category id="audio"> <group id="1"> <setting id="audiooutput.audiodevice" type="string"> @@ -76,4 +76,3 @@ </category> </section> </settings> - diff --git a/system/settings/linux.xml b/system/settings/linux.xml index 6c22001dcc..dee93a61d8 100644 --- a/system/settings/linux.xml +++ b/system/settings/linux.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<settings> <section id="system"> <category id="display"> <group id="1"> diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml index 422b0d0a1b..eb5f26cdcb 100644 --- a/system/settings/rbp.xml +++ b/system/settings/rbp.xml @@ -8,7 +8,7 @@ </setting> <setting id="videoplayer.hqscalers"> <visible>false</visible> - </setting> + </setting> <setting id="videoplayer.usemmal" type="boolean" label="36434" help="36435"> <level>2</level> <default>true</default> @@ -28,11 +28,18 @@ <control type="edit" format="integer" /> </setting> </group> + <group id="5"> + <setting id="videoplayer.supportmvc" type="boolean" label="38027" help="38028"> + <level>2</level> + <default>true</default> + <control type="toggle" /> + </setting> + </group> </category> </section> <section id="library"> <category id="video"> - <group id="3" label="14241"> + <group id="3"> <setting id="myvideos.extractchapterthumbs"> <default>false</default> </setting> @@ -72,6 +79,13 @@ <control type="edit" format="integer" /> </setting> </group> + <group id="2"> + <setting id="videoscreen.framepacking" type="boolean" label="38029" help="38030"> + <level>2</level> + <default>false</default> + <control type="toggle" /> + </setting> + </group> </category> <category id="audio"> <group id="1"> @@ -83,8 +97,6 @@ <setting id="audiooutput.ac3transcode" help="37024"> </setting> </group> - </category> + </category> </section> </settings> - - diff --git a/system/settings/settings.xml b/system/settings/settings.xml index ee3cc68c02..e3012926c7 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -46,17 +46,6 @@ </constraints> <control type="list" format="string" /> </setting> - <setting id="videoplayer.pauseafterrefreshchange" type="integer" parent="videoplayer.adjustrefreshrate" label="13550" help="36165"> - <level>1</level> - <default>0</default> - <constraints> - <options>refreshchangedelays</options> - </constraints> - <dependencies> - <dependency type="enable" setting="videoplayer.adjustrefreshrate" operator="!is">0</dependency> <!-- ADJUST_REFRESHRATE_OFF --> - </dependencies> - <control type="spinner" format="string" /> - </setting> <setting id="videoplayer.usedisplayasclock" type="boolean" label="13510" help="36166"> <level>1</level> <default>false</default> @@ -100,7 +89,7 @@ </and> </requirement> </group> - <group id="4" label="14231"> + <group id="4" label="14231"> <setting id="videoplayer.rendermethod" type="integer" label="13415" help="36153"> <level>2</level> <default>0</default> <!-- RENDER_METHOD_AUTO --> @@ -130,6 +119,24 @@ </updates> <control type="toggle" /> </setting> + <setting id="videoplayer.usemediacodecsurface" type="boolean" label="13440" help="36544"> + <requirement>HAS_MEDIACODEC</requirement> + <level>2</level> + <default>true</default> + <updates> + <update type="change" /> + </updates> + <control type="toggle" /> + </setting> + <setting id="videoplayer.usemediacodec" type="boolean" label="13439" help="36544"> + <requirement>HAS_MEDIACODEC</requirement> + <level>2</level> + <default>true</default> + <updates> + <update type="change" /> + </updates> + <control type="toggle" /> + </setting> <setting id="videoplayer.usevdpau" type="boolean" label="13425" help="36155"> <requirement>HAVE_LIBVDPAU</requirement> <level>2</level> @@ -550,7 +557,7 @@ <control type="toggle" /> </setting> </group> - </category> + </category> <category id="language" label="14218" help="38106"> <group id="1" label="14221"> <setting id="locale.audiolanguage" type="string" label="285" help="36119"> @@ -560,7 +567,7 @@ <options>audiostreamlanguages</options> </constraints> <control type="list" format="string" /> - </setting> + </setting> <setting id="videoplayer.preferdefaultflag" type="boolean" label="37040" help="37041"> <level>1</level> <default>true</default> @@ -752,7 +759,7 @@ </group> </category> <category id="accessibility" label="37032" help="37033"> - <group id="1" label="14217"> + <group id="1" label="14221"> <setting id="accessibility.audiovisual" type="boolean" label="37034" help="37035"> <level>0</level> <default>false</default> @@ -1071,7 +1078,7 @@ </group> </category> <category id="databases" label="14219" help="38110"> - <group id="1"label="14215"> + <group id="1" label="14215"> <setting id="videolibrary.updateonstartup" type="boolean" label="14245" help="36146"> <level>1</level> <default>false</default> @@ -1095,12 +1102,12 @@ <control type="button" format="action" /> </setting> </group> - <group id="2"label="14216"> + <group id="2" label="14216"> <setting id="musiclibrary.updateonstartup" type="boolean" label="14245" help="36259"> <level>1</level> <default>false</default> <control type="toggle" /> - </setting> + </setting> <setting id="musiclibrary.backgroundupdate" type="boolean" label="14246" help="36147"> <level>1</level> <default>false</default> @@ -1937,6 +1944,16 @@ </setting> </group> <group id="3" label="496"> + <setting id="videoscreen.noofbuffers" type="integer" label="36043" help="36552"> + <level>2</level> + <default>3</default> <!-- triple buffers --> + <constraints> + <minimum>2</minimum> + <step>1</step> + <maximum>3</maximum> + </constraints> + <control type="list" format="string" /> + </setting> <setting id="videoscreen.guicalibration" type="action" label="214" help="36357"> <level>3</level> <control type="button" format="action" /> @@ -1954,7 +1971,7 @@ </group> </category> <category id="audio" label="14221" help="36360"> - <group id="1" label="14250"> + <group id="1" label="14250"> <setting id="audiooutput.audiodevice" type="string" label="545" help="36371"> <level>0</level> <default>Default</default> <!-- will be properly set on startup --> @@ -2309,7 +2326,7 @@ </control> </setting> </group> - </category> + </category> <category id="powermanagement" label="14095" help="36387"> <group id="1" label="14255"> <setting id="powermanagement.displaysoff" type="integer" label="1450" help="36388"> @@ -2689,7 +2706,7 @@ </options> </constraints> <control type="list" format="string" /> - </setting> + </setting> <setting id="lookandfeel.soundskin" type="addon" label="15108" help="36110"> <level>0</level> <default>resource.uisounds.confluence</default> diff --git a/system/settings/win32.xml b/system/settings/win32.xml index b4b4584659..a017d30c24 100644 --- a/system/settings/win32.xml +++ b/system/settings/win32.xml @@ -64,8 +64,3 @@ </category> </section> </settings> - - - - - |