Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
0206a46d
Commit
0206a46d
authored
Mar 09, 2023
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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.
parent
9475ef22
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
7 deletions
+4
-7
NEWS
NEWS
+2
-0
GmeDecoderPlugin.cxx
src/decoder/plugins/GmeDecoderPlugin.cxx
+1
-6
meson.build
src/decoder/plugins/meson.build
+1
-1
No files found.
NEWS
View file @
0206a46d
ver 0.23.13 (not yet released)
ver 0.23.13 (not yet released)
* input
* input
- curl: fix busy loop after connection failed
- curl: fix busy loop after connection failed
* decoder
- gme: require GME 0.6 or later
* output
* output
- pipewire: fix corruption bug due to missing lock
- pipewire: fix corruption bug due to missing lock
* Linux
* Linux
...
...
src/decoder/plugins/GmeDecoderPlugin.cxx
View file @
0206a46d
...
@@ -56,20 +56,17 @@ struct GmeContainerPath {
...
@@ -56,20 +56,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
...
@@ -163,10 +160,8 @@ gme_file_decode(DecoderClient &client, Path path_fs)
...
@@ -163,10 +160,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
);
...
...
src/decoder/plugins/meson.build
View file @
0206a46d
...
@@ -81,7 +81,7 @@ if libfaad_dep.found()
...
@@ -81,7 +81,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'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment