Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dvdplayer][subs] Add "none" to the preferred language list. It will … #7613

Merged
merged 2 commits into from Aug 2, 2015

Conversation

@ace20022
Copy link
Member

ace20022 commented Jul 24, 2015

…disable any kind of available subtitles.

@mkortstiege

This comment has been minimized.

Copy link
Member

mkortstiege commented Jul 24, 2015

Looks good to me. Only downside is that this will also skip forced subs and disable em altogether. Anyway, +1.

@MartijnKaijser

This comment has been minimized.

Copy link
Member

MartijnKaijser commented Jul 25, 2015

jenkins build this please

@ace20022

This comment has been minimized.

Copy link
Member Author

ace20022 commented Jul 26, 2015

I could change that and the option to "only forced".

@mkortstiege

This comment has been minimized.

Copy link
Member

mkortstiege commented Jul 26, 2015

I could change that and the option to "only forced".

Both would be nice, so the user can choose between prefered langauge, force only and none.

@MartijnKaijser

This comment has been minimized.

Copy link
Member

MartijnKaijser commented Jul 26, 2015

Was thinking about that same suggestion. If it's possible.

Edit: maybe instead of "none" use "disabled". Up to you.

@ace20022

This comment has been minimized.

Copy link
Member Author

ace20022 commented Jul 27, 2015

"forced only" added, untested and the label is missing. Can someone add it to the po file?

@MartijnKaijser

This comment has been minimized.

Copy link
Member

MartijnKaijser commented Aug 2, 2015

send you a PR for the string

@ace20022

This comment has been minimized.

Copy link
Member Author

ace20022 commented Aug 2, 2015

thx, will squash if you don't mind

@MartijnKaijser

This comment has been minimized.

Copy link
Member

MartijnKaijser commented Aug 2, 2015

go ahead

ace20022 added 2 commits Jul 24, 2015
…nly forced subtitles matching the audio language are considered relevant.
@ace20022 ace20022 force-pushed the ace20022:none_sub branch from 7f03211 to abc184c Aug 2, 2015
@MartijnKaijser

This comment has been minimized.

Copy link
Member

MartijnKaijser commented Aug 2, 2015

jenkins build and merge

@MartijnKaijser MartijnKaijser added this to the J**** 16.0-alpha2 milestone Aug 2, 2015
MartijnKaijser added a commit that referenced this pull request Aug 2, 2015
[dvdplayer][subs] Add "none" to the preferred language list. It will …
@MartijnKaijser MartijnKaijser merged commit 6f1362f into xbmc:master Aug 2, 2015
1 check failed
1 check failed
default Merged build finished.
Details
@ace20022 ace20022 deleted the ace20022:none_sub branch Aug 2, 2015
@MartijnKaijser

This comment has been minimized.

Copy link
Member

MartijnKaijser commented Sep 5, 2015

@ace20022 i just noticed that audio stream language now also has the "none" and "forced only" options added. I doubt those make sense?

@MartijnKaijser

This comment has been minimized.

Copy link
Member

MartijnKaijser commented Sep 5, 2015

"close caption" also shows in both lists and is listed between the other languages and not on top.

Loving the "none' option btw ;)

@ace20022

This comment has been minimized.

Copy link
Member Author

ace20022 commented Sep 5, 2015

@MartijnKaijser Hmm, will have a look soon.

@ace20022

This comment has been minimized.

Copy link
Member Author

ace20022 commented Sep 10, 2015

audio stream language now also has the "none" and "forced only" options added.

The download subs for language also has these entries...

"close caption"

That's because cc was added to the iso list https://github.com/xbmc/xbmc/blob/master/xbmc/utils/LangCodeExpander.cpp#L520 also it's not an official code. I tend to remove it, but I'm not sure that it's not used.

I'm afraid we need to split the options filler methods.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.