Unverified Commit 730b9331 authored by bearoso's avatar bearoso Committed by GitHub
Browse files

Merge pull request #760 from realnc/fix-libretro-runahead-audio

libretro: Fix audio not being submitted when rendering is disabled
parents 6628042f 1ea6ef50
......@@ -98,6 +98,9 @@ bool8 S9xGraphicsInit (void)
}
}
GFX.EndScreenRefreshCallback = NULL;
GFX.EndScreenRefreshCallbackData = NULL;
return (TRUE);
}
......@@ -107,6 +110,9 @@ void S9xGraphicsDeinit (void)
if (GFX.SubScreen) { free(GFX.SubScreen); GFX.SubScreen = NULL; }
if (GFX.ZBuffer) { free(GFX.ZBuffer); GFX.ZBuffer = NULL; }
if (GFX.SubZBuffer) { free(GFX.SubZBuffer); GFX.SubZBuffer = NULL; }
GFX.EndScreenRefreshCallback = NULL;
GFX.EndScreenRefreshCallbackData = NULL;
}
void S9xGraphicsScreenResize (void)
......@@ -263,6 +269,15 @@ void S9xEndScreenRefresh (void)
}
}
}
if (GFX.EndScreenRefreshCallback)
GFX.EndScreenRefreshCallback(GFX.EndScreenRefreshCallbackData);
}
void S9xSetEndScreenRefreshCallback(const SGFX::Callback cb, void *const data)
{
GFX.EndScreenRefreshCallback = cb;
GFX.EndScreenRefreshCallbackData = data;
}
void RenderLine (uint8 C)
......
......@@ -11,6 +11,8 @@
struct SGFX
{
typedef void (*Callback)(void *);
const uint32 Pitch = sizeof(uint16) * MAX_SNES_WIDTH;
const uint32 RealPPL = MAX_SNES_WIDTH; // true PPL of Screen buffer
const uint32 ScreenSize = MAX_SNES_WIDTH * SNES_HEIGHT_EXTENDED;
......@@ -67,6 +69,9 @@ struct SGFX
const char *InfoString;
uint32 InfoStringTimeout;
char FrameDisplayString[256];
Callback EndScreenRefreshCallback;
void *EndScreenRefreshCallbackData;
};
struct SBG
......@@ -202,6 +207,7 @@ struct COLOR_SUB
void S9xStartScreenRefresh (void);
void S9xEndScreenRefresh (void);
void S9xSetEndScreenRefreshCallback(SGFX::Callback cb, void *data);
void S9xBuildDirectColourMaps (void);
void RenderLine (uint8);
void S9xComputeClipWindows (void);
......
......@@ -753,6 +753,24 @@ static void update_variables(void)
}
}
static void S9xEndScreenRefreshCallback(void*)
{
if (Settings.Mute) {
S9xClearSamples();
return;
}
static std::vector<int16_t> audio_buffer;
size_t avail = S9xGetSampleCount();
if (audio_buffer.size() < avail)
audio_buffer.resize(avail);
S9xMixSamples((uint8*)&audio_buffer[0], avail);
audio_batch_cb(&audio_buffer[0], avail >> 1);
}
void retro_get_system_info(struct retro_system_info *info)
{
memset(info,0,sizeof(retro_system_info));
......@@ -1358,6 +1376,7 @@ void retro_init(void)
ntsc_screen_buffer = (uint16*) calloc(1, MAX_SNES_WIDTH_NTSC * 2 * (MAX_SNES_HEIGHT + 16));
snes_ntsc_buffer = ntsc_screen_buffer + (MAX_SNES_WIDTH_NTSC >> 1) * 16;
S9xGraphicsInit();
S9xSetEndScreenRefreshCallback(S9xEndScreenRefreshCallback, NULL);
S9xInitInputDevices();
for (int i = 0; i < 2; i++)
......@@ -2057,16 +2076,6 @@ bool8 S9xDeinitUpdate(int width, int height)
video_cb(GFX.Screen + ((int)(GFX.Pitch >> 1) * overscan_offset), width, height, GFX.Pitch);
}
static std::vector<int16_t> audio_buffer;
size_t avail = S9xGetSampleCount();
if (audio_buffer.size() < avail)
audio_buffer.resize(avail);
S9xMixSamples((uint8*)&audio_buffer[0], avail);
audio_batch_cb(&audio_buffer[0], avail >> 1);
return TRUE;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment