Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Refactor: Rename and remove some macros and variables

Browse Source
This commit is contained in:
Aaron Culliney 2015-06-13 13:35:46 -07:00
parent 27a3fea005
commit c8834a91e3
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/audio/mockingboard.c
View File

@ -1161,7 +1161,7 @@ static unsigned long SSI263Thread(void *lpParameter)
unsigned long status = 0;
SSI263Voice[i].lpDSBvoice->GetStatus(SSI263Voice[i].lpDSBvoice, &status);
if (status & _DSBSTATUS_NOTPLAYING)
if (status & AUDIO_STATUS_NOTPLAYING)
{
sample_finished = true;
break;

4
src/audio/soundcore-openal.c
View File

@ -677,11 +677,11 @@ static long ALGetStatus(void *_this, unsigned long *status)
if ((state == AL_PLAYING) || (state == AL_PAUSED))
{
*status = DSBSTATUS_PLAYING;
*status = AUDIO_STATUS_PLAYING;
}
else
{
*status = _DSBSTATUS_NOTPLAYING;
*status = AUDIO_STATUS_NOTPLAYING;
}
return 0;

22
src/audio/soundcore.h
View File

@ -10,13 +10,17 @@
*/
/*
* Sources derived from AppleWin emulator
* Ported by Aaron Culliney
* Apple //e core sound system support. Source inspired/derived from AppleWin.
*
*/
#ifndef _SOUNDCORE_H_
#define _SOUNDCORE_H_
#define MAX_SAMPLES (8*1024)
#define AUDIO_STATUS_PLAYING 0x00000001
#define AUDIO_STATUS_NOTPLAYING 0x08000000
typedef struct IDirectSoundBuffer {
@ -43,17 +47,14 @@ typedef struct IDirectSoundBuffer {
int (*GetStatus)(void* _this, unsigned long *lpdwStatus);
// Mockingboard-specific HACKS
int (*UnlockStaticBuffer)(void* _this, unsigned long dwAudioBytes);
int (*Replay)(void* _this);
} IDirectSoundBuffer, *LPDIRECTSOUNDBUFFER, **LPLPDIRECTSOUNDBUFFER;
#define DS_OK 0
#define DSBSTATUS_LOOPING 0x00000004
#define DSBSTATUS_PLAYING 0x00000001
#define _DSBSTATUS_NOTPLAYING 0x08000000
#define DSBPLAY_LOOPING 0x00000001
#define DSBVOLUME_MIN -10000
#define DSBVOLUME_MAX 0
@ -82,16 +83,9 @@ typedef struct IDirectSound {
int (*DestroySoundBuffer)(LPDIRECTSOUNDBUFFER * ppDSBuffer);
} IDirectSound, *LPDIRECTSOUND;
#define MAX_SAMPLES (8*1024)
typedef struct
{
LPDIRECTSOUNDBUFFER lpDSBvoice;
#ifdef APPLE2IX
// apparently lpDSNotify isn't used...
#define LPDIRECTSOUNDNOTIFY void*
#endif
LPDIRECTSOUNDNOTIFY lpDSNotify;
bool bActive; // Playback is active
bool bMute;
long nVolume; // Current volume (as used by DirectSound)
@ -125,13 +119,11 @@ void DSUninit();
extern bool soundcore_isAvailable;
#ifdef APPLE2IX
typedef struct IDirectSound SoundSystemStruct;
long SoundSystemCreate(const char *sound_device, SoundSystemStruct **sound_struct);
long SoundSystemDestroy(SoundSystemStruct **sound_struct);
long SoundSystemPause();
long SoundSystemUnpause();
long SoundSystemEnumerate(char ***sound_devices, const int maxcount);
#endif
#endif /* whole file */