diff --git a/engines/chewy/globals.h b/engines/chewy/globals.h index 26c4aa3c1ee..75778b6bea6 100644 --- a/engines/chewy/globals.h +++ b/engines/chewy/globals.h @@ -161,7 +161,6 @@ public: int16 _talk_start_ani = -1; int16 _talk_hide_static = -1; - int16 _frequenz = 0; int16 _currentSong = -1; bool _savegameFlag = false; Common::Stream *_music_handle = nullptr; @@ -387,7 +386,6 @@ void var_init(); void new_game(); void sound_init(); -void sound_exit(); void show_intro(); void register_cutscene(int cutsceneNum); void getCutscenes(Common::Array &cutscenes); diff --git a/engines/chewy/inits.cpp b/engines/chewy/inits.cpp index 1baf976e837..08e50913e04 100644 --- a/engines/chewy/inits.cpp +++ b/engines/chewy/inits.cpp @@ -276,7 +276,6 @@ void init_load() { } void tidy() { - sound_exit(); free_buffers(); _G(obj)->free_inv_spr(&_G(inv_spr)[0]); @@ -315,13 +314,9 @@ void tidy() { _G(mem) = nullptr; } -#define GRAVIS 8 -#define RAP10 9 - void sound_init() { _G(spieler).SoundSwitch = false; _G(spieler).MusicSwitch = false; - _G(frequenz) = 22050; _G(sndPlayer)->initMixMode(); _G(spieler).MusicVol = 63; @@ -350,10 +345,6 @@ void sound_init() { _G(spieler).SpeechSwitch = true; } -void sound_exit() { - _G(sndPlayer)->exitMixMode(); -} - void show_intro() { if (!ConfMan.getBool("shown_intro")) { ConfMan.setBool("shown_intro", true); diff --git a/engines/chewy/sound_player.cpp b/engines/chewy/sound_player.cpp index 848d6113053..bab185618ed 100644 --- a/engines/chewy/sound_player.cpp +++ b/engines/chewy/sound_player.cpp @@ -182,19 +182,6 @@ void SoundPlayer::initMixMode() { StereoPos[3] = 90; } -void SoundPlayer::exitMixMode() { - warning("STUB: ailclass::exitMixMode()"); - -#if 0 - if (SoundEnable) { - if (TimerEnabled) { - AIL_stop_timer(TimerHandle); - AIL_release_timer_handle(TimerHandle); - } - } -#endif -} - void SoundPlayer::playMod(TmfHeader *th) { char *tmp; int16 i; @@ -301,7 +288,6 @@ void mod_irq() { if (!InInterrupt) { ++InInterrupt; if (MusicStatus == ON) { - checkSampleEnd(); if (PatternCount <= 0) { PatternCount = CurrentTempo; DecodePatternLine(); @@ -341,31 +327,6 @@ void mod_irq() { --InInterrupt; } -void checkSampleEnd() { - warning("STUB: ailclass::checkSampleEnd()"); - -#if 0 - int16 i; - for (i = 0; i < 4; i++) { - if (AIL_sample_status(smp[i]) != SMP_PLAYING) { - if (Instrument[i].replen >= 10) { - AIL_init_sample(smp[i]); - AIL_set_sample_type(smp[i], DIG_F_MONO_8, 0); - AIL_set_sample_address(smp[i], Sample[i] + - Instrument[i].repstart, - Instrument[i].replen); - AIL_set_sample_playback_rate(smp[i], InsFreq[i]); - if ((byte)Instrument[i].insvol > (byte)(MusicMasterVol)) - Instrument[i].insvol = (byte)MusicMasterVol; - AIL_set_sample_volume(smp[i], Instrument[i].insvol); - AIL_set_sample_pan(smp[i], StereoPos[i]); - AIL_start_sample(smp[i]); - } - } - } -#endif -} - void DecodePatternLine() { DecodeChannel(0); DecodeChannel(1); diff --git a/engines/chewy/sound_player.h b/engines/chewy/sound_player.h index f2e36d7aaad..f3b4dcef5f5 100644 --- a/engines/chewy/sound_player.h +++ b/engines/chewy/sound_player.h @@ -28,7 +28,6 @@ namespace Chewy { void mod_irq(); -void checkSampleEnd(); void DecodePatternLine(); void DecodeChannel(int16 ch); @@ -42,7 +41,6 @@ public: void initNoteTable(uint16 sfreq); void initMixMode(); - void exitMixMode(); void playMod(TmfHeader *th); void stopMod(); void continueMusic();