Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
024ca98d
Commit
024ca98d
authored
Nov 16, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: make flush operation mandatory
parent
fc81dcfa
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
include/vlc_aout.h
include/vlc_aout.h
+1
-1
modules/audio_output/adummy.c
modules/audio_output/adummy.c
+6
-1
src/audio_output/output.c
src/audio_output/output.c
+1
-3
No files found.
include/vlc_aout.h
View file @
024ca98d
...
...
@@ -169,7 +169,7 @@ struct audio_output
* \note A stream must have been started when called.
*/
void
(
*
flush
)(
audio_output_t
*
,
bool
wait
);
/**< Flushes or drains the playback buffers (
optional, may
be NULL).
/**< Flushes or drains the playback buffers (
mandatoryl, cannot
be NULL).
* \param wait true to wait for playback of pending buffers (drain),
* false to discard pending buffers (flush)
* \note A stream must have been started when called.
...
...
modules/audio_output/adummy.c
View file @
024ca98d
...
...
@@ -48,6 +48,11 @@ static void Play(audio_output_t *aout, block_t *block)
(
void
)
aout
;
}
static
void
Flush
(
audio_output_t
*
aout
,
bool
wait
)
{
(
void
)
aout
;
(
void
)
wait
;
}
static
int
Start
(
audio_output_t
*
aout
,
audio_sample_format_t
*
restrict
fmt
)
{
if
(
AOUT_FMT_SPDIF
(
fmt
)
&&
var_InheritBool
(
aout
,
"spdif"
))
...
...
@@ -70,7 +75,7 @@ static int Open(vlc_object_t *obj)
aout
->
time_get
=
NULL
;
aout
->
play
=
Play
;
aout
->
pause
=
NULL
;
aout
->
flush
=
NULL
;
aout
->
flush
=
Flush
;
aout
->
stop
=
NULL
;
aout
->
volume_set
=
NULL
;
aout
->
mute_set
=
NULL
;
...
...
src/audio_output/output.c
View file @
024ca98d
...
...
@@ -449,7 +449,5 @@ void aout_OutputPause( audio_output_t *aout, bool pause, mtime_t date )
void
aout_OutputFlush
(
audio_output_t
*
aout
,
bool
wait
)
{
aout_assert_locked
(
aout
);
if
(
aout
->
flush
!=
NULL
)
aout
->
flush
(
aout
,
wait
);
aout
->
flush
(
aout
,
wait
);
}
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