[wesnoth-commits] [wesnoth/wesnoth] cafede: Revert "Fix #2602: music doesn't change immediatel...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: cafede479c70cbc2d70d052fd0c51e5c5440fa57
      https://github.com/wesnoth/wesnoth/commit/cafede479c70cbc2d70d052fd0c51e5c5440fa57
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M src/savegame.cpp
    M src/sound.cpp
    M src/sound.hpp

  Log Message:
  -----------
  Revert "Fix #2602: music doesn't change immediately on loading a save"

This reverts commit 94b69e028125f344dbb0e8fc1a76845891b291f2.


  Commit: 91afbfd5868595e29a3147748c78652c88d6323e
      https://github.com/wesnoth/wesnoth/commit/91afbfd5868595e29a3147748c78652c88d6323e
  Author: Jyrki Vesterinen <sandgtx at gmail.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M src/playsingle_controller.cpp
    M src/scripting/lua_audio.cpp
    M src/sound.cpp
    M src/sound.hpp
    M src/wesnoth.cpp

  Log Message:
  -----------
  Fix #2602: music doesn't change immediately on loading a save

This time I added an option to disable the feature to allow the currently
playing track to finish when changing the playlist. This allows more
fine-grained control of distinct use cases.

In wesnoth.cpp:do_gameloop(), I reversed the order of the title screen
music and default music because otherwise adding the default music would
enable play_once for the title screen music and prevent instant music
change when the player loads a save. I play title screen music with
immediate=yes, so it's still played first.


Compare: https://github.com/wesnoth/wesnoth/compare/0c0bf7f91d76...91afbfd58685
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.