mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-26 03:30:46 +00:00
Windows MIDI cleanup. Removal of some remaining unused functionality lingering from the DOS days and some formatting changes that happened along the way. If anything breaks with music on Windows, this is probably the commit to look at.
git-svn-id: https://svn.eduke32.com/eduke32@5817 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx
parent
9a0a62fdcb
commit
ae7fcd43a6
5 changed files with 423 additions and 1167 deletions
|
|
@ -1,10 +1,12 @@
|
||||||
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1994-1995 Apogee Software, Ltd.
|
Copyright (C) 2016 EDuke32 developers and contributors
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This file is part of EDuke32.
|
||||||
modify it under the terms of the GNU General Public License
|
|
||||||
as published by the Free Software Foundation; either version 2
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
of the License, or (at your option) any later version.
|
modify it under the terms of the GNU General Public License version 2
|
||||||
|
as published by the Free Software Foundation.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
|
@ -15,20 +17,8 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
|
|
||||||
|
|
||||||
*/
|
*/
|
||||||
/**********************************************************************
|
//-------------------------------------------------------------------------
|
||||||
module: _MIDI.H
|
|
||||||
|
|
||||||
author: James R. Dose
|
|
||||||
date: May 25, 1994
|
|
||||||
|
|
||||||
Private header for MIDI.C. Midi song file playback routines.
|
|
||||||
|
|
||||||
(c) Copyright 1994 James R. Dose. All Rights Reserved.
|
|
||||||
**********************************************************************/
|
|
||||||
|
|
||||||
#ifndef ___MIDI_H
|
#ifndef ___MIDI_H
|
||||||
#define ___MIDI_H
|
#define ___MIDI_H
|
||||||
|
|
@ -103,180 +93,55 @@ Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
|
||||||
|
|
||||||
#define EMIDI_GeneralMIDI 0
|
#define EMIDI_GeneralMIDI 0
|
||||||
|
|
||||||
#define EMIDI_AffectsCurrentCard( c, type ) \
|
#define EMIDI_AffectsCurrentCard(c, type) (((c) == EMIDI_ALL_CARDS) || ((c) == (type)))
|
||||||
( ( ( c ) == EMIDI_ALL_CARDS ) || ( ( c ) == ( type ) ) )
|
|
||||||
|
|
||||||
|
|
||||||
#define EMIDI_NUM_CONTEXTS 7
|
#define EMIDI_NUM_CONTEXTS 7
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
char *pos;
|
|
||||||
char *loopstart;
|
|
||||||
int16_t loopcount;
|
|
||||||
int16_t RunningStatus;
|
|
||||||
unsigned time;
|
|
||||||
int32_t FPSecondsPerTick;
|
|
||||||
int16_t tick;
|
|
||||||
int16_t beat;
|
|
||||||
int16_t measure;
|
|
||||||
int16_t BeatsPerMeasure;
|
|
||||||
int16_t TicksPerBeat;
|
|
||||||
int16_t TimeBase;
|
|
||||||
int32_t delay;
|
|
||||||
int16_t active;
|
|
||||||
} songcontext;
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
char *start;
|
char *pos;
|
||||||
char *pos;
|
char *loopstart;
|
||||||
|
int16_t loopcount;
|
||||||
|
int16_t RunningStatus;
|
||||||
|
unsigned time;
|
||||||
|
int32_t FPSecondsPerTick;
|
||||||
|
int16_t tick;
|
||||||
|
int16_t beat;
|
||||||
|
int16_t measure;
|
||||||
|
int16_t BeatsPerMeasure;
|
||||||
|
int16_t TicksPerBeat;
|
||||||
|
int16_t TimeBase;
|
||||||
|
int32_t delay;
|
||||||
|
int16_t active;
|
||||||
|
} songcontext;
|
||||||
|
|
||||||
int32_t delay;
|
typedef struct
|
||||||
int16_t active;
|
{
|
||||||
int16_t RunningStatus;
|
char *start;
|
||||||
|
char *pos;
|
||||||
|
|
||||||
int16_t currentcontext;
|
int32_t delay;
|
||||||
songcontext context[ EMIDI_NUM_CONTEXTS ];
|
int16_t active;
|
||||||
|
int16_t RunningStatus;
|
||||||
|
|
||||||
char EMIDI_IncludeTrack;
|
int16_t currentcontext;
|
||||||
char EMIDI_ProgramChange;
|
songcontext context[EMIDI_NUM_CONTEXTS];
|
||||||
char EMIDI_VolumeChange;
|
|
||||||
} track;
|
|
||||||
|
|
||||||
static int32_t _MIDI_ReadNumber( void *from, size_t size );
|
char EMIDI_IncludeTrack;
|
||||||
static int32_t _MIDI_ReadDelta( track *ptr );
|
char EMIDI_ProgramChange;
|
||||||
static void _MIDI_ResetTracks( void );
|
char EMIDI_VolumeChange;
|
||||||
static void _MIDI_AdvanceTick( void );
|
} track;
|
||||||
static void _MIDI_MetaEvent( track *Track );
|
|
||||||
static void _MIDI_SysEx( track *Track );
|
|
||||||
static int32_t _MIDI_InterpretControllerInfo( track *Track, int32_t TimeSet,
|
|
||||||
int32_t channel, int32_t c1, int32_t c2 );
|
|
||||||
static int32_t _MIDI_SendControlChange( int32_t channel, int32_t c1, int32_t c2 );
|
|
||||||
static void _MIDI_SetChannelVolume( int32_t channel, int32_t volume );
|
|
||||||
static void _MIDI_SendChannelVolumes( void );
|
|
||||||
static int32_t _MIDI_ProcessNextTick( void );
|
|
||||||
static void _MIDI_InitEMIDI( void );
|
|
||||||
|
|
||||||
/*
|
static int32_t _MIDI_ReadNumber(void *from, size_t size);
|
||||||
if ( c1 == EMIDI_LOOP_START )
|
static int32_t _MIDI_ReadDelta(track *ptr);
|
||||||
{
|
static void _MIDI_ResetTracks(void);
|
||||||
if ( c2 == 0 )
|
static void _MIDI_AdvanceTick(void);
|
||||||
{
|
static void _MIDI_MetaEvent(track *Track);
|
||||||
Track->context[ 0 ].loopcount = EMIDI_INFINITE;
|
static void _MIDI_SysEx(track *Track);
|
||||||
}
|
static int32_t _MIDI_InterpretControllerInfo(track *Track, int32_t TimeSet, int32_t channel, int32_t c1, int32_t c2);
|
||||||
else
|
static int32_t _MIDI_SendControlChange(int32_t channel, int32_t c1, int32_t c2);
|
||||||
{
|
static void _MIDI_SetChannelVolume(int32_t channel, int32_t volume);
|
||||||
Track->context[ 0 ].loopcount = c2;
|
static void _MIDI_SendChannelVolumes(void);
|
||||||
}
|
static int32_t _MIDI_ProcessNextTick(void);
|
||||||
|
static void _MIDI_InitEMIDI(void);
|
||||||
Track->context[ 0 ].pos = Track->pos;
|
|
||||||
Track->context[ 0 ].loopstart = Track->pos;
|
|
||||||
Track->context[ 0 ].RunningStatus = Track->RunningStatus;
|
|
||||||
Track->context[ 0 ].time = _MIDI_Time;
|
|
||||||
Track->context[ 0 ].FPSecondsPerTick = _MIDI_FPSecondsPerTick;
|
|
||||||
Track->context[ 0 ].tick = _MIDI_Tick;
|
|
||||||
Track->context[ 0 ].beat = _MIDI_Beat;
|
|
||||||
Track->context[ 0 ].measure = _MIDI_Measure;
|
|
||||||
Track->context[ 0 ].BeatsPerMeasure = _MIDI_BeatsPerMeasure;
|
|
||||||
Track->context[ 0 ].TicksPerBeat = _MIDI_TicksPerBeat;
|
|
||||||
Track->context[ 0 ].TimeBase = _MIDI_TimeBase;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( ( c1 == EMIDI_LOOP_END ) &&
|
|
||||||
( c2 == EMIDI_END_LOOP_VALUE ) )
|
|
||||||
{
|
|
||||||
if ( ( Track->context[ 0 ].loopstart != NULL ) &&
|
|
||||||
( Track->context[ 0 ].loopcount != 0 ) )
|
|
||||||
{
|
|
||||||
if ( Track->context[ 0 ].loopcount != EMIDI_INFINITE )
|
|
||||||
{
|
|
||||||
Track->context[ 0 ].loopcount--;
|
|
||||||
}
|
|
||||||
|
|
||||||
Track->pos = Track->context[ 0 ].loopstart;
|
|
||||||
Track->RunningStatus = Track->context[ 0 ].RunningStatus;
|
|
||||||
|
|
||||||
if ( !TimeSet )
|
|
||||||
{
|
|
||||||
_MIDI_Time = Track->context[ 0 ].time;
|
|
||||||
_MIDI_FPSecondsPerTick = Track->context[ 0 ].FPSecondsPerTick;
|
|
||||||
_MIDI_Tick = Track->context[ 0 ].tick;
|
|
||||||
_MIDI_Beat = Track->context[ 0 ].beat;
|
|
||||||
_MIDI_Measure = Track->context[ 0 ].measure;
|
|
||||||
_MIDI_BeatsPerMeasure = Track->context[ 0 ].BeatsPerMeasure;
|
|
||||||
_MIDI_TicksPerBeat = Track->context[ 0 ].TicksPerBeat;
|
|
||||||
_MIDI_TimeBase = Track->context[ 0 ].TimeBase;
|
|
||||||
TimeSet = TRUE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( c1 == MIDI_MONO_MODE_ON )
|
|
||||||
{
|
|
||||||
Track->pos++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( ( c1 == MIDI_VOLUME ) && ( !Track->EMIDI_VolumeChange ) )
|
|
||||||
{
|
|
||||||
_MIDI_SetChannelVolume( channel, c2 );
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
else if ( ( c1 == EMIDI_VOLUME_CHANGE ) &&
|
|
||||||
( Track->EMIDI_VolumeChange ) )
|
|
||||||
{
|
|
||||||
_MIDI_SetChannelVolume( channel, c2 );
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( ( c1 == EMIDI_PROGRAM_CHANGE ) &&
|
|
||||||
( Track->EMIDI_ProgramChange ) )
|
|
||||||
{
|
|
||||||
_MIDI_Funcs->ProgramChange( channel, MIDI_PatchMap[ c2 & 0x7f ] );
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( c1 == EMIDI_CONTEXT_START )
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( c1 == EMIDI_CONTEXT_END )
|
|
||||||
{
|
|
||||||
if ( ( Track->currentcontext != _MIDI_Context ) ||
|
|
||||||
( Track->context[ _MIDI_Context ].pos == NULL )
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
Track->currentcontext = _MIDI_Context;
|
|
||||||
Track->context[ 0 ].loopstart = Track->context[ _MIDI_Context ].loopstart;
|
|
||||||
Track->context[ 0 ].loopcount = Track->context[ _MIDI_Context ].loopcount;
|
|
||||||
Track->pos = Track->context[ _MIDI_Context ].pos;
|
|
||||||
Track->RunningStatus = Track->context[ _MIDI_Context ].RunningStatus;
|
|
||||||
|
|
||||||
if ( TimeSet )
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
_MIDI_Time = Track->context[ _MIDI_Context ].time;
|
|
||||||
_MIDI_FPSecondsPerTick = Track->context[ _MIDI_Context ].FPSecondsPerTick;
|
|
||||||
_MIDI_Tick = Track->context[ _MIDI_Context ].tick;
|
|
||||||
_MIDI_Beat = Track->context[ _MIDI_Context ].beat;
|
|
||||||
_MIDI_Measure = Track->context[ _MIDI_Context ].measure;
|
|
||||||
_MIDI_BeatsPerMeasure = Track->context[ _MIDI_Context ].BeatsPerMeasure;
|
|
||||||
_MIDI_TicksPerBeat = Track->context[ _MIDI_Context ].TicksPerBeat;
|
|
||||||
_MIDI_TimeBase = Track->context[ _MIDI_Context ].TimeBase;
|
|
||||||
TimeSet = TRUE;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( _MIDI_Funcs->ControlChange )
|
|
||||||
{
|
|
||||||
_MIDI_Funcs->ControlChange( channel, c1, c2 );
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1994-1995 Apogee Software, Ltd.
|
Copyright (C) 2016 EDuke32 developers and contributors
|
||||||
Copyright (C) 2015 EDuke32 developers
|
|
||||||
Copyright (C) 2015 Voidpoint, LLC
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This file is part of EDuke32.
|
||||||
modify it under the terms of the GNU General Public License
|
|
||||||
as published by the Free Software Foundation; either version 2
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
of the License, or (at your option) any later version.
|
modify it under the terms of the GNU General Public License version 2
|
||||||
|
as published by the Free Software Foundation.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
|
@ -17,18 +17,8 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
/**********************************************************************
|
//-------------------------------------------------------------------------
|
||||||
module: FX_MAN.C
|
|
||||||
|
|
||||||
author: James R. Dose
|
|
||||||
date: March 17, 1994
|
|
||||||
|
|
||||||
Device independant sound effect routines.
|
|
||||||
|
|
||||||
(c) Copyright 1994 James R. Dose. All Rights Reserved.
|
|
||||||
**********************************************************************/
|
|
||||||
|
|
||||||
#include "compat.h"
|
#include "compat.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
@ -48,13 +38,10 @@ const char *FX_ErrorString(int32_t ErrorNumber)
|
||||||
switch (ErrorNumber)
|
switch (ErrorNumber)
|
||||||
{
|
{
|
||||||
case FX_Warning:
|
case FX_Warning:
|
||||||
case FX_Error: ErrorString = FX_ErrorString(FX_ErrorCode); break;
|
case FX_Error: ErrorString = FX_ErrorString(FX_ErrorCode); break;
|
||||||
|
case FX_Ok: ErrorString = "Fx ok."; break;
|
||||||
case FX_Ok: ErrorString = "Fx ok."; break;
|
case FX_MultiVocError: ErrorString = MV_ErrorString(MV_Error); break;
|
||||||
|
default: ErrorString = "Unknown Fx error code."; break;
|
||||||
case FX_MultiVocError: ErrorString = MV_ErrorString(MV_Error); break;
|
|
||||||
|
|
||||||
default: ErrorString = "Unknown Fx error code."; break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ErrorString;
|
return ErrorString;
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,10 +1,12 @@
|
||||||
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 1994-1995 Apogee Software, Ltd.
|
Copyright (C) 2016 EDuke32 developers and contributors
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or
|
This file is part of EDuke32.
|
||||||
modify it under the terms of the GNU General Public License
|
|
||||||
as published by the Free Software Foundation; either version 2
|
EDuke32 is free software; you can redistribute it and/or
|
||||||
of the License, or (at your option) any later version.
|
modify it under the terms of the GNU General Public License version 2
|
||||||
|
as published by the Free Software Foundation.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
This program is distributed in the hope that it will be useful,
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
|
@ -15,19 +17,8 @@ See the GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program; if not, write to the Free Software
|
along with this program; if not, write to the Free Software
|
||||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
|
|
||||||
Modifications for JonoF's port by Jonathon Fowler (jf@jonof.id.au)
|
|
||||||
*/
|
*/
|
||||||
/**********************************************************************
|
//-------------------------------------------------------------------------
|
||||||
module: MIDI.H
|
|
||||||
|
|
||||||
author: James R. Dose
|
|
||||||
date: May 25, 1994
|
|
||||||
|
|
||||||
Public header for MIDI.C. Midi song file playback routines.
|
|
||||||
|
|
||||||
(c) Copyright 1994 James R. Dose. All Rights Reserved.
|
|
||||||
**********************************************************************/
|
|
||||||
|
|
||||||
#ifndef __MIDI_H
|
#ifndef __MIDI_H
|
||||||
#define __MIDI_H
|
#define __MIDI_H
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2010 EDuke32 developers and contributors
|
Copyright (C) 2016 EDuke32 developers and contributors
|
||||||
|
|
||||||
This file is part of EDuke32.
|
This file is part of EDuke32.
|
||||||
|
|
||||||
|
|
@ -20,17 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
*/
|
*/
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
/**********************************************************************
|
|
||||||
module: MUSIC.C
|
|
||||||
|
|
||||||
author: James R. Dose
|
|
||||||
date: March 25, 1994
|
|
||||||
|
|
||||||
Device independant music playback routines.
|
|
||||||
|
|
||||||
(c) Copyright 1994 James R. Dose. All Rights Reserved.
|
|
||||||
**********************************************************************/
|
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "music.h"
|
#include "music.h"
|
||||||
|
|
@ -61,20 +50,16 @@ int32_t MUSIC_InitMidi(int32_t card, midifuncs *Funcs, int32_t Address);
|
||||||
#define MUSIC_SetErrorCode(status) MUSIC_ErrorCode = (status);
|
#define MUSIC_SetErrorCode(status) MUSIC_ErrorCode = (status);
|
||||||
|
|
||||||
const char *MUSIC_ErrorString(int32_t ErrorNumber)
|
const char *MUSIC_ErrorString(int32_t ErrorNumber)
|
||||||
|
|
||||||
{
|
{
|
||||||
const char *ErrorString;
|
const char *ErrorString;
|
||||||
|
|
||||||
switch (ErrorNumber)
|
switch (ErrorNumber)
|
||||||
{
|
{
|
||||||
case MUSIC_Warning:
|
case MUSIC_Warning:
|
||||||
case MUSIC_Error: ErrorString = MUSIC_ErrorString(MUSIC_ErrorCode); break;
|
case MUSIC_Error: ErrorString = MUSIC_ErrorString(MUSIC_ErrorCode); break;
|
||||||
|
case MUSIC_Ok: ErrorString = "Music ok."; break;
|
||||||
case MUSIC_Ok: ErrorString = "Music ok."; break;
|
case MUSIC_MidiError: ErrorString = "Error playing MIDI file."; break;
|
||||||
|
default: ErrorString = "Unknown Music error code."; break;
|
||||||
case MUSIC_MidiError: ErrorString = "Error playing MIDI file."; break;
|
|
||||||
|
|
||||||
default: ErrorString = "Unknown Music error code."; break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ErrorString;
|
return ErrorString;
|
||||||
|
|
@ -83,9 +68,6 @@ const char *MUSIC_ErrorString(int32_t ErrorNumber)
|
||||||
|
|
||||||
int32_t MUSIC_Init(int32_t SoundCard, int32_t Address)
|
int32_t MUSIC_Init(int32_t SoundCard, int32_t Address)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < 128; i++)
|
|
||||||
MIDI_PatchMap[i] = i;
|
|
||||||
|
|
||||||
MUSIC_SoundDevice = SoundCard;
|
MUSIC_SoundDevice = SoundCard;
|
||||||
|
|
||||||
return MUSIC_InitMidi(SoundCard, &MUSIC_MidiFunctions, Address);
|
return MUSIC_InitMidi(SoundCard, &MUSIC_MidiFunctions, Address);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue