summaryrefslogtreecommitdiff
path: root/src/music_gui.cpp
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2014-04-28 21:06:51 +0000
committerrubidium <rubidium@openttd.org>2014-04-28 21:06:51 +0000
commitb476086c394c6bcf893f292ef67565ef2b5496a2 (patch)
tree7bbdfcc4597cae1378070d82c5da36c8668171e0 /src/music_gui.cpp
parent3b634b628c8b8ce30cdd11d38a38cf2f455a1c73 (diff)
downloadopenttd-b476086c394c6bcf893f292ef67565ef2b5496a2.tar.xz
(svn r26538) -Codechange: remove double accounting of the drivers
Diffstat (limited to 'src/music_gui.cpp')
-rw-r--r--src/music_gui.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index c9eb21aa3..1a6a4ca20 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -176,7 +176,7 @@ static void SkipToNextSong()
static void MusicVolumeChanged(byte new_vol)
{
- _music_driver->SetVolume(new_vol);
+ MusicDriver::GetInstance()->SetVolume(new_vol);
}
static void DoPlaySong()
@@ -185,13 +185,13 @@ static void DoPlaySong()
if (FioFindFullPath(filename, lastof(filename), BASESET_DIR, BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename) == NULL) {
FioFindFullPath(filename, lastof(filename), OLD_GM_DIR, BaseMusic::GetUsedSet()->files[_music_wnd_cursong - 1].filename);
}
- _music_driver->PlaySong(filename);
+ MusicDriver::GetInstance()->PlaySong(filename);
SetWindowDirty(WC_MUSIC_WINDOW, 0);
}
static void DoStopMusic()
{
- _music_driver->StopSong();
+ MusicDriver::GetInstance()->StopSong();
SetWindowDirty(WC_MUSIC_WINDOW, 0);
}
@@ -273,7 +273,7 @@ void MusicLoop()
if (!_song_is_active) return;
- if (!_music_driver->IsSongPlaying()) {
+ if (!MusicDriver::GetInstance()->IsSongPlaying()) {
if (_game_mode != GM_MENU) {
StopMusic();
SkipToNextSong();