diff options
| author | Paul Gilbert | 2016-09-16 20:05:12 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-09-16 20:05:12 -0400 |
| commit | eb09d8eda2d1e443b966e9ae7713999bb50762e8 (patch) | |
| tree | 06908c1e7bff6229bef18af9e3844409e35c97d5 /engines/xeen/music.h | |
| parent | d5f290dbc7946ec0f2872f0cd8d6d3a63c9f2162 (diff) | |
| download | scummvm-rg350-eb09d8eda2d1e443b966e9ae7713999bb50762e8.tar.gz scummvm-rg350-eb09d8eda2d1e443b966e9ae7713999bb50762e8.tar.bz2 scummvm-rg350-eb09d8eda2d1e443b966e9ae7713999bb50762e8.zip | |
XEEN: Further cleanup of unneeded music code
Diffstat (limited to 'engines/xeen/music.h')
| -rw-r--r-- | engines/xeen/music.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/xeen/music.h b/engines/xeen/music.h index 5b23cc1965..9e9945de05 100644 --- a/engines/xeen/music.h +++ b/engines/xeen/music.h @@ -39,7 +39,7 @@ namespace OPL { namespace Xeen { enum MusicCommand { - STOP_MUSIC = 0, RESTART_MUSIC = 1, SET_VOLUME = 0x100, + STOP_SONG = 0, RESTART_SONG = 1, SET_VOLUME = 0x100, GET_STATUS = 0xFFE0 }; @@ -148,7 +148,7 @@ public: /** * Destructor */ - virtual ~MusicDriver() {} + virtual ~MusicDriver(); /** * Starts an special effect playing @@ -326,12 +326,12 @@ public: /** * Stops any currently playing music */ - void stopMusic() { songCommand(STOP_MUSIC); } + void stopSong() { songCommand(STOP_SONG); } /** - * Restart the music + * Restart a previously playing song (which must still be loaded) */ - void restartMusic() { songCommand(RESTART_MUSIC); } + void restartSong() { songCommand(RESTART_SONG); } /** * Sets the music volume @@ -346,7 +346,7 @@ public: /** * Plays a song */ - void playSong(const Common::String &name); + void playSong(const Common::String &name, int param = 0); /** * Plays a song |