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
ed6d0aa5
Commit
ed6d0aa5
authored
Jul 07, 2018
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/wildmidi: convert WILDMIDI_SAMPLE_RATE to AudioFormat
parent
3d27fffc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
10 deletions
+6
-10
WildmidiDecoderPlugin.cxx
src/decoder/plugins/WildmidiDecoderPlugin.cxx
+6
-10
No files found.
src/decoder/plugins/WildmidiDecoderPlugin.cxx
View file @
ed6d0aa5
...
...
@@ -33,7 +33,7 @@ extern "C" {
static
constexpr
Domain
wildmidi_domain
(
"wildmidi"
);
static
constexpr
unsigned
WILDMIDI_SAMPLE_RATE
=
48000
;
static
constexpr
AudioFormat
wildmidi_audio_format
{
48000
,
SampleFormat
::
S16
,
2
}
;
static
bool
wildmidi_init
(
const
ConfigBlock
&
block
)
...
...
@@ -50,7 +50,8 @@ wildmidi_init(const ConfigBlock &block)
return
false
;
}
return
WildMidi_Init
(
path
.
c_str
(),
WILDMIDI_SAMPLE_RATE
,
0
)
==
0
;
return
WildMidi_Init
(
path
.
c_str
(),
wildmidi_audio_format
.
sample_rate
,
0
)
==
0
;
}
static
void
...
...
@@ -80,11 +81,6 @@ wildmidi_output(DecoderClient &client, midi *wm)
static
void
wildmidi_file_decode
(
DecoderClient
&
client
,
Path
path_fs
)
{
static
constexpr
AudioFormat
audio_format
=
{
WILDMIDI_SAMPLE_RATE
,
SampleFormat
::
S16
,
2
,
};
midi
*
wm
;
const
struct
_WM_Info
*
info
;
...
...
@@ -100,9 +96,9 @@ wildmidi_file_decode(DecoderClient &client, Path path_fs)
const
auto
duration
=
SongTime
::
FromScale
<
uint64_t
>
(
info
->
approx_total_samples
,
WILDMIDI_SAMPLE_RATE
);
wildmidi_audio_format
.
sample_rate
);
client
.
Ready
(
audio_format
,
true
,
duration
);
client
.
Ready
(
wildmidi_
audio_format
,
true
,
duration
);
DecoderCommand
cmd
;
do
{
...
...
@@ -140,7 +136,7 @@ wildmidi_scan_file(Path path_fs, TagHandler &handler) noexcept
const
auto
duration
=
SongTime
::
FromScale
<
uint64_t
>
(
info
->
approx_total_samples
,
WILDMIDI_SAMPLE_RATE
);
wildmidi_audio_format
.
sample_rate
);
handler
.
OnDuration
(
duration
);
WildMidi_Close
(
wm
);
...
...
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