diff options
Diffstat (limited to 'engines/titanic/sound')
-rw-r--r-- | engines/titanic/sound/music_player.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/sound/music_room.h | 20 |
2 files changed, 17 insertions, 5 deletions
diff --git a/engines/titanic/sound/music_player.cpp b/engines/titanic/sound/music_player.cpp index 548941871d..a6a791f96e 100644 --- a/engines/titanic/sound/music_player.cpp +++ b/engines/titanic/sound/music_player.cpp @@ -110,6 +110,7 @@ bool CMusicPlayer::FrameMsg(CFrameMsg *msg) { } bool CMusicPlayer::EnterRoomMsg(CEnterRoomMsg *msg) { + // Set up a timer that will create a music handler addTimer(100); return true; } @@ -171,6 +172,7 @@ bool CMusicPlayer::TimerMsg(CTimerMsg *msg) { bool CMusicPlayer::LoadSuccessMsg(CLoadSuccessMsg *msg) { if (_isActive) { + // Music is meant to be playing, so restart it CStopMusicMsg stopMsg; stopMsg.execute(this); CStartMusicMsg startMsg; diff --git a/engines/titanic/sound/music_room.h b/engines/titanic/sound/music_room.h index da9e363850..f39957bdd1 100644 --- a/engines/titanic/sound/music_room.h +++ b/engines/titanic/sound/music_room.h @@ -56,27 +56,37 @@ public: /** * Sets the speed control for a given instrument */ - void setSpeedControl(MusicInstrument instrument, int val) { _instruments[instrument]._speedControl = val; } + void setSpeedControl(MusicInstrument instrument, int val) { + _instruments[instrument]._speedControl = val; + } /** * Sets the pitch control for a given instrument */ - void setPitchControl(MusicInstrument instrument, int val) { _instruments[instrument]._pitchControl = val; } + void setPitchControl(MusicInstrument instrument, int val) { + _instruments[instrument]._pitchControl = val; + } /** * Sets the direction control for a given instrument */ - void setDirectionControl(MusicInstrument instrument, bool val) { _instruments[instrument]._directionControl = val; } + void setDirectionControl(MusicInstrument instrument, bool val) { + _instruments[instrument]._directionControl = val; + } /** * Sets the inversion control for a given instrument */ - void setInversionControl(MusicInstrument instrument, bool val) { _instruments[instrument]._inversionControl = val; } + void setInversionControl(MusicInstrument instrument, bool val) { + _instruments[instrument]._inversionControl = val; + } /** * Sets the mute control for a given instrument */ - void setMuteControl(MusicInstrument instrument, bool val) { _instruments[instrument]._muteControl = val; } + void setMuteControl(MusicInstrument instrument, bool val) { + _instruments[instrument]._muteControl = val; + } /** * Sets up the music controls |