lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enable sound ( still broken )

This commit is contained in:
aliaspider 2014-12-09 05:36:30 +01:00
parent b69fee8b31
commit cd185c849b
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretro.c
View File

@ -95,8 +95,7 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
info->geometry.max_height = GBA_SCREEN_HEIGHT; info->geometry.max_height = GBA_SCREEN_HEIGHT;
info->geometry.aspect_ratio = 0; info->geometry.aspect_ratio = 0;
info->timing.fps = ((float) (16* 1024 * 1024)) / (308 * 228 * 4); // 59.72750057 hz info->timing.fps = ((float) (16* 1024 * 1024)) / (308 * 228 * 4); // 59.72750057 hz
info->timing.sample_rate = 44100; info->timing.sample_rate = GBA_SOUND_FREQUENCY;
// info->timing.sample_rate = 32 * 1024;
} }

16
sound.c
View File

@ -27,7 +27,11 @@ u32 global_enable_audio = 1;
direct_sound_struct direct_sound_channel[2]; direct_sound_struct direct_sound_channel[2];
gbc_sound_struct gbc_sound_channel[4]; gbc_sound_struct gbc_sound_channel[4];
#ifdef __LIBRETRO__
u32 sound_frequency = GBA_SOUND_FREQUENCY;
#else
u32 sound_frequency = 44100; u32 sound_frequency = 44100;
#endif
#ifndef __LIBRETRO__ #ifndef __LIBRETRO__
SDL_mutex *sound_mutex; SDL_mutex *sound_mutex;
@ -604,7 +608,7 @@ void update_gbc_sound(u32 cpu_ticks)
source[i] = 0; \ source[i] = 0; \
} \ } \
#ifndef __LIBRETRO__
void sound_callback(void *userdata, u8 *stream, int length) void sound_callback(void *userdata, u8 *stream, int length)
{ {
u32 sample_length = length / 2; u32 sample_length = length / 2;
@ -614,7 +618,6 @@ void sound_callback(void *userdata, u8 *stream, int length)
s16 *source; s16 *source;
s32 current_sample; s32 current_sample;
#ifndef __LIBRETRO__
SDL_LockMutex(sound_mutex); SDL_LockMutex(sound_mutex);
while(((gbc_sound_buffer_index - sound_buffer_base) % BUFFER_SIZE) < while(((gbc_sound_buffer_index - sound_buffer_base) % BUFFER_SIZE) <
@ -622,7 +625,6 @@ void sound_callback(void *userdata, u8 *stream, int length)
{ {
SDL_CondWait(sound_cv, sound_mutex); SDL_CondWait(sound_cv, sound_mutex);
} }
#endif
if(global_enable_audio) if(global_enable_audio)
{ {
@ -657,12 +659,11 @@ void sound_callback(void *userdata, u8 *stream, int length)
} }
} }
#ifndef __LIBRETRO__
SDL_CondSignal(sound_cv); SDL_CondSignal(sound_cv);
SDL_UnlockMutex(sound_mutex); SDL_UnlockMutex(sound_mutex);
#endif
} }
#endif
// Special thanks to blarrg for the LSFR frequency used in Meridian, as posted // Special thanks to blarrg for the LSFR frequency used in Meridian, as posted
// on the forum at http://meridian.overclocked.org: // on the forum at http://meridian.overclocked.org:
@ -852,12 +853,13 @@ void render_audio(void)
u32 i; u32 i;
s32 current_sample; s32 current_sample;
return; // return;
while (((gbc_sound_buffer_index - sound_buffer_base) % BUFFER_SIZE) > 512) { while (((gbc_sound_buffer_index - sound_buffer_base) & BUFFER_SIZE_MASK) > 512) {
sound_copy(sound_buffer_base, 512, normal); sound_copy(sound_buffer_base, 512, normal);
audio_batch_cb(stream_base, 256); audio_batch_cb(stream_base, 256);
sound_buffer_base += 512; sound_buffer_base += 512;
sound_buffer_base &= BUFFER_SIZE_MASK;
} }
} }
#endif #endif

8
sound.h
View File

@ -20,7 +20,13 @@
#ifndef SOUND_H #ifndef SOUND_H
#define SOUND_H #define SOUND_H
#define BUFFER_SIZE 65536 #define BUFFER_SIZE (1 << 16)
#define BUFFER_SIZE_MASK (BUFFER_SIZE - 1)
#ifdef __LIBRETRO__
#define GBA_SOUND_FREQUENCY (64 * 1024)
#endif
#define GBA_XTAL 16777216.0f #define GBA_XTAL 16777216.0f
#define GBA_60HZ_RATE 16853760.0f /* 228*(272+960)*60 */ #define GBA_60HZ_RATE 16853760.0f /* 228*(272+960)*60 */