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
ebcb5e93
Commit
ebcb5e93
authored
May 27, 2020
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/wildmidi: use NarrowPath, fixing the Windows build
parent
69f09648
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
NEWS
NEWS
+1
-0
WildmidiDecoderPlugin.cxx
src/decoder/plugins/WildmidiDecoderPlugin.cxx
+5
-3
No files found.
NEWS
View file @
ebcb5e93
...
...
@@ -5,6 +5,7 @@ ver 0.21.24 (not yet released)
- simple: fix crash when mounting twice
* decoder
- wildmidi: attempt to detect WildMidi using pkg-config
- wildmidi: fix Windows build failure
* Android
- fix build failure with Android NDK r21
* Windows
...
...
src/decoder/plugins/WildmidiDecoderPlugin.cxx
View file @
ebcb5e93
...
...
@@ -25,6 +25,7 @@
#include "fs/AllocatedPath.hxx"
#include "fs/FileSystem.hxx"
#include "fs/Path.hxx"
#include "fs/NarrowPath.hxx"
#include "Log.hxx"
#include "PluginUnavailable.hxx"
...
...
@@ -53,7 +54,8 @@ wildmidi_init(const ConfigBlock &block)
AtScopeExit
()
{
WildMidi_ClearError
();
};
#endif
if
(
WildMidi_Init
(
path
.
c_str
(),
wildmidi_audio_format
.
sample_rate
,
if
(
WildMidi_Init
(
NarrowPath
(
path
),
wildmidi_audio_format
.
sample_rate
,
0
)
!=
0
)
{
#ifdef LIBWILDMIDI_VERSION
/* WildMidi_GetError() requires libwildmidi 0.4 */
...
...
@@ -96,7 +98,7 @@ wildmidi_file_decode(DecoderClient &client, Path path_fs)
midi
*
wm
;
const
struct
_WM_Info
*
info
;
wm
=
WildMidi_Open
(
path_fs
.
c_str
(
));
wm
=
WildMidi_Open
(
NarrowPath
(
path_fs
));
if
(
wm
==
nullptr
)
return
;
...
...
@@ -136,7 +138,7 @@ wildmidi_file_decode(DecoderClient &client, Path path_fs)
static
bool
wildmidi_scan_file
(
Path
path_fs
,
TagHandler
&
handler
)
noexcept
{
midi
*
wm
=
WildMidi_Open
(
path_fs
.
c_str
(
));
midi
*
wm
=
WildMidi_Open
(
NarrowPath
(
path_fs
));
if
(
wm
==
nullptr
)
return
false
;
...
...
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