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
cec2a837
Commit
cec2a837
authored
Dec 24, 2014
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
output/jack: WriteSamples() returns size_t
parent
cff47262
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
4 deletions
+11
-4
JackOutputPlugin.cxx
src/output/plugins/JackOutputPlugin.cxx
+11
-4
No files found.
src/output/plugins/JackOutputPlugin.cxx
View file @
cec2a837
...
@@ -111,7 +111,11 @@ struct JackOutput {
...
@@ -111,7 +111,11 @@ struct JackOutput {
void
Process
(
jack_nframes_t
nframes
);
void
Process
(
jack_nframes_t
nframes
);
void
WriteSamples
(
const
void
*
src
,
size_t
n_frames
);
/**
* @return the number of frames that were written
*/
size_t
WriteSamples
(
const
void
*
src
,
size_t
n_frames
);
size_t
Play
(
const
void
*
chunk
,
size_t
size
,
Error
&
error
);
size_t
Play
(
const
void
*
chunk
,
size_t
size
,
Error
&
error
);
};
};
...
@@ -636,9 +640,11 @@ mpd_jack_delay(AudioOutput *ao)
...
@@ -636,9 +640,11 @@ mpd_jack_delay(AudioOutput *ao)
:
0
;
:
0
;
}
}
inline
void
inline
size_t
JackOutput
::
WriteSamples
(
const
void
*
_src
,
size_t
n_frames
)
JackOutput
::
WriteSamples
(
const
void
*
_src
,
size_t
n_frames
)
{
{
const
size_t
result
=
n_frames
;
const
float
*
src
=
(
const
float
*
)
_src
;
const
float
*
src
=
(
const
float
*
)
_src
;
while
(
n_frames
--
>
0
)
{
while
(
n_frames
--
>
0
)
{
...
@@ -648,6 +654,8 @@ JackOutput::WriteSamples(const void *_src, size_t n_frames)
...
@@ -648,6 +654,8 @@ JackOutput::WriteSamples(const void *_src, size_t n_frames)
sizeof
(
*
src
));
sizeof
(
*
src
));
}
}
}
}
return
result
;
}
}
inline
size_t
inline
size_t
...
@@ -689,8 +697,7 @@ JackOutput::Play(const void *chunk, size_t size, Error &error)
...
@@ -689,8 +697,7 @@ JackOutput::Play(const void *chunk, size_t size, Error &error)
if
(
space
<
size
)
if
(
space
<
size
)
size
=
space
;
size
=
space
;
WriteSamples
(
chunk
,
size
);
return
WriteSamples
(
chunk
,
size
)
*
frame_size
;
return
size
*
frame_size
;
}
}
static
size_t
static
size_t
...
...
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