The-Homebrew-Cloud/Genesis-Plus-GX
2
0
Fork 0
mirror of https://github.com/ekeeke/Genesis-Plus-GX.git synced 2025-01-14 12:19:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #175 from libretro/master

Browse Source 
[libretro] merge libretro repository changes (mono output option + YM3438 core build fixes for some compilers)
This commit is contained in:
ekeeke 2017-09-26 09:54:41 +02:00 committed by GitHub
commit e215268169
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/sound/ym3438.c
View File

@ -42,6 +42,7 @@
* version: 1.0.2 * version: 1.0.2
*/ */
#include <string.h>
#include "ym3438.h" #include "ym3438.h"
enum { enum {

2
core/sound/ym3438.h
View File

@ -45,7 +45,7 @@
#ifndef YM3438_H #ifndef YM3438_H
#define YM3438_H #define YM3438_H
#include <inttypes.h> #include <stdint.h>
typedef uintptr_t Bitu; typedef uintptr_t Bitu;
typedef intptr_t Bits; typedef intptr_t Bits;

13
libretro/libretro.c
View File

@ -1032,7 +1032,16 @@ static void check_variables(void)
} }
} }
} }
var.key = "genesis_plus_gx_sound_output";
environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var);
{
if (!strcmp(var.value, "mono"))
config.mono = 1;
else if (!strcmp(var.value, "stereo"))
config.mono = 0;
}
var.key = "genesis_plus_gx_audio_filter"; var.key = "genesis_plus_gx_audio_filter";
environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var); environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var);
{ {
@ -1646,12 +1655,12 @@ void retro_set_environment(retro_environment_t cb)
{ "genesis_plus_gx_lock_on", "Cartridge lock-on; disabled|game genie|action replay (pro)|sonic & knuckles" }, { "genesis_plus_gx_lock_on", "Cartridge lock-on; disabled|game genie|action replay (pro)|sonic & knuckles" },
{ "genesis_plus_gx_ym2413", "Master System FM; auto|disabled|enabled" }, { "genesis_plus_gx_ym2413", "Master System FM; auto|disabled|enabled" },
{ "genesis_plus_gx_dac_bits", "YM2612 DAC quantization; disabled|enabled" }, { "genesis_plus_gx_dac_bits", "YM2612 DAC quantization; disabled|enabled" },
#ifdef HAVE_YM3438_CORE #ifdef HAVE_YM3438_CORE
{ "genesis_plus_gx_ym3438", "YM2612/YM3438 core; mame|nuked opn2" }, { "genesis_plus_gx_ym3438", "YM2612/YM3438 core; mame|nuked opn2" },
#endif #endif
{ "genesis_plus_gx_audio_filter", "Audio filter; disabled|low-pass" }, { "genesis_plus_gx_audio_filter", "Audio filter; disabled|low-pass" },
{ "genesis_plus_gx_sound_output", "Sound output; stereo|mono" },
{ "genesis_plus_gx_lowpass_range", "Low-pass filter %; 60|65|70|75|80|85|90|95|5|10|15|20|25|30|35|40|45|50|55"}, { "genesis_plus_gx_lowpass_range", "Low-pass filter %; 60|65|70|75|80|85|90|95|5|10|15|20|25|30|35|40|45|50|55"},
#if HAVE_EQ #if HAVE_EQ