aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound/music_room_handler.h
diff options
context:
space:
mode:
authorPaul Gilbert2017-02-12 13:56:00 -0500
committerPaul Gilbert2017-02-12 13:56:00 -0500
commitc33962f69d6e112cde337c85a2b947f86d3fbd1d (patch)
treed20f92f4c3e04a279d126591b9e619eeeee0c619 /engines/titanic/sound/music_room_handler.h
parente00fb1380949e85afc76163eee47c76027b30e10 (diff)
downloadscummvm-rg350-c33962f69d6e112cde337c85a2b947f86d3fbd1d.tar.gz
scummvm-rg350-c33962f69d6e112cde337c85a2b947f86d3fbd1d.tar.bz2
scummvm-rg350-c33962f69d6e112cde337c85a2b947f86d3fbd1d.zip
TITANIC: Renaming methods in CMusicRoomHandler
Diffstat (limited to 'engines/titanic/sound/music_room_handler.h')
-rw-r--r--engines/titanic/sound/music_room_handler.h18
1 files changed, 15 insertions, 3 deletions
diff --git a/engines/titanic/sound/music_room_handler.h b/engines/titanic/sound/music_room_handler.h
index eb274aa10c..34d2b95740 100644
--- a/engines/titanic/sound/music_room_handler.h
+++ b/engines/titanic/sound/music_room_handler.h
@@ -72,17 +72,29 @@ private:
*/
void start();
+ /**
+ * Handles updating the raw audio being played for all the instruments
+ */
void updateAudio();
- void fn1();
/**
- * Updates the state of the instrument.
+ * Handles updating the instruments themselves, and keeping them animating
+ */
+ void updateInstruments();
+
+ /**
+ * Polls a specified instrument for any updates to see if it's still active.
* @returns Returns true if a given instrument is still active..
* that is, that there is still more data that can be read from it to play
*/
- bool updateInstrument(MusicInstrument instrument);
+ bool pollInstrument(MusicInstrument instrument);
double fn3(MusicInstrument instrument, int arrIndex);
+
+ /**
+ * Figures out a pitch value (of some sort) for use in determining
+ * which wave file the music instruments will use.
+ */
int getPitch(MusicInstrument instrument, int arrIndex);
public:
CMusicRoomHandler(CProjectItem *project, CSoundManager *soundManager);