mirror of
https://github.com/dborth/fceugx.git
synced 2024-11-01 06:55:05 +01:00
sound fix
This commit is contained in:
parent
3307989c04
commit
27e503ed01
@ -28,7 +28,7 @@ INCLUDES := source/fceultra source/ngc source/unzip
|
||||
#---------------------------------------------------------------------------------
|
||||
# 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 \
|
||||
-D_SZ_ONE_DIRECTORY -D_LZMA_IN_CB -D_LZMA_OUT_READ \
|
||||
-fomit-frame-pointer -fno-exceptions \
|
||||
|
@ -88,17 +88,6 @@ void InitialiseAudio()
|
||||
memset(mixbuffer, 0, 16000);
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* StopAudio
|
||||
*
|
||||
* Pause audio output when returning to menu
|
||||
***************************************************************************/
|
||||
void StopAudio()
|
||||
{
|
||||
AUDIO_StopDMA();
|
||||
IsPlaying = 0;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* ResetAudio
|
||||
*
|
||||
@ -132,6 +121,7 @@ SwitchAudioMode(int mode)
|
||||
{
|
||||
AUDIO_StopDMA();
|
||||
AUDIO_RegisterDMACallback(NULL);
|
||||
IsPlaying = 0;
|
||||
#ifndef NO_SOUND
|
||||
ASND_Init();
|
||||
ASND_Pause(0);
|
||||
|
@ -11,7 +11,6 @@
|
||||
****************************************************************************/
|
||||
|
||||
void InitialiseAudio();
|
||||
void StopAudio();
|
||||
void ResetAudio();
|
||||
void PlaySound( int *Buffer, int samples );
|
||||
void SwitchAudioMode(int mode);
|
||||
|
@ -1037,8 +1037,8 @@ static int MenuGame()
|
||||
GuiImage saveBtnImg(&btnLargeOutline);
|
||||
GuiImage saveBtnImgOver(&btnLargeOutlineOver);
|
||||
GuiButton saveBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
|
||||
saveBtn.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
|
||||
saveBtn.SetPosition(50, 120);
|
||||
saveBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
|
||||
saveBtn.SetPosition(-125, 120);
|
||||
saveBtn.SetLabel(&saveBtnTxt);
|
||||
saveBtn.SetImage(&saveBtnImg);
|
||||
saveBtn.SetImageOver(&saveBtnImgOver);
|
||||
@ -1051,7 +1051,7 @@ static int MenuGame()
|
||||
GuiImage loadBtnImgOver(&btnLargeOutlineOver);
|
||||
GuiButton loadBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
|
||||
loadBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
|
||||
loadBtn.SetPosition(0, 120);
|
||||
loadBtn.SetPosition(125, 120);
|
||||
loadBtn.SetLabel(&loadBtnTxt);
|
||||
loadBtn.SetImage(&loadBtnImg);
|
||||
loadBtn.SetImageOver(&loadBtnImgOver);
|
||||
@ -1063,8 +1063,8 @@ static int MenuGame()
|
||||
GuiImage resetBtnImg(&btnLargeOutline);
|
||||
GuiImage resetBtnImgOver(&btnLargeOutlineOver);
|
||||
GuiButton resetBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
|
||||
resetBtn.SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
|
||||
resetBtn.SetPosition(-50, 120);
|
||||
resetBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
|
||||
resetBtn.SetPosition(-125, 250);
|
||||
resetBtn.SetLabel(&resetBtnTxt);
|
||||
resetBtn.SetImage(&resetBtnImg);
|
||||
resetBtn.SetImageOver(&resetBtnImgOver);
|
||||
@ -1077,7 +1077,7 @@ static int MenuGame()
|
||||
GuiImage controllerBtnImgOver(&btnLargeOutlineOver);
|
||||
GuiButton controllerBtn(btnLargeOutline.GetWidth(), btnLargeOutline.GetHeight());
|
||||
controllerBtn.SetAlignment(ALIGN_CENTRE, ALIGN_TOP);
|
||||
controllerBtn.SetPosition(-125, 250);
|
||||
controllerBtn.SetPosition(125, 250);
|
||||
controllerBtn.SetLabel(&controllerBtnTxt);
|
||||
controllerBtn.SetImage(&controllerBtnImg);
|
||||
controllerBtn.SetImageOver(&controllerBtnImgOver);
|
||||
|
Loading…
Reference in New Issue
Block a user