aboutsummaryrefslogtreecommitdiff
path: root/engines/lab/labfun.h
diff options
context:
space:
mode:
authorStrangerke2015-11-30 02:14:49 +0100
committerWillem Jan Palenstijn2015-12-23 21:33:44 +0100
commit17678103db3fcfc6b49dfad44a46cb63bc1e4945 (patch)
treeca78280593cb6b974337e4d14aea5f689ac15ba8 /engines/lab/labfun.h
parent11df8b5cf76bf9e3bbdbb5b264ec318d0e7e2911 (diff)
downloadscummvm-rg350-17678103db3fcfc6b49dfad44a46cb63bc1e4945.tar.gz
scummvm-rg350-17678103db3fcfc6b49dfad44a46cb63bc1e4945.tar.bz2
scummvm-rg350-17678103db3fcfc6b49dfad44a46cb63bc1e4945.zip
LAB: Move Music declaration to a separate header file
Diffstat (limited to 'engines/lab/labfun.h')
-rw-r--r--engines/lab/labfun.h54
1 files changed, 0 insertions, 54 deletions
diff --git a/engines/lab/labfun.h b/engines/lab/labfun.h
index 77a259a470..7fffb1b840 100644
--- a/engines/lab/labfun.h
+++ b/engines/lab/labfun.h
@@ -150,60 +150,6 @@ Common::File *openPartial(const char *name);
void closePartial(int32 File);
/*---------------------------*/
-/*----- From LabMusic.c -----*/
-/*---------------------------*/
-
-#define MAXBUFFERS 5L
-
-class Music {
-public:
- Music(LabEngine *vm);
-
- byte **newOpen(const char *name);
- byte **newOpen(const char *name, uint32 &size);
- bool initMusic();
- void freeMusic();
- void updateMusic();
- uint16 getPlayingBufferCount();
- void closeMusic();
- void setMusic(bool on);
- void resumeBackMusic();
- void pauseBackMusic();
- void changeMusic(const char *newmusic);
- void checkRoomMusic();
- void resetMusic();
- void setMusicReset(bool reset) { _doReset = reset; }
- void playSoundEffect(uint16 SampleSpeed, uint32 Length, void *Data);
- void stopSoundEffect();
- bool isSoundEffectActive() const;
-
- bool _winmusic, _doNotFilestopSoundEffect;
- bool _musicOn;
- bool _loopSoundEffect;
- bool _waitTillFinished;
- uint16 _lastMusicRoom ;
- bool _doReset;
-
-private:
- LabEngine *_vm;
- void fillbuffer(byte *musicBuffer);
- void startMusic(bool startatbegin);
-
- Common::File *_file;
- Common::File *_tFile;
- bool _musicPaused;
-
- bool _tMusicOn;
- uint32 _tLeftInFile;
- uint32 _leftinfile;
-
- Audio::SoundHandle _musicHandle;
- Audio::SoundHandle _sfxHandle;
-
- Audio::QueuingAudioStream *_queuingAudioStream;
-};
-
-/*---------------------------*/
/*----- From LabSets.c ------*/
/*---------------------------*/