aboutsummaryrefslogtreecommitdiff
path: root/engines/mohawk/video.h
diff options
context:
space:
mode:
authorMatthew Hoops2011-01-18 20:30:16 +0000
committerMatthew Hoops2011-01-18 20:30:16 +0000
commit0761ab7b3a5789815e65e49d40d92539f10c481c (patch)
tree7d67b9c3714cca45e5a1597bba1a00cc39abfcd4 /engines/mohawk/video.h
parentbf06c49544a63f927889e20617b2b1c3edc815a4 (diff)
downloadscummvm-rg350-0761ab7b3a5789815e65e49d40d92539f10c481c.tar.gz
scummvm-rg350-0761ab7b3a5789815e65e49d40d92539f10c481c.tar.bz2
scummvm-rg350-0761ab7b3a5789815e65e49d40d92539f10c481c.zip
MOHAWK: Rename some VideoManager functions so we have some unified naming between versions
svn-id: r55312
Diffstat (limited to 'engines/mohawk/video.h')
-rw-r--r--engines/mohawk/video.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h
index e0571431e6..43cffb6363 100644
--- a/engines/mohawk/video.h
+++ b/engines/mohawk/video.h
@@ -77,11 +77,11 @@ public:
~VideoManager();
// Generic movie functions
- void playMovie(const Common::String &filename, uint16 x = 0, uint16 y = 0, bool clearScreen = false);
- void playMovieCentered(const Common::String &filename, bool clearScreen = true);
- VideoHandle playBackgroundMovie(const Common::String &filename, int16 x = -1, int16 y = -1, bool loop = false);
- VideoHandle playBackgroundMovie(uint16 id, int16 x = -1, int16 y = -1, bool loop = false);
- bool updateBackgroundMovies();
+ void playMovieBlocking(const Common::String &filename, uint16 x = 0, uint16 y = 0, bool clearScreen = false);
+ void playMovieBlockingCentered(const Common::String &filename, bool clearScreen = true);
+ VideoHandle playMovie(const Common::String &filename, int16 x = -1, int16 y = -1, bool loop = false);
+ VideoHandle playMovie(uint16 id, int16 x = -1, int16 y = -1, bool loop = false);
+ bool updateMovies();
void pauseVideos();
void resumeVideos();
void stopVideos();
@@ -90,12 +90,12 @@ public:
// Riven-related functions
void activateMLST(uint16 mlstId, uint16 card);
void clearMLST();
- void enableMovie(uint16 id);
- void disableMovie(uint16 id);
+ void enableMovieRiven(uint16 id);
+ void disableMovieRiven(uint16 id);
void disableAllMovies();
- VideoHandle playMovie(uint16 id);
- void stopMovie(uint16 id);
- void playMovieBlocking(uint16 id);
+ VideoHandle playMovieRiven(uint16 id);
+ void stopMovieRiven(uint16 id);
+ void playMovieBlockingRiven(uint16 id);
VideoHandle findVideoHandleRiven(uint16 id);
// Handle functions