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

Move music to clients and add option to toggle music #255

Merged
merged 2 commits into from
May 23, 2016

Conversation

oznogon
Copy link
Contributor

@oznogon oznogon commented May 23, 2016

  • Move threat estimation from server to crew screens.
  • This also moves music playback and switching from server to clients, which resolves at least part of Headless server playing audio #212 (headless servers playing music).
  • Create music_enabled option in options.ini and the options screen. Values:
  • 0: Client never plays music during game.
  • 1: Client always plays music during game.
  • 2 (default): Client plays music only when running the main screen.
  • Add music_enabled selector to option menu.

I'm not sure if this introduces issues with Android, which doesn't bundle music.

-   Move threat estimate logic from server to client.
-   Move music playback from server to client. (Resolves daid#212)
-   Create music_enabled option.
    -   0: Client never plays music during game.
    -   1: Client always plays music during game.
    -   2 (default): Client plays music only when main screen.
-   Add music_enabled selector to option menu.
@daid
Copy link
Owner

daid commented May 23, 2016

The implementation looks mostly sound. I just have a small problem with the default, the option menu now specifies a default of "2", but if another code path reads it first it does not have this default yet, and thus defaults to an empty string.

If there is no music, (as on android) you can still safely request a music file set, it just does nothing.

@oznogon
Copy link
Contributor Author

oznogon commented May 23, 2016

Thanks, @daid! I added a commit to have PreferencesManager check for that setting in main.cpp, and set a default if the setting is empty.

@daid daid merged commit ec82c5b into daid:master May 23, 2016
@oznogon oznogon deleted the client-music branch June 13, 2016 22:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants