From c5539b4e4e948825c0116194e06ddf3dbde3ed17 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 26 May 2009 11:35:35 +0000 Subject: SCI: Preparing to transform sfx_player_t into a class svn-id: r40911 --- engines/sci/sfx/player.h | 4 +- engines/sci/sfx/player/new_player.cpp | 250 +++++++++++++++++++++++++++++++++ engines/sci/sfx/player/new_player.h | 37 +++++ engines/sci/sfx/player/player.cpp | 251 ---------------------------------- engines/sci/sfx/player/players.cpp | 56 -------- engines/sci/sfx/player/polled.cpp | 4 +- engines/sci/sfx/player/polled.h | 37 +++++ engines/sci/sfx/player/realtime.cpp | 4 +- engines/sci/sfx/player/realtime.h | 37 +++++ 9 files changed, 365 insertions(+), 315 deletions(-) create mode 100644 engines/sci/sfx/player/new_player.cpp create mode 100644 engines/sci/sfx/player/new_player.h delete mode 100644 engines/sci/sfx/player/player.cpp delete mode 100644 engines/sci/sfx/player/players.cpp create mode 100644 engines/sci/sfx/player/polled.h create mode 100644 engines/sci/sfx/player/realtime.h (limited to 'engines/sci/sfx') diff --git a/engines/sci/sfx/player.h b/engines/sci/sfx/player.h index e2bf952d28..5a5da2c673 100644 --- a/engines/sci/sfx/player.h +++ b/engines/sci/sfx/player.h @@ -28,11 +28,11 @@ #ifndef SCI_SFX_SFX_PLAYER_H #define SCI_SFX_SFX_PLAYER_H +#include "common/scummsys.h" + #include "sci/resource.h" #include "sci/sfx/iterator.h" -#include "common/scummsys.h" - namespace Sci { typedef void tell_synth_func(int buf_nr, byte *buf); diff --git a/engines/sci/sfx/player/new_player.cpp b/engines/sci/sfx/player/new_player.cpp new file mode 100644 index 0000000000..deb4d06d34 --- /dev/null +++ b/engines/sci/sfx/player/new_player.cpp @@ -0,0 +1,250 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +#include "sci/tools.h" +#include "sci/sfx/player/new_player.h" +#include "sci/sfx/sequencer.h" +#include "sci/sfx/iterator.h" +#include "sci/sfx/core.h" + +#include "common/system.h" + +#include "sci/sfx/softseq/pcjr.h" +#include "sci/sfx/softseq/adlib.h" + +namespace Sci { + +static MidiPlayer *mididrv; + +static SongIterator *play_it = NULL; +static Audio::Timestamp wakeup_time; +static Audio::Timestamp current_time; +static uint32 play_pause_diff; + +static int play_paused = 0; +static int play_it_done = 0; +static uint32 tempo; + +static Common::Mutex *mutex; +static int volume = 15; + +static void play_song(SongIterator *it) { + while (play_it && wakeup_time.msecsDiff(current_time) <= 0) { + int delay; + byte buf[8]; + int result; + + switch ((delay = songit_next(&(play_it), + buf, &result, + IT_READER_MASK_ALL + | IT_READER_MAY_FREE + | IT_READER_MAY_CLEAN))) { + + case SI_FINISHED: + delete play_it; + play_it = NULL; + play_it_done = 1; + return; + + case SI_IGNORE: + case SI_LOOP: + case SI_RELATIVE_CUE: + case SI_ABSOLUTE_CUE: + break; + + case SI_PCM: + sfx_play_iterator_pcm(play_it, 0); + break; + + case 0: + static_cast(mididrv)->send(buf[0], buf[1], buf[2]); + + break; + + default: + wakeup_time = wakeup_time.addFrames(delay); + } + } +} + +static void player_tell_synth(int buf_nr, byte *buf) { + byte op1 = (buf_nr < 2 ? 0 : buf[1]); + byte op2 = (buf_nr < 3 ? 0 : buf[2]); + + static_cast(mididrv)->send(buf[0], op1, op2); +} + +static void player_timer_callback(void *refCon) { + mutex->lock(); + if (play_it && !play_it_done && !play_paused) { + play_song(play_it); + } + + current_time = current_time.addFrames(1); + mutex->unlock(); +} + +static void player_void_callback(void) { +} + +/* API implementation */ + +static Common::Error player_set_option(char *name, char *value) { + return Common::kUnknownError; +} + +static Common::Error player_init(ResourceManager *resmgr, int expected_latency) { + MidiDriverType musicDriver = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_ADLIB); + + switch(musicDriver) { + case MD_ADLIB: + mididrv = new MidiPlayer_Adlib(); + break; + case MD_PCJR: + mididrv = new MidiPlayer_PCJr(); + break; + case MD_PCSPK: + mididrv = new MidiPlayer_PCSpeaker(); + break; + default: + break; + } + + assert(mididrv); + + sfx_new_player.polyphony = mididrv->getPolyphony(); + + tempo = mididrv->getBaseTempo(); + uint32 time = g_system->getMillis(); + current_time = Audio::Timestamp(time, 1000000 / tempo); + wakeup_time = Audio::Timestamp(time, SFX_TICKS_PER_SEC); + + mutex = new Common::Mutex(); + + mididrv->setTimerCallback(NULL, player_timer_callback); + mididrv->open(resmgr); + mididrv->setVolume(volume); + + return Common::kNoError; +} + +static Common::Error player_add_iterator(SongIterator *it, uint32 start_time) { + mutex->lock(); + SIMSG_SEND(it, SIMSG_SET_PLAYMASK(mididrv->getPlayMask())); + SIMSG_SEND(it, SIMSG_SET_RHYTHM(mididrv->hasRhythmChannel())); + + if (play_it == NULL) { + // Resync with clock + current_time = Audio::Timestamp(g_system->getMillis(), 1000000 / tempo); + wakeup_time = Audio::Timestamp(start_time, SFX_TICKS_PER_SEC); + } + + play_it = sfx_iterator_combine(play_it, it); + play_it_done = 0; + mutex->unlock(); + + return Common::kNoError; +} + +static Common::Error player_fade_out(void) { + warning("Attempt to fade out - not implemented yet"); + return Common::kUnknownError; +} + +static Common::Error player_stop(void) { + debug(3, "Player: Stopping song iterator %p", (void *)play_it); + mutex->lock(); + delete play_it; + play_it = NULL; + for (int i = 0; i < MIDI_CHANNELS; i++) + static_cast(mididrv)->send(0xb0 + i, SCI_MIDI_CHANNEL_NOTES_OFF, 0); + mutex->unlock(); + + return Common::kNoError; +} + +static Common::Error player_send_iterator_message(const SongIterator::Message &msg) { + mutex->lock(); + if (!play_it) { + mutex->unlock(); + return Common::kUnknownError; + } + + songit_handle_message(&play_it, msg); + mutex->unlock(); + + return Common::kNoError; +} + +static Common::Error player_pause(void) { + mutex->lock(); + play_paused = 1; + play_pause_diff = wakeup_time.msecsDiff(current_time); + + mididrv->playSwitch(false); + mutex->unlock(); + + return Common::kNoError; +} + +static Common::Error player_resume(void) { + mutex->lock(); + wakeup_time = Audio::Timestamp(current_time.msecs() + play_pause_diff, SFX_TICKS_PER_SEC); + mididrv->playSwitch(true); + play_paused = 0; + mutex->unlock(); + + return Common::kNoError; +} + +static Common::Error player_exit(void) { + mididrv->close(); + delete mididrv; + delete mutex; + delete play_it; + play_it = NULL; + + return Common::kNoError; +} + +sfx_player_t sfx_new_player = { + "new", + "0.1", + &player_set_option, + &player_init, + &player_add_iterator, + &player_fade_out, + &player_stop, + &player_send_iterator_message, + &player_pause, + &player_resume, + &player_exit, + &player_void_callback, + &player_tell_synth, + 0 /* polyphony */ +}; + +} // End of namespace Sci + diff --git a/engines/sci/sfx/player/new_player.h b/engines/sci/sfx/player/new_player.h new file mode 100644 index 0000000000..79c6d93acd --- /dev/null +++ b/engines/sci/sfx/player/new_player.h @@ -0,0 +1,37 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +#ifndef SCI_SFX_SFX_PLAYER_NEW_H +#define SCI_SFX_SFX_PLAYER_NEW_H + +#include "sci/sfx/player.h" + +namespace Sci { + +extern sfx_player_t sfx_new_player; + +} // End of namespace Sci + +#endif diff --git a/engines/sci/sfx/player/player.cpp b/engines/sci/sfx/player/player.cpp deleted file mode 100644 index 5c811f8ab8..0000000000 --- a/engines/sci/sfx/player/player.cpp +++ /dev/null @@ -1,251 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#include "sci/tools.h" -#include "sci/sfx/player.h" -#include "sci/sfx/sequencer.h" -#include "sci/sfx/iterator.h" -#include "sci/sfx/core.h" - -#include "common/system.h" - -#include "sci/sfx/softseq/pcjr.h" -#include "sci/sfx/softseq/adlib.h" - -namespace Sci { - -extern sfx_player_t sfx_player_player; -static MidiPlayer *mididrv; - -static SongIterator *play_it = NULL; -static Audio::Timestamp wakeup_time; -static Audio::Timestamp current_time; -static uint32 play_pause_diff; - -static int play_paused = 0; -static int play_it_done = 0; -static uint32 tempo; - -static Common::Mutex *mutex; -static int volume = 15; - -static void play_song(SongIterator *it) { - while (play_it && wakeup_time.msecsDiff(current_time) <= 0) { - int delay; - byte buf[8]; - int result; - - switch ((delay = songit_next(&(play_it), - buf, &result, - IT_READER_MASK_ALL - | IT_READER_MAY_FREE - | IT_READER_MAY_CLEAN))) { - - case SI_FINISHED: - delete play_it; - play_it = NULL; - play_it_done = 1; - return; - - case SI_IGNORE: - case SI_LOOP: - case SI_RELATIVE_CUE: - case SI_ABSOLUTE_CUE: - break; - - case SI_PCM: - sfx_play_iterator_pcm(play_it, 0); - break; - - case 0: - static_cast(mididrv)->send(buf[0], buf[1], buf[2]); - - break; - - default: - wakeup_time = wakeup_time.addFrames(delay); - } - } -} - -static void player_tell_synth(int buf_nr, byte *buf) { - byte op1 = (buf_nr < 2 ? 0 : buf[1]); - byte op2 = (buf_nr < 3 ? 0 : buf[2]); - - static_cast(mididrv)->send(buf[0], op1, op2); -} - -static void player_timer_callback(void *refCon) { - mutex->lock(); - if (play_it && !play_it_done && !play_paused) { - play_song(play_it); - } - - current_time = current_time.addFrames(1); - mutex->unlock(); -} - -static void player_void_callback(void) { -} - -/* API implementation */ - -static Common::Error player_set_option(char *name, char *value) { - return Common::kUnknownError; -} - -static Common::Error player_init(ResourceManager *resmgr, int expected_latency) { - MidiDriverType musicDriver = MidiDriver::detectMusicDriver(MDT_PCSPK | MDT_ADLIB); - - switch(musicDriver) { - case MD_ADLIB: - mididrv = new MidiPlayer_Adlib(); - break; - case MD_PCJR: - mididrv = new MidiPlayer_PCJr(); - break; - case MD_PCSPK: - mididrv = new MidiPlayer_PCSpeaker(); - break; - default: - break; - } - - assert(mididrv); - - sfx_player_player.polyphony = mididrv->getPolyphony(); - - tempo = mididrv->getBaseTempo(); - uint32 time = g_system->getMillis(); - current_time = Audio::Timestamp(time, 1000000 / tempo); - wakeup_time = Audio::Timestamp(time, SFX_TICKS_PER_SEC); - - mutex = new Common::Mutex(); - - mididrv->setTimerCallback(NULL, player_timer_callback); - mididrv->open(resmgr); - mididrv->setVolume(volume); - - return Common::kNoError; -} - -static Common::Error player_add_iterator(SongIterator *it, uint32 start_time) { - mutex->lock(); - SIMSG_SEND(it, SIMSG_SET_PLAYMASK(mididrv->getPlayMask())); - SIMSG_SEND(it, SIMSG_SET_RHYTHM(mididrv->hasRhythmChannel())); - - if (play_it == NULL) { - // Resync with clock - current_time = Audio::Timestamp(g_system->getMillis(), 1000000 / tempo); - wakeup_time = Audio::Timestamp(start_time, SFX_TICKS_PER_SEC); - } - - play_it = sfx_iterator_combine(play_it, it); - play_it_done = 0; - mutex->unlock(); - - return Common::kNoError; -} - -static Common::Error player_fade_out(void) { - warning("Attempt to fade out - not implemented yet"); - return Common::kUnknownError; -} - -static Common::Error player_stop(void) { - debug(3, "Player: Stopping song iterator %p", (void *)play_it); - mutex->lock(); - delete play_it; - play_it = NULL; - for (int i = 0; i < MIDI_CHANNELS; i++) - static_cast(mididrv)->send(0xb0 + i, SCI_MIDI_CHANNEL_NOTES_OFF, 0); - mutex->unlock(); - - return Common::kNoError; -} - -static Common::Error player_send_iterator_message(const SongIterator::Message &msg) { - mutex->lock(); - if (!play_it) { - mutex->unlock(); - return Common::kUnknownError; - } - - songit_handle_message(&play_it, msg); - mutex->unlock(); - - return Common::kNoError; -} - -static Common::Error player_pause(void) { - mutex->lock(); - play_paused = 1; - play_pause_diff = wakeup_time.msecsDiff(current_time); - - mididrv->playSwitch(false); - mutex->unlock(); - - return Common::kNoError; -} - -static Common::Error player_resume(void) { - mutex->lock(); - wakeup_time = Audio::Timestamp(current_time.msecs() + play_pause_diff, SFX_TICKS_PER_SEC); - mididrv->playSwitch(true); - play_paused = 0; - mutex->unlock(); - - return Common::kNoError; -} - -static Common::Error player_exit(void) { - mididrv->close(); - delete mididrv; - delete mutex; - delete play_it; - play_it = NULL; - - return Common::kNoError; -} - -sfx_player_t sfx_player_player = { - "new", - "0.1", - &player_set_option, - &player_init, - &player_add_iterator, - &player_fade_out, - &player_stop, - &player_send_iterator_message, - &player_pause, - &player_resume, - &player_exit, - &player_void_callback, - &player_tell_synth, - 0 /* polyphony */ -}; - -} // End of namespace Sci - diff --git a/engines/sci/sfx/player/players.cpp b/engines/sci/sfx/player/players.cpp deleted file mode 100644 index d84d9cdd33..0000000000 --- a/engines/sci/sfx/player/players.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - * - */ - -#include "sci/sfx/player.h" - -namespace Sci { - -extern sfx_player_t sfx_player_realtime; -extern sfx_player_t sfx_player_polled; -extern sfx_player_t sfx_player_player; - -sfx_player_t *sfx_players[] = { - &sfx_player_player, - &sfx_player_polled, - &sfx_player_realtime, - NULL -}; - -sfx_player_t *sfx_find_player(char *name) { - if (!name) { - /* Implement platform policy here */ - - return sfx_players[0]; - } else { - int n = 0; - while (sfx_players[n] && - scumm_stricmp(sfx_players[n]->name, name)) - ++n; - - return sfx_players[n]; - } -} - -} // End of namespace Sci diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp index 842b7c5df5..a326eb508a 100644 --- a/engines/sci/sfx/player/polled.cpp +++ b/engines/sci/sfx/player/polled.cpp @@ -27,7 +27,7 @@ #include "common/util.h" #include "common/file.h" -#include "sci/sfx/player.h" +#include "sci/sfx/player/polled.h" #include "sci/sfx/softseq.h" #include "sci/sfx/iterator.h" @@ -253,8 +253,6 @@ static int ppf_poll(int frame_size, byte *dest, int size) { return size; /* Apparently, we wrote all that was requested */ } -extern sfx_player_t sfx_player_polled; - /*=======================*/ /* Player implementation */ /*=======================*/ diff --git a/engines/sci/sfx/player/polled.h b/engines/sci/sfx/player/polled.h new file mode 100644 index 0000000000..9a1e31e44b --- /dev/null +++ b/engines/sci/sfx/player/polled.h @@ -0,0 +1,37 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +#ifndef SCI_SFX_SFX_PLAYER_POLLED_H +#define SCI_SFX_SFX_PLAYER_POLLED_H + +#include "sci/sfx/player.h" + +namespace Sci { + +extern sfx_player_t sfx_player_polled; + +} // End of namespace Sci + +#endif diff --git a/engines/sci/sfx/player/realtime.cpp b/engines/sci/sfx/player/realtime.cpp index b279e91908..08c355388b 100644 --- a/engines/sci/sfx/player/realtime.cpp +++ b/engines/sci/sfx/player/realtime.cpp @@ -28,7 +28,7 @@ ** enough, I guess. */ #include "sci/tools.h" -#include "sci/sfx/player.h" +#include "sci/sfx/player/realtime.h" #include "sci/sfx/sequencer.h" #include "sci/sfx/iterator.h" #include "sci/sfx/core.h" @@ -39,8 +39,6 @@ namespace Sci { static sfx_sequencer_t *seq; -extern sfx_player_t sfx_player_realtime; - /* Playing mechanism */ static inline int delta_time(const uint32 comp, const uint32 base) { diff --git a/engines/sci/sfx/player/realtime.h b/engines/sci/sfx/player/realtime.h new file mode 100644 index 0000000000..bdf2777708 --- /dev/null +++ b/engines/sci/sfx/player/realtime.h @@ -0,0 +1,37 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +#ifndef SCI_SFX_SFX_PLAYER_REALTIME_H +#define SCI_SFX_SFX_PLAYER_REALTIME_H + +#include "sci/sfx/player.h" + +namespace Sci { + +extern sfx_player_t sfx_player_realtime; + +} // End of namespace Sci + +#endif -- cgit v1.2.3