aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound/music_room_instrument.h
diff options
context:
space:
mode:
authorPaul Gilbert2017-02-12 13:05:37 -0500
committerPaul Gilbert2017-02-12 13:05:37 -0500
commite00fb1380949e85afc76163eee47c76027b30e10 (patch)
treef89e1eda2a45b0c7057144b67fe812c72552dbf5 /engines/titanic/sound/music_room_instrument.h
parenta542104f3ceb69086c8b4f2ea259bacb93f719ed (diff)
downloadscummvm-rg350-e00fb1380949e85afc76163eee47c76027b30e10.tar.gz
scummvm-rg350-e00fb1380949e85afc76163eee47c76027b30e10.tar.bz2
scummvm-rg350-e00fb1380949e85afc76163eee47c76027b30e10.zip
TITANIC: Fix method names in CMusicRoomInstrument
Diffstat (limited to 'engines/titanic/sound/music_room_instrument.h')
-rw-r--r--engines/titanic/sound/music_room_instrument.h21
1 files changed, 15 insertions, 6 deletions
diff --git a/engines/titanic/sound/music_room_instrument.h b/engines/titanic/sound/music_room_instrument.h
index 0a8ff16b35..d63fe93f20 100644
--- a/engines/titanic/sound/music_room_instrument.h
+++ b/engines/titanic/sound/music_room_instrument.h
@@ -97,10 +97,11 @@ public:
*/
void load(int index, const CString &filename, int v3);
+
/**
* Starts the music and associated animations
*/
- void start(int val);
+ void start();
/**
* Stops the music and associated animations
@@ -108,13 +109,21 @@ public:
void stop();
/**
- * Called regularly to handle triggering the animation of the
- * musical instrument associated with the instance
+ * Handles regular updates of the instrument, allowing associated
+ * objects to start animations as the music is played
+ */
+ void update(int val);
+
+ /**
+ * Clear the instrument
*/
- void trigger();
+ void clear();
- void reset();
- void setSize(uint total);
+ /**
+ * Resets the instrument, and sets the maximum for how much data can
+ * be read from the wave files during each read action
+ */
+ void reset(uint total);
/**
* If there is any wave file currently specified, reads it in