diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/mididrv.h | 2 | ||||
-rw-r--r-- | sound/mods/infogrames.cpp | 4 | ||||
-rw-r--r-- | sound/mods/infogrames.h | 18 | ||||
-rw-r--r-- | sound/mods/paula.h | 6 | ||||
-rw-r--r-- | sound/mods/protracker.cpp | 2 |
5 files changed, 16 insertions, 16 deletions
diff --git a/sound/mididrv.h b/sound/mididrv.h index bf2b804e16..c908f55e4a 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -231,7 +231,7 @@ public: virtual void setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc) = 0; /** The time in microseconds between invocations of the timer callback. */ - virtual uint32 getBaseTempo(void) = 0; + virtual uint32 getBaseTempo() = 0; // Channel allocation functions virtual MidiChannel *allocateChannel() = 0; diff --git a/sound/mods/infogrames.cpp b/sound/mods/infogrames.cpp index 62c66d7765..9d3d6b8562 100644 --- a/sound/mods/infogrames.cpp +++ b/sound/mods/infogrames.cpp @@ -103,7 +103,7 @@ bool Infogrames::Instruments::load(Common::SeekableReadStream &ins) { return true; } -void Infogrames::Instruments::unload(void) { +void Infogrames::Instruments::unload() { if (_sampleData) delete[] _sampleData; init(); @@ -252,7 +252,7 @@ bool Infogrames::load(Common::SeekableReadStream &dum) { return true; } -void Infogrames::unload(void) { +void Infogrames::unload() { stopPlay(); delete[] _data; diff --git a/sound/mods/infogrames.h b/sound/mods/infogrames.h index 56473e5d84..169a590c7a 100644 --- a/sound/mods/infogrames.h +++ b/sound/mods/infogrames.h @@ -51,9 +51,9 @@ public: bool load(Common::SeekableReadStream &ins); bool load(const char *ins); - void unload(void); + void unload(); - uint8 getCount(void) const { return _count; } + uint8 getCount() const { return _count; } protected: struct Sample { @@ -75,14 +75,14 @@ public: int interruptFreq = 0); ~Infogrames(); - Instruments *getInstruments(void) const { return _instruments; } - bool getRepeating(void) const { return _repCount != 0; } + Instruments *getInstruments() const { return _instruments; } + bool getRepeating() const { return _repCount != 0; } void setRepeating (int32 repCount) { _repCount = repCount; } bool load(Common::SeekableReadStream &dum); bool load(const char *dum); - void unload(void); - void restart(void) { + void unload(); + void restart() { if (_data) { // Use the mutex here to ensure we do not call init() // while data is being read by the mixer thread. @@ -135,11 +135,11 @@ protected: uint8 flags; // 0: Need init, 5: Loop cmdBlocks, 6: Ignore channel } _chn[4]; - void init(void); - void reset(void); + void init(); + void reset(); void getNextSample(Channel &chn); int16 tune(Slide &slide, int16 start) const; - virtual void interrupt(void); + virtual void interrupt(); }; } // End of namespace Audio diff --git a/sound/mods/paula.h b/sound/mods/paula.h index 647dc5fe56..7ed8ceaeca 100644 --- a/sound/mods/paula.h +++ b/sound/mods/paula.h @@ -65,8 +65,8 @@ public: } void clearVoice(byte voice); void clearVoices() { for (int i = 0; i < NUM_VOICES; ++i) clearVoice(i); } - void startPlay(void) { _playing = true; } - void stopPlay(void) { _playing = false; } + void startPlay() { _playing = true; } + void stopPlay() { _playing = false; } void pausePlay(bool pause) { _playing = !pause; } // AudioStream API @@ -91,7 +91,7 @@ protected: bool _end; Common::Mutex _mutex; - virtual void interrupt(void) = 0; + virtual void interrupt() = 0; void startPaula() { _playing = true; diff --git a/sound/mods/protracker.cpp b/sound/mods/protracker.cpp index 45180f3057..f86ac254a8 100644 --- a/sound/mods/protracker.cpp +++ b/sound/mods/protracker.cpp @@ -398,7 +398,7 @@ void ProtrackerStream::updateEffects() { } } -void ProtrackerStream::interrupt(void) { +void ProtrackerStream::interrupt() { int track; for (track = 0; track < 4; track++) { |