Skip to content

Settings cleanup #4280

Merged
merged 20 commits into from Feb 27, 2014

7 participants

@jmarshallnz
Team Kodi member

Signoff already from @opdenkamp and @xhaggi on the PVR changes, @ace20022 on the external subs, and various others on the various others.

This needs to go in after the settings description stuff (rebase required).

@ace20022
Team Kodi member

@jmarshallnz looks good. I think it could be simplified further after branching.

@MartijnKaijser
Team Kodi member

looks good

Edit:
one could argue if the moving of the subtitle settings to a separate tab could be named "language" instead of "subtitles" and combine the audio stream settings in it.
Maybe that's something for G+1

@da-anda
Team Kodi member
da-anda commented Feb 26, 2014

@jmarshallnz so no renaming of subtitle.languages to locale.spokenlanguages for now? The mentioned simplification in your mail won't work up to the level you imagined - we still will need preferred audio/subtitle languages settings and can't cover those by just one languages setting with ordered priorities (audio could be "same as UI" while subs would be "same as audio")

@fritsch
Team Kodi member
fritsch commented Feb 26, 2014

@da-anda: hwscalers do scaling accelerated by hardware. Processing has a tone of "done after it is decoded" and this acceleration avoids.

@jmarshallnz
Team Kodi member

@da-anda: Correct. This setting is used only for subs at the moment, and only used to specify which subs to download. Only once we have an ordered list can the preferred subtitles or preferred audio be changed to a similar scheme.

Jonathan Mar... and others added some commits Feb 27, 2014
Jonathan Marshall [settings] move audio stream language from locale to video settings 89bf684
Jonathan Marshall [settings] better grouping under Video|Music->Library settings ee59640
Jonathan Marshall [settings] pause after refresh should be a child of enable refresh ra…
…te, and sync type is a child of sync to display
1217222
Jonathan Marshall [settings] arrange/enable PVR settings a little nicer 9e149c5
Jonathan Marshall [settings] replaygain and crossfading subsettings should enable based…
… on the state of their parent
52b843f
Jonathan Marshall [settings] audio rip settings are children of the encoder type 2354edb
Jonathan Marshall [settings] upnp announcements depend on the upnp server being enabled c091e16
Jonathan Marshall [settings] the video screen settings are children of the monitor setting f603f22
Jonathan Marshall [settings] enable/disable audio setting controls based on state rathe…
…r than hiding them
27ece5a
Jonathan Marshall [settings] masterlock at start is a child setting of masterlock being…
… enabled
0e11bd4
da-anda [settings] cleanup video decoding settings (hw-accel + frame-multi-th…
…readed) by moving them to their own settings category
bd82b52
Jonathan Marshall [settings] move subtitle downloading to the bottom of the subtitles s…
…ection
91f902a
Jonathan Marshall [settings] move preferred subtitle language below languages to download 5ff1dcb
Jonathan Marshall [settings] move subtitle stereoscopic depth next to subtitle position…
… on screen
8c8d906
da-anda [subtitles] change settings logic for subtitle storage location (make…
… it a spinner)
561ff72
Jonathan Marshall [settings] enable teletext scaling only if teletext is enabled c33abc6
Jonathan Marshall [settings] pvrpowermanagement settings/timers to be dependent on powe…
…rmanagement being enabled
08876d0
Jonathan Marshall [subtitles] drop 'prefer external' option, always preferring ba2c760
Jonathan Marshall [settings] drop unused videolibrary.seasonthumbs 60aa177
Jonathan Marshall [settings] move 'flatten library' into video->library 3045ef9
@jmarshallnz
Team Kodi member

Rebased up after the settings description stuff.

@t-nelson your button (build not required)

@t-nelson

I'd better just ram it in before someone shows up with paint.

@t-nelson t-nelson merged commit d5fa138 into xbmc:master Feb 27, 2014
@da-anda
Team Kodi member
da-anda commented Feb 27, 2014

@jmarshallnz I still think the other approach would be better. Define once which languages you care about or speak (which will also be the ones subtitles are downloaded for) and then only specify the preferred of those languages for subs and audio instead of having to specify the same languages over and over again. As I already mentioned having a priorized order for preferred audio/subs won't work for all scenarios, like when you prefer the subs to match the audio stream instead of a specific language. But well, in doubt we have to create a migration path if we change the settings name.

btw thanks for splitting it up into several commits

@t-nelson
@arnova arnova commented on the diff Mar 7, 2014
system/settings/settings.xml
</constraints>
- <control type="spinner" format="integer" delayed="true"/>
+ <control type="spinner" format="integer" />
+ </setting>
+ <setting id="subtitles.custompath" parent="subtitles.storagemode" type="path" label="21366" help="36191">
+ <level>1</level>
+ <default></default>
+ <constraints>
+ <allowempty>true</allowempty>
+ <writable>false</writable>
+ <sources>
+ <source>videos</source>
+ </sources>
+ </constraints>
+ <dependencies>
+ <dependency type="enable" setting="subtitles.storagemode" operator="is">1</dependency>
@arnova
Team Kodi member
arnova added a note Mar 7, 2014

@jmarshallnz : The above dependency should be dropped. Custom subtitle path should always be configurable, else eg. our subtitle fallbacks don't work properly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@jmarshallnz jmarshallnz deleted the jmarshallnz:settings_cleanup branch Jul 11, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.