[Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.52,1.53 windows.cpp,1.13,1.14 ym2612.cpp,1.20,1.21
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sat Nov 8 14:58:17 CET 2003
Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1:/tmp/cvs-serv31968/midi
Modified Files:
adlib.cpp windows.cpp ym2612.cpp
Log Message:
cleanup whitespaces
Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/adlib.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- adlib.cpp 18 Oct 2003 13:04:59 -0000 1.52
+++ adlib.cpp 8 Nov 2003 22:57:42 -0000 1.53
@@ -25,7 +25,7 @@
#include "common/util.h"
#define BASE_FREQ 250
-#define FIXP_SHIFT 16
+#define FIXP_SHIFT 16
#ifdef DEBUG_ADLIB
static int tick;
@@ -96,7 +96,7 @@
_pedal = 0;
_program = 0;
_pri_eff = 0;
-
+
_owner = 0;
_allocated = false;
_channel = 0;
@@ -619,7 +619,7 @@
static void link_mc(AdlibPart *part, AdlibVoice *voice);
void mc_inc_stuff(AdlibVoice *voice, Struct10 * s10, Struct11 * s11);
void mc_init_stuff(AdlibVoice *voice, Struct10 * s10, Struct11 * s11, byte flags,
- InstrumentExtra * ie);
+ InstrumentExtra * ie);
void struct10_init(Struct10 * s10, InstrumentExtra * ie);
static byte struct10_ontimer(Struct10 * s10, Struct11 * s11);
@@ -680,7 +680,7 @@
_pitchbend = bend;
for (voice = _voice; voice; voice = voice->_next) {
_owner->adlib_note_on(voice->_channel, voice->_note + _transpose_eff,
- (_pitchbend * _pitchbend_factor >> 6) + _detune_eff);
+ (_pitchbend * _pitchbend_factor >> 6) + _detune_eff);
}
}
@@ -733,7 +733,7 @@
_pitchbend_factor = value;
for (voice = _voice; voice; voice = voice->_next) {
_owner->adlib_note_on(voice->_channel, voice->_note + _transpose_eff,
- (_pitchbend * _pitchbend_factor >> 6) + _detune_eff);
+ (_pitchbend * _pitchbend_factor >> 6) + _detune_eff);
}
}
@@ -743,7 +743,7 @@
_detune_eff = value;
for (voice = _voice; voice; voice = voice->_next) {
_owner->adlib_note_on(voice->_channel, voice->_note + _transpose_eff,
- (_pitchbend * _pitchbend_factor >> 6) + _detune_eff);
+ (_pitchbend * _pitchbend_factor >> 6) + _detune_eff);
}
}
@@ -820,7 +820,7 @@
_timer_proc = 0;
_timer_param = 0;
-
+
_adlib_timer_counter = 0;
_voice_index = 0;
_next_tick = 0;
@@ -853,8 +853,8 @@
_adlib_reg_cache = (byte *)calloc(256, 1);
// We need to emulate one YM3812 chip
- int env_bits = g_system->property(OSystem::PROP_GET_FMOPL_ENV_BITS, NULL);
- int eg_ent = g_system->property(OSystem::PROP_GET_FMOPL_EG_ENT, NULL);
+ int env_bits = g_system->property(OSystem::PROP_GET_FMOPL_ENV_BITS, NULL);
+ int eg_ent = g_system->property(OSystem::PROP_GET_FMOPL_EG_ENT, NULL);
OPLBuildTables((env_bits ? env_bits : FMOPL_ENV_BITS_HQ), (eg_ent ? eg_ent : FMOPL_EG_ENT_HQ));
_opl = OPLCreate(OPL_TYPE_YM3812, 3579545, _mixer->getOutputRate());
@@ -866,7 +866,7 @@
_samples_per_tick = (_mixer->getOutputRate() << FIXP_SHIFT) / BASE_FREQ;
_mixer->setupPremix(premix_proc, this);
-
+
return 0;
}
@@ -882,7 +882,7 @@
// Detach the premix callback handler
_mixer->setupPremix(0, 0);
-
+
// Turn off the OPL emulation
// YM3812Shutdown();
@@ -1123,7 +1123,7 @@
break;
default:
adlib_set_param(voice->_channel, s11->param,
- s10->start_value + s11->modify_val);
+ s10->start_value + s11->modify_val);
break;
}
}
@@ -1466,7 +1466,7 @@
}
void MidiDriver_ADLIB::mc_init_stuff(AdlibVoice *voice, Struct10 * s10,
- Struct11 * s11, byte flags, InstrumentExtra * ie) {
+ Struct11 * s11, byte flags, InstrumentExtra * ie) {
AdlibPart *part = voice->_part;
s11->modify_val = 0;
s11->flag0x40 = flags & 0x40;
Index: windows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/windows.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- windows.cpp 25 Sep 2003 22:31:03 -0000 1.13
+++ windows.cpp 8 Nov 2003 22:57:42 -0000 1.14
@@ -73,8 +73,7 @@
CloseHandle (_streamEvent);
}
-void MidiDriver_WIN::send(uint32 b)
-{
+void MidiDriver_WIN::send(uint32 b) {
union {
DWORD dwData;
BYTE bData[4];
@@ -88,8 +87,7 @@
check_error(midiOutShortMsg(_mo, u.dwData));
}
-void MidiDriver_WIN::sysEx (byte *msg, uint16 length)
-{
+void MidiDriver_WIN::sysEx (byte *msg, uint16 length) {
if (!_isOpen)
return;
Index: ym2612.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/ym2612.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ym2612.cpp 3 Nov 2003 22:28:36 -0000 1.20
+++ ym2612.cpp 8 Nov 2003 22:57:42 -0000 1.21
@@ -208,22 +208,21 @@
////////////////////////////////////////
Operator2612::Operator2612 (Voice2612 *owner) :
-_owner (owner),
-_state (_s_ready),
-_currentLevel ((int32)0x7f << 15),
-_phase (0),
-_lastOutput (0),
-_feedbackLevel (0),
-_detune (0),
-_multiple (1),
-_keyScale (0),
-_specifiedTotalLevel (127),
-_specifiedAttackRate (0),
-_specifiedDecayRate (0),
-_specifiedSustainRate (0),
-_specifiedReleaseRate (15)
-{
- velocity(0);
+ _owner (owner),
+ _state (_s_ready),
+ _currentLevel ((int32)0x7f << 15),
+ _phase (0),
+ _lastOutput (0),
+ _feedbackLevel (0),
+ _detune (0),
+ _multiple (1),
+ _keyScale (0),
+ _specifiedTotalLevel (127),
+ _specifiedAttackRate (0),
+ _specifiedDecayRate (0),
+ _specifiedSustainRate (0),
+ _specifiedReleaseRate (15) {
+ velocity(0);
}
Operator2612::~Operator2612()
@@ -232,7 +231,7 @@
void Operator2612::velocity(int velo) {
_velocity = velo;
_totalLevel = ((int32)_specifiedTotalLevel << 15) +
- ((int32)(127-_velocity) << 13);
+ ((int32)(127-_velocity) << 13);
_sustainLevel = ((int32)_specifiedSustainLevel << 17);
}
@@ -724,8 +723,7 @@
////////////////////////////////////////
MidiDriver_YM2612::MidiDriver_YM2612(SoundMixer *mixer) :
-_mixer(mixer)
-{
+_mixer(mixer) {
_isOpen = false;
_timer_proc = 0;
_timer_param = 0;
More information about the Scummvm-git-logs
mailing list