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
0ce61c67
Commit
0ce61c67
authored
Jan 21, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
AudioQueue: fix flush if wait is true
parent
8f64d1c1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
8 deletions
+9
-8
modules/audio_output/audioqueue.c
modules/audio_output/audioqueue.c
+9
-8
No files found.
modules/audio_output/audioqueue.c
View file @
0ce61c67
...
...
@@ -200,13 +200,16 @@ static void Flush (audio_output_t *p_aout, bool wait)
if
(
p_aout
->
sys
->
b_stopped
||
!
p_aout
->
sys
->
audioQueue
)
return
;
AudioQueueDisposeTimeline
(
p_aout
->
sys
->
audioQueue
,
p_aout
->
sys
->
outTimeline
);
if
(
wait
)
AudioQueueFlush
(
p_aout
->
sys
->
audioQueue
);
else
{
p_aout
->
sys
->
i_played_length
=
0
;
AudioQueueStop
(
p_aout
->
sys
->
audioQueue
,
false
);
else
AudioQueueStop
(
p_aout
->
sys
->
audioQueue
,
true
);
AudioQueueStart
(
p_aout
->
sys
->
audioQueue
,
NULL
);
}
p_aout
->
sys
->
i_played_length
=
0
;
AudioQueueStart
(
p_aout
->
sys
->
audioQueue
,
NULL
);
AudioQueueCreateTimeline
(
p_aout
->
sys
->
audioQueue
,
&
p_aout
->
sys
->
outTimeline
);
}
static
int
TimeGet
(
audio_output_t
*
p_aout
,
mtime_t
*
restrict
delay
)
...
...
@@ -215,10 +218,8 @@ static int TimeGet (audio_output_t *p_aout, mtime_t *restrict delay)
Boolean
b_discontinuity
;
OSStatus
status
=
AudioQueueGetCurrentTime
(
p_aout
->
sys
->
audioQueue
,
p_aout
->
sys
->
outTimeline
,
&
outTimeStamp
,
&
b_discontinuity
);
if
(
status
!=
noErr
)
{
msg_Warn
(
p_aout
,
"AudioQueueGetCurrentTime failed (%li)"
,
status
);
if
(
status
!=
noErr
)
return
-
1
;
}
if
(
b_discontinuity
)
msg_Dbg
(
p_aout
,
"detected output discontinuity"
);
...
...
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