[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_player.cpp,NONE,2.1 imuse_internal.h,NONE,2.1 imuse.cpp,2.50,2.51
Jamieson Christian
jamieson630 at users.sourceforge.net
Thu May 22 09:16:14 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv12945
Modified Files:
imuse.cpp
Added Files:
imuse_player.cpp imuse_internal.h
Log Message:
Separated IMuse Player into its own file
--- NEW FILE: imuse_player.cpp ---
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
* Copyright (C) 2001-2003 The ScummVM project
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v 2.1 2003/05/22 16:15:48 jamieson630 Exp $
[...1338 lines suppressed...]
return;
}
set_vol ((byte) value);
break;
case ParameterFader::pfSpeed:
// Speed.
set_speed ((byte) value);
break;
case ParameterFader::pfTranspose:
// FIXME: Is this really transpose?
set_transpose (0, value);
break;
}
if (ptr->current_time >= ptr->total_time)
ptr->param = 0;
}
}
--- NEW FILE: imuse_internal.h ---
/* ScummVM - Scumm Interpreter
* Copyright (C) 2001 Ludvig Strigeus
* Copyright (C) 2001-2003 The ScummVM project
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Header: /cvsroot/scummvm/scummvm/scumm/imuse_internal.h,v 2.1 2003/05/22 16:15:48 jamieson630 Exp $
*/
#ifndef DEFINED_IMUSE_INTERNAL
#define DEFINED_IMUSE_INTERNAL
#include "common/scummsys.h"
#include "instrument.h"
struct HookDatas;
struct ParameterFader;
struct DeferredCommand;
struct ImTrigger;
struct SustainingNotes;
struct CommandQueue;
struct IsNoteCmdData;
struct Player;
struct Part;
class IMuseInternal;
// Some entities also referenced
class MidiDriver;
class MidiChannel;
class Scumm;
class OSystem;
//////////////////////////////////////////////////
//
// Some constants
//
//////////////////////////////////////////////////
#define TICKS_PER_BEAT 480
#define IMUSE_SYSEX_ID 0x7D
#define ROLAND_SYSEX_ID 0x41
#define PERCUSSION_CHANNEL 9
#define TRIGGER_ID 0
#define COMMAND_ID 1
#define MDPG_TAG "MDpg"
#define MDHD_TAG "MDhd"
////////////////////////////////////////
//
// Helper functions
//
////////////////////////////////////////
static int clamp(int val, int min, int max) {
if (val < min)
return min;
if (val > max)
return max;
return val;
}
static int transpose_clamp(int a, int b, int c) {
if (b > a)
a += (b - a + 11) / 12 * 12;
if (c < a)
a -= (a - c + 11) / 12 * 12;
return a;
}
//////////////////////////////////////////////////
//
// Entity declarations
//
//////////////////////////////////////////////////
struct HookDatas {
byte _jump[2];
byte _transpose;
byte _part_onoff[16];
byte _part_volume[16];
byte _part_program[16];
byte _part_transpose[16];
int query_param(int param, byte chan);
int set(byte cls, byte value, byte chan);
};
struct ParameterFader {
enum {
pfVolume = 1,
pfTranspose = 3,
pfSpeed = 4
};
int param;
int start;
int end;
uint32 total_time;
uint32 current_time;
ParameterFader() { param = 0; }
void init() { param = 0; }
};
struct DeferredCommand {
MidiDriver *midi;
uint32 time_left;
int a, b, c, d, e, f;
};
struct ImTrigger {
int sound;
byte id;
uint16 expire;
byte command [4];
};
struct SustainingNotes {
SustainingNotes *next;
SustainingNotes *prev;
Player *player;
byte note, chan;
uint32 off_pos;
uint32 pos;
uint16 counter;
};
struct CommandQueue {
uint16 array[8];
};
struct IsNoteCmdData {
byte chan;
byte note;
byte vel;
};
struct Player {
IMuseInternal *_se;
MidiDriver *_midi;
Part *_parts;
bool _active;
bool _scanning;
int _id;
byte _priority;
byte _volume;
int8 _pan;
int8 _transpose;
int8 _detune;
uint _vol_chan;
byte _vol_eff;
uint _song_index;
uint _track_index;
uint _timer_counter;
uint _loop_to_beat;
uint _loop_from_beat;
uint _loop_counter;
uint _loop_to_tick;
uint _loop_from_tick;
uint32 _tempo;
uint32 _tempo_eff; // No Save
uint32 _cur_pos;
uint32 _next_pos;
uint32 _song_offset;
uint32 _timer_speed; // No Save
uint _tick_index;
uint _beat_index;
uint _ticks_per_beat;
byte _speed; // No Save
bool _abort;
HookDatas _hook;
ParameterFader _parameterFaders[4];
bool _mt32emulate;
bool _isGM;
// Player part
void hook_clear();
void clear();
bool startSound (int sound, MidiDriver *midi);
void uninit_parts();
byte *parse_midi(byte *s);
void key_off(uint8 chan, byte data);
void key_on(uint8 chan, byte data, byte velocity);
void part_set_transpose(uint8 chan, byte relative, int8 b);
void parse_sysex(byte *p, uint len);
void maybe_jump (byte cmd, uint track, uint beat, uint tick);
void maybe_set_transpose(byte *data);
void maybe_part_onoff(byte *data);
void maybe_set_volume(byte *data);
void maybe_set_program(byte *data);
void maybe_set_transpose_part(byte *data);
uint update_actives();
Part *get_part(uint8 part);
void turn_off_pedals();
int set_vol(byte vol);
int get_param(int param, byte chan);
int query_part_param(int param, byte chan);
int set_transpose(byte relative, int b);
void set_priority(int pri);
void set_pan(int pan);
void set_detune(int detune);
void turn_off_parts();
void play_active_notes();
void cancel_volume_fade();
int addParameterFader (int param, int target, int time);
void transitionParameters();
static void decode_sysex_bytes(byte *src, byte *dst, int len);
void clear_active_note(int chan, byte note);
void set_active_note(int chan, byte note);
void clear_active_notes();
// Sequencer part
bool set_loop(uint count, uint tobeat, uint totick, uint frombeat, uint fromtick);
void clear_loop();
void set_speed(byte speed);
bool jump(uint track, uint beat, uint tick);
void uninit_seq();
void set_tempo(uint32 data);
int start_seq_sound(int sound);
void find_sustaining_notes(byte *a, byte *b, uint32 l);
int scan(uint totrack, uint tobeat, uint totick);
int query_param(int param);
bool is_fading_out();
void sequencer_timer();
Player() {
memset(this,0,sizeof(Player));
}
};
struct Part {
int _slot;
Part *_next, *_prev;
MidiChannel *_mc;
Player *_player;
int16 _pitchbend;
byte _pitchbend_factor;
int8 _transpose, _transpose_eff;
byte _vol, _vol_eff;
int8 _detune, _detune_eff;
int8 _pan, _pan_eff;
bool _on;
byte _modwheel;
bool _pedal;
int8 _pri;
byte _pri_eff;
byte _chan;
byte _effect_level;
byte _chorus;
byte _percussion;
byte _bank;
// New abstract instrument definition
Instrument _instrument;
bool _unassigned_instrument; // For diagnostic reporting purposes only
// Used to be in MidiDriver
uint16 _actives[8];
void key_on(byte note, byte velocity);
void key_off(byte note);
void set_param(byte param, int value) { }
void init();
void setup(Player *player);
void uninit();
void off();
void silence();
void set_instrument(uint b);
void set_instrument(byte *data);
void load_global_instrument (byte b);
void set_transpose(int8 transpose);
void set_vol(uint8 volume);
void set_detune(int8 detune);
void set_pri(int8 pri);
void set_pan(int8 pan);
void set_modwheel(uint value);
void set_pedal(bool value);
void set_pitchbend(int value);
void release_pedal();
void set_program(byte program);
void set_chorus(uint chorus);
void set_effect_level(uint level);
int update_actives(uint16 *active);
void set_pitchbend_factor(uint8 value);
void set_onoff(bool on);
void fix_after_load();
void sendAll();
bool clearToTransmit();
Part() {
memset(this,0,sizeof(Part));
}
};
// WARNING: This is the internal variant of the IMUSE class.
// imuse.h contains a public version of the same class.
// the public version, only contains a set of methods.
class IMuseInternal {
friend struct Player;
private:
bool _old_adlib_instruments;
bool _enable_multi_midi;
MidiDriver *_midi_adlib;
MidiDriver *_midi_native;
byte **_base_sounds;
private:
bool _paused;
bool _initialized;
int _tempoFactor;
uint _queue_end, _queue_pos, _queue_sound;
byte _queue_adding;
SustainingNotes *_sustain_notes_used;
SustainingNotes *_sustain_notes_free;
SustainingNotes *_sustain_notes_head;
byte _queue_marker;
byte _queue_cleared;
byte _master_volume; // Master volume. 0-255
byte _music_volume; // Global music volume. 0-255
uint16 _trigger_count;
ImTrigger _snm_triggers[16]; // Sam & Max triggers
uint16 _snm_trigger_index;
uint16 _channel_volume[8];
uint16 _channel_volume_eff[8]; // No Save
uint16 _volchan_table[8];
Player _players[8];
SustainingNotes _sustaining_notes[24];
Part _parts[32];
uint16 _active_notes[128];
Instrument _global_adlib_instruments[32];
CommandQueue _cmd_queue[64];
DeferredCommand _deferredCommands[4];
byte *findTag(int sound, char *tag, int index);
bool isMT32(int sound);
bool isGM(int sound);
int get_queue_sound_status(int sound);
void handle_marker(uint id, byte data);
int get_channel_volume(uint a);
void initMidiDriver (MidiDriver *midi);
void init_players();
void init_parts();
void init_sustaining_notes();
void init_queue();
void sequencer_timers (MidiDriver *midi);
void expire_sustain_notes (MidiDriver *midi);
MidiDriver *getBestMidiDriver (int sound);
Player *allocate_player(byte priority);
Part *allocate_part(byte pri, MidiDriver *midi);
int32 ImSetTrigger (int sound, int id, int a, int b, int c, int d);
int32 ImClearTrigger (int sound, int id);
int32 ImFireAllTriggers (int sound);
void addDeferredCommand (int time, int a, int b, int c, int d, int e, int f);
void handleDeferredCommands (MidiDriver *midi);
int enqueue_command(int a, int b, int c, int d, int e, int f, int g);
int enqueue_trigger(int sound, int marker);
int query_queue(int param);
Player *get_player_byid(int id);
int get_volchan_entry(uint a);
int set_volchan_entry(uint a, uint b);
int set_channel_volume(uint chan, uint vol);
void update_volumes();
void reset_tick();
int set_volchan(int sound, int volchan);
void fix_parts_after_load();
void fix_players_after_load(Scumm *scumm);
static int saveReference(void *me_ref, byte type, void *ref);
static void *loadReference(void *me_ref, byte type, int ref);
static void midiTimerCallback (void *data);
public:
IMuseInternal() {
memset(this,0,sizeof(IMuseInternal));
}
~IMuseInternal();
int initialize(OSystem *syst, MidiDriver *midi);
void reallocateMidiChannels (MidiDriver *midi);
void setGlobalAdlibInstrument (byte slot, byte *data);
void copyGlobalAdlibInstrument (byte slot, Instrument *dest);
// IMuse interface
void on_timer (MidiDriver *midi);
void pause(bool paused);
int terminate();
int save_or_load(Serializer *ser, Scumm *scumm);
int set_music_volume(uint vol);
int get_music_volume();
int set_master_volume(uint vol);
int get_master_volume();
bool startSound(int sound);
int stopSound(int sound);
int stop_all_sounds();
int getSoundStatus(int sound);
bool get_sound_active(int sound);
int32 doCommand(int a, int b, int c, int d, int e, int f, int g, int h);
int clear_queue();
void setBase(byte **base);
uint32 property(int prop, uint32 value);
MidiDriver *getMidiDriver();
static IMuseInternal *create(OSystem *syst, MidiDriver *midi);
};
#endif
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.50
retrieving revision 2.51
diff -u -d -r2.50 -r2.51
--- imuse.cpp 21 May 2003 21:38:03 -0000 2.50
+++ imuse.cpp 22 May 2003 16:15:48 -0000 2.51
@@ -26,499 +26,13 @@
#include "scumm/instrument.h"
#include "scumm/saveload.h"
#include "common/util.h"
+#include "imuse_internal.h"
// Unremark this statement to activate some of
// the most common iMuse diagnostic messages.
// #define IMUSE_DEBUG
-//
-// Some constants
[...1745 lines suppressed...]
- break;
-
- case ParameterFader::pfTranspose:
- // FIXME: Is this really transpose?
- set_transpose (0, value);
- break;
- }
-
- if (ptr->current_time >= ptr->total_time)
- ptr->param = 0;
- }
-}
-
+////////////////////////////////////////////////////////////
+//
+// IMuseInternal load/save implementation
+//
////////////////////////////////////////////////////////////
enum {
More information about the Scummvm-git-logs
mailing list