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
70c1ea6b
Commit
70c1ea6b
authored
Nov 17, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove aout_PacketPause()
parent
ba6c9da0
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
6 additions
and
30 deletions
+6
-30
include/vlc_aout.h
include/vlc_aout.h
+0
-1
modules/audio_output/audioqueue.c
modules/audio_output/audioqueue.c
+1
-1
modules/audio_output/auhal.c
modules/audio_output/auhal.c
+1
-1
modules/audio_output/directx.c
modules/audio_output/directx.c
+1
-1
modules/audio_output/jack.c
modules/audio_output/jack.c
+1
-1
modules/audio_output/kai.c
modules/audio_output/kai.c
+1
-1
modules/audio_output/packet.c
modules/audio_output/packet.c
+0
-23
modules/audio_output/waveout.c
modules/audio_output/waveout.c
+1
-1
No files found.
include/vlc_aout.h
View file @
70c1ea6b
...
...
@@ -328,7 +328,6 @@ VLC_DEPRECATED void aout_PacketDestroy(audio_output_t *);
VLC_DEPRECATED
int
aout_PacketTimeGet
(
audio_output_t
*
,
mtime_t
*
);
VLC_DEPRECATED
void
aout_PacketPlay
(
audio_output_t
*
,
block_t
*
);
VLC_DEPRECATED
void
aout_PacketPause
(
audio_output_t
*
,
bool
,
mtime_t
);
VLC_DEPRECATED
void
aout_PacketFlush
(
audio_output_t
*
,
bool
);
VLC_DEPRECATED
block_t
*
aout_PacketNext
(
audio_output_t
*
,
mtime_t
)
VLC_USED
;
...
...
modules/audio_output/audioqueue.c
View file @
70c1ea6b
...
...
@@ -125,7 +125,7 @@ static int Start( audio_output_t *aout, audio_sample_format_t *restrict fmt )
aout_PacketInit
(
p_aout
,
&
p_sys
->
packet
,
FRAME_SIZE
,
fmt
);
p_aout
->
time_get
=
aout_PacketTimeGet
;
p_aout
->
play
=
aout_PacketPlay
;
p_aout
->
pause
=
aout_PacketPause
;
p_aout
->
pause
=
NULL
;
p_aout
->
flush
=
aout_PacketFlush
;
aout_SoftVolumeStart
(
p_aout
);
...
...
modules/audio_output/auhal.c
View file @
70c1ea6b
...
...
@@ -174,7 +174,7 @@ static int Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt)
p_aout
->
time_get
=
aout_PacketTimeGet
;
p_aout
->
play
=
aout_PacketPlay
;
p_aout
->
pause
=
aout_PacketPause
;
p_aout
->
pause
=
NULL
;
p_aout
->
flush
=
aout_PacketFlush
;
aout_FormatPrint
(
p_aout
,
"VLC is looking for:"
,
fmt
);
...
...
modules/audio_output/directx.c
View file @
70c1ea6b
...
...
@@ -284,7 +284,7 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
p_aout
->
time_get
=
aout_PacketTimeGet
;
p_aout
->
play
=
Play
;
p_aout
->
pause
=
aout_PacketPause
;
p_aout
->
pause
=
NULL
;
p_aout
->
flush
=
aout_PacketFlush
;
return
VLC_SUCCESS
;
...
...
modules/audio_output/jack.c
View file @
70c1ea6b
...
...
@@ -134,7 +134,7 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
p_aout
->
time_get
=
aout_PacketTimeGet
;
p_aout
->
play
=
aout_PacketPlay
;
p_aout
->
pause
=
aout_PacketPause
;
p_aout
->
pause
=
NULL
;
p_aout
->
flush
=
aout_PacketFlush
;
aout_PacketInit
(
p_aout
,
&
p_sys
->
packet
,
jack_get_buffer_size
(
p_sys
->
p_jack_client
),
fmt
);
...
...
modules/audio_output/kai.c
View file @
70c1ea6b
...
...
@@ -197,7 +197,7 @@ static int Start ( audio_output_t *p_aout, audio_sample_format_t *fmt )
p_aout
->
time_get
=
aout_PacketTimeGet
;
p_aout
->
play
=
Play
;
p_aout
->
pause
=
aout_PacketPause
;
p_aout
->
pause
=
NULL
;
p_aout
->
flush
=
aout_PacketFlush
;
aout_SoftVolumeStart
(
p_aout
);
...
...
modules/audio_output/packet.c
View file @
70c1ea6b
...
...
@@ -185,29 +185,6 @@ void aout_PacketPlay (audio_output_t *aout, block_t *block)
vlc_mutex_unlock
(
&
p
->
lock
);
}
void
aout_PacketPause
(
audio_output_t
*
aout
,
bool
pause
,
mtime_t
date
)
{
aout_packet_t
*
p
=
aout_packet
(
aout
);
if
(
pause
)
{
assert
(
p
->
pause_date
==
VLC_TS_INVALID
);
p
->
pause_date
=
date
;
}
else
{
assert
(
p
->
pause_date
!=
VLC_TS_INVALID
);
mtime_t
duration
=
date
-
p
->
pause_date
;
p
->
pause_date
=
VLC_TS_INVALID
;
vlc_mutex_lock
(
&
p
->
lock
);
aout_FifoMoveDates
(
&
p
->
partial
,
duration
);
aout_FifoMoveDates
(
&
p
->
fifo
,
duration
);
vlc_mutex_unlock
(
&
p
->
lock
);
}
}
void
aout_PacketFlush
(
audio_output_t
*
aout
,
bool
drain
)
{
aout_packet_t
*
p
=
aout_packet
(
aout
);
...
...
modules/audio_output/waveout.c
View file @
70c1ea6b
...
...
@@ -162,7 +162,7 @@ static int Start( audio_output_t *p_aout, audio_sample_format_t *restrict fmt )
p_aout
->
time_get
=
aout_PacketTimeGet
;
p_aout
->
play
=
Play
;
p_aout
->
pause
=
aout_PacketPause
;
p_aout
->
pause
=
NULL
;
p_aout
->
flush
=
aout_PacketFlush
;
/*
...
...
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