The-Homebrew-Cloud/fceugx
2
0
Fork 0
mirror of https://github.com/dborth/fceugx.git synced 2024-11-01 06:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

sound fix

Browse Source
This commit is contained in:
dborth 2009-03-28 18:26:47 +00:00
parent 3307989c04
commit 27e503ed01
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.gc
View File

@ -28,7 +28,7 @@ INCLUDES := source/fceultra source/ngc source/unzip
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# options for code generation # options for code generation
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) -DNGC \ CFLAGS = -g -O3 -Wall $(MACHDEP) $(INCLUDE) -DNGC -DNO_SOUND \
-DFCEU_VERSION_NUMERIC=9812 -DFRAMESKIP \ -DFCEU_VERSION_NUMERIC=9812 -DFRAMESKIP \
-D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ \ -D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ \
-fomit-frame-pointer -fno-exceptions \ -fomit-frame-pointer -fno-exceptions \

12
source/ngc/gcaudio.cpp
View File

@ -88,17 +88,6 @@ void InitialiseAudio()
memset(mixbuffer, 0, 16000); memset(mixbuffer, 0, 16000);
} }
/****************************************************************************
* StopAudio
*
* Pause audio output when returning to menu
***************************************************************************/
void StopAudio()
{
AUDIO_StopDMA();
IsPlaying = 0;
}
/**************************************************************************** /****************************************************************************
* ResetAudio * ResetAudio
* *
@ -132,6 +121,7 @@ SwitchAudioMode(int mode)
{ {
AUDIO_StopDMA(); AUDIO_StopDMA();
AUDIO_RegisterDMACallback(NULL); AUDIO_RegisterDMACallback(NULL);
IsPlaying = 0;
#ifndef NO_SOUND #ifndef NO_SOUND
ASND_Init(); ASND_Init();
ASND_Pause(0); ASND_Pause(0);

1
source/ngc/gcaudio.h
View File

@ -11,7 +11,6 @@
****************************************************************************/ ****************************************************************************/
void InitialiseAudio(); void InitialiseAudio();
void StopAudio();
void ResetAudio(); void ResetAudio();
void PlaySound( int *Buffer, int samples ); void PlaySound( int *Buffer, int samples );
void SwitchAudioMode(int mode); void SwitchAudioMode(int mode);

12
source/ngc/menu.cpp
View File

@ -1037,8 +1037,8 @@ static int MenuGame()
GuiImage saveBtnImg(&btnLargeOutline); GuiImage saveBtnImg(&btnLargeOutline);
GuiImage saveBtnImgOver(&btnLargeOutlineOver); GuiImage saveBtnImgOver(&btnLargeOutlineOver);
GuiButton saveBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); GuiButton saveBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
saveBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP); saveBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
saveBtn.SetPosition(50, 120); saveBtn.SetPosition(-125, 120);
saveBtn.SetLabel(&saveBtnTxt); saveBtn.SetLabel(&saveBtnTxt);
saveBtn.SetImage(&saveBtnImg); saveBtn.SetImage(&saveBtnImg);
saveBtn.SetImageOver(&saveBtnImgOver); saveBtn.SetImageOver(&saveBtnImgOver);
@ -1051,7 +1051,7 @@ static int MenuGame()
GuiImage loadBtnImgOver(&btnLargeOutlineOver); GuiImage loadBtnImgOver(&btnLargeOutlineOver);
GuiButton loadBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); GuiButton loadBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
loadBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); loadBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
loadBtn.SetPosition(0, 120); loadBtn.SetPosition(125, 120);
loadBtn.SetLabel(&loadBtnTxt); loadBtn.SetLabel(&loadBtnTxt);
loadBtn.SetImage(&loadBtnImg); loadBtn.SetImage(&loadBtnImg);
loadBtn.SetImageOver(&loadBtnImgOver); loadBtn.SetImageOver(&loadBtnImgOver);
@ -1063,8 +1063,8 @@ static int MenuGame()
GuiImage resetBtnImg(&btnLargeOutline); GuiImage resetBtnImg(&btnLargeOutline);
GuiImage resetBtnImgOver(&btnLargeOutlineOver); GuiImage resetBtnImgOver(&btnLargeOutlineOver);
GuiButton resetBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); GuiButton resetBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
resetBtn.SetAlignment(ALIGN_RIGHT, ALIGN_TOP); resetBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
resetBtn.SetPosition(-50, 120); resetBtn.SetPosition(-125, 250);
resetBtn.SetLabel(&resetBtnTxt); resetBtn.SetLabel(&resetBtnTxt);
resetBtn.SetImage(&resetBtnImg); resetBtn.SetImage(&resetBtnImg);
resetBtn.SetImageOver(&resetBtnImgOver); resetBtn.SetImageOver(&resetBtnImgOver);
@ -1077,7 +1077,7 @@ static int MenuGame()
GuiImage controllerBtnImgOver(&btnLargeOutlineOver); GuiImage controllerBtnImgOver(&btnLargeOutlineOver);
GuiButton controllerBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight()); GuiButton controllerBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
controllerBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP); controllerBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
controllerBtn.SetPosition(-125, 250); controllerBtn.SetPosition(125, 250);
controllerBtn.SetLabel(&controllerBtnTxt); controllerBtn.SetLabel(&controllerBtnTxt);
controllerBtn.SetImage(&controllerBtnImg); controllerBtn.SetImage(&controllerBtnImg);
controllerBtn.SetImageOver(&controllerBtnImgOver); controllerBtn.SetImageOver(&controllerBtnImgOver);