oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/gme: require GME 0.6 or later 

This allows dropping a few compile-time version checks and we can use
pkg-config to detect the library.
This commit is contained in:
Max Kellermann 2023-03-09 18:09:54 +01:00
parent 63b9fb3d2b
commit 851fcf4823
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -16,6 +16,7 @@ ver 0.24 (not yet released)
- curl: fix busy loop after connection failed - curl: fix busy loop after connection failed
* decoder * decoder
- ffmpeg: require FFmpeg 4.0 or later - ffmpeg: require FFmpeg 4.0 or later
- gme: require GME 0.6 or later
- hybrid_dsd: remove - hybrid_dsd: remove
- opus: implement bitrate calculation - opus: implement bitrate calculation
- wavpack: require libwavpack version 5 - wavpack: require libwavpack version 5

7
src/decoder/plugins/GmeDecoderPlugin.cxx
View File

@ -41,20 +41,17 @@ struct GmeContainerPath {
unsigned track; unsigned track;
}; };
#if GME_VERSION >= 0x000600
static int gme_accuracy; static int gme_accuracy;
#endif
static unsigned gme_default_fade; static unsigned gme_default_fade;
static bool static bool
gme_plugin_init([[maybe_unused]] const ConfigBlock &block) gme_plugin_init([[maybe_unused]] const ConfigBlock &block)
{ {
#if GME_VERSION >= 0x000600
auto accuracy = block.GetBlockParam("accuracy"); auto accuracy = block.GetBlockParam("accuracy");
gme_accuracy = accuracy != nullptr gme_accuracy = accuracy != nullptr
? (int)accuracy->GetBoolValue() ? (int)accuracy->GetBoolValue()
: -1; : -1;
#endif
auto fade = block.GetBlockParam("default_fade"); auto fade = block.GetBlockParam("default_fade");
gme_default_fade = fade != nullptr gme_default_fade = fade != nullptr
? fade->GetUnsignedValue() * 1000 ? fade->GetUnsignedValue() * 1000
@ -148,10 +145,8 @@ gme_file_decode(DecoderClient &client, Path path_fs)
FmtDebug(gme_domain, "emulator type '{}'", FmtDebug(gme_domain, "emulator type '{}'",
gme_type_system(gme_type(emu))); gme_type_system(gme_type(emu)));
#if GME_VERSION >= 0x000600
if (gme_accuracy >= 0) if (gme_accuracy >= 0)
gme_enable_accuracy(emu, gme_accuracy); gme_enable_accuracy(emu, gme_accuracy);
#endif
gme_info_t *ti; gme_info_t *ti;
const char *gme_err = gme_track_info(emu, &ti, container.track); const char *gme_err = gme_track_info(emu, &ti, container.track);

2
src/decoder/plugins/meson.build
View File

@ -80,7 +80,7 @@ if libfaad_dep.found()
decoder_plugins_sources += 'FaadDecoderPlugin.cxx' decoder_plugins_sources += 'FaadDecoderPlugin.cxx'
endif endif
libgme_dep = c_compiler.find_library('gme', required: get_option('gme')) libgme_dep = dependency('libgme', version: '>= 0.6', required: get_option('gme'))
decoder_features.set('ENABLE_GME', libgme_dep.found()) decoder_features.set('ENABLE_GME', libgme_dep.found())
if libgme_dep.found() if libgme_dep.found()
decoder_plugins_sources += 'GmeDecoderPlugin.cxx' decoder_plugins_sources += 'GmeDecoderPlugin.cxx'