Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
a308b7a1
Commit
a308b7a1
authored
Mar 21, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: remove aout_DecIsEmpty()
parent
557eaa06
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
19 deletions
+0
-19
src/audio_output/aout_internal.h
src/audio_output/aout_internal.h
+0
-1
src/audio_output/dec.c
src/audio_output/dec.c
+0
-18
No files found.
src/audio_output/aout_internal.h
View file @
a308b7a1
...
@@ -140,7 +140,6 @@ int aout_DecPlay(audio_output_t *, block_t *, int i_input_rate);
...
@@ -140,7 +140,6 @@ int aout_DecPlay(audio_output_t *, block_t *, int i_input_rate);
int
aout_DecGetResetLost
(
audio_output_t
*
);
int
aout_DecGetResetLost
(
audio_output_t
*
);
void
aout_DecChangePause
(
audio_output_t
*
,
bool
b_paused
,
mtime_t
i_date
);
void
aout_DecChangePause
(
audio_output_t
*
,
bool
b_paused
,
mtime_t
i_date
);
void
aout_DecFlush
(
audio_output_t
*
,
bool
wait
);
void
aout_DecFlush
(
audio_output_t
*
,
bool
wait
);
bool
aout_DecIsEmpty
(
audio_output_t
*
);
void
aout_RequestRestart
(
audio_output_t
*
,
unsigned
);
void
aout_RequestRestart
(
audio_output_t
*
,
unsigned
);
static
inline
void
aout_InputRequestRestart
(
audio_output_t
*
aout
)
static
inline
void
aout_InputRequestRestart
(
audio_output_t
*
aout
)
...
...
src/audio_output/dec.c
View file @
a308b7a1
...
@@ -421,21 +421,3 @@ void aout_DecFlush (audio_output_t *aout, bool wait)
...
@@ -421,21 +421,3 @@ void aout_DecFlush (audio_output_t *aout, bool wait)
aout_OutputFlush
(
aout
,
wait
);
aout_OutputFlush
(
aout
,
wait
);
aout_OutputUnlock
(
aout
);
aout_OutputUnlock
(
aout
);
}
}
bool
aout_DecIsEmpty
(
audio_output_t
*
aout
)
{
aout_owner_t
*
owner
=
aout_owner
(
aout
);
mtime_t
now
=
mdate
();
bool
empty
=
true
;
aout_OutputLock
(
aout
);
if
(
owner
->
sync
.
end
!=
VLC_TS_INVALID
)
empty
=
owner
->
sync
.
end
<=
now
;
if
(
empty
&&
owner
->
mixer_format
.
i_format
)
/* The last PTS has elapsed already. So the underlying audio output
* buffer should be empty or almost. Thus draining should be fast
* and will not block the caller too long. */
aout_OutputFlush
(
aout
,
true
);
aout_OutputUnlock
(
aout
);
return
empty
;
}
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