OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Moved sound sample rate, buffer size, and buffer count to the

Browse source 
advanced sound options menu. Removed opl_enable from the menu.
- Added OPL synth as MIDI device -3. Since this is based on the MUS player
  code, it only supports those events and controllers supported by MUS.
  Some of Duke's MIDIs sound awful, but I think that may be more because
  it's using different instruments... There's a thread in the MIDI streamer
  class that could be taken out for Linux, since it doesn't need to deal
  with the Windows Multimedia API, but for now, this is still Windows-only.


SVN r864 (trunk)
This commit is contained in:
Randy Heit 2008-03-29 05:01:38 +00:00
commit cd70087ed5
15 changed files with 708 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/oplsynth/mlopl.cpp
View file

@ -208,7 +208,8 @@ struct OP2instrEntry *musicBlock::getInstrument(uint channel, uchar note)
if (note < 35 || note > 81)
return NULL; /* wrong percussion number */
instrnumber = note + (128-35);
} else
}
else
{
instrnumber = driverdata.channelInstr[channel];
}
@ -295,15 +296,14 @@ void musicBlock::OPLchangeControl(uint channel, uchar controller, int value)
{
uint i;
uint id = channel;
struct OPLdata *data = &driverdata;
switch (controller)
{
case ctrlPatch: /* change instrument */
data->channelInstr[channel] = value;
OPLprogramChange(channel, value);
break;
case ctrlModulation:
data->channelModulation[channel] = value;
driverdata.channelModulation[channel] = value;
for(i = 0; i < io->OPLchannels; i++)
{
struct channelEntry *ch = &channels[i];
@ -325,7 +325,7 @@ void musicBlock::OPLchangeControl(uint channel, uchar controller, int value)
}
break;
case ctrlVolume: /* change volume */
data->channelVolume[channel] = value;
driverdata.channelVolume[channel] = value;
for(i = 0; i < io->OPLchannels; i++)
{
struct channelEntry *ch = &channels[i];
@ -338,7 +338,7 @@ void musicBlock::OPLchangeControl(uint channel, uchar controller, int value)
}
break;
case ctrlPan: /* change pan (balance) */
data->channelPan[channel] = value -= 64;
driverdata.channelPan[channel] = value -= 64;
for(i = 0; i < io->OPLchannels; i++)
{
struct channelEntry *ch = &channels[i];
@ -350,22 +350,26 @@ void musicBlock::OPLchangeControl(uint channel, uchar controller, int value)
}
break;
case ctrlSustainPedal: /* change sustain pedal (hold) */
data->channelSustain[channel] = value;
driverdata.channelSustain[channel] = value;
if (value < 0x40)
releaseSustain(channel);
break;
}
}
void musicBlock::OPLprogramChange(uint channel, int value)
{
driverdata.channelInstr[channel] = value;
}
void musicBlock::OPLplayMusic()
void musicBlock::OPLplayMusic(int vol)
{
uint i;
struct OPLdata *data = &driverdata;
for (i = 0; i < CHANNELS; i++)
{
data->channelVolume[i] = 127; /* default volume 127 (full volume) */
data->channelVolume[i] = vol; /* default volume 127 for MUS (full volume) */
data->channelSustain[i] = 0;
data->channelLastVolume[i] = 64;
data->channelPitch[i] = 64;