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
8beacc9e
Commit
8beacc9e
authored
Sep 02, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PulseAudio: remove unused datum
parent
5e2cb462
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
12 deletions
+4
-12
modules/audio_output/pulse.c
modules/audio_output/pulse.c
+4
-12
No files found.
modules/audio_output/pulse.c
View file @
8beacc9e
...
@@ -72,7 +72,6 @@ struct aout_sys_t
...
@@ -72,7 +72,6 @@ struct aout_sys_t
pa_volume_t
base_volume
;
/**< 0dB reference volume */
pa_volume_t
base_volume
;
/**< 0dB reference volume */
pa_cvolume
cvolume
;
/**< actual sink input volume */
pa_cvolume
cvolume
;
/**< actual sink input volume */
mtime_t
first_pts
;
/**< Play time of buffer start */
mtime_t
first_pts
;
/**< Play time of buffer start */
mtime_t
paused
;
/**< Time when (last) paused */
pa_stream_flags_t
flags_force
;
/**< Forced flags (stream must be NULL) */
pa_stream_flags_t
flags_force
;
/**< Forced flags (stream must be NULL) */
char
*
sink_force
;
/**< Forced sink name (stream must be NULL) */
char
*
sink_force
;
/**< Forced sink name (stream must be NULL) */
...
@@ -271,8 +270,7 @@ static void stream_latency_cb(pa_stream *s, void *userdata)
...
@@ -271,8 +270,7 @@ static void stream_latency_cb(pa_stream *s, void *userdata)
audio_output_t
*
aout
=
userdata
;
audio_output_t
*
aout
=
userdata
;
aout_sys_t
*
sys
=
aout
->
sys
;
aout_sys_t
*
sys
=
aout
->
sys
;
if
(
sys
->
paused
!=
VLC_TS_INVALID
)
/* This callback is _never_ called while paused. */
return
;
/* nothing to do while paused */
if
(
sys
->
first_pts
==
VLC_TS_INVALID
)
if
(
sys
->
first_pts
==
VLC_TS_INVALID
)
return
;
/* nothing to do if buffers are (still) empty */
return
;
/* nothing to do if buffers are (still) empty */
if
(
pa_stream_is_corked
(
s
)
>
0
)
if
(
pa_stream_is_corked
(
s
)
>
0
)
...
@@ -514,8 +512,6 @@ static void Play(audio_output_t *aout, block_t *block)
...
@@ -514,8 +512,6 @@ static void Play(audio_output_t *aout, block_t *block)
aout_sys_t
*
sys
=
aout
->
sys
;
aout_sys_t
*
sys
=
aout
->
sys
;
pa_stream
*
s
=
sys
->
stream
;
pa_stream
*
s
=
sys
->
stream
;
assert
(
sys
->
paused
==
VLC_TS_INVALID
);
const
void
*
ptr
=
data_convert
(
&
block
);
const
void
*
ptr
=
data_convert
(
&
block
);
if
(
unlikely
(
ptr
==
NULL
))
if
(
unlikely
(
ptr
==
NULL
))
return
;
return
;
...
@@ -562,19 +558,16 @@ static void Pause(audio_output_t *aout, bool paused, mtime_t date)
...
@@ -562,19 +558,16 @@ static void Pause(audio_output_t *aout, bool paused, mtime_t date)
pa_threaded_mainloop_lock
(
sys
->
mainloop
);
pa_threaded_mainloop_lock
(
sys
->
mainloop
);
if
(
paused
)
{
if
(
paused
)
{
sys
->
paused
=
date
;
pa_stream_set_latency_update_callback
(
s
,
NULL
,
NULL
)
;
stream_stop
(
s
,
aout
);
stream_stop
(
s
,
aout
);
}
else
{
}
else
{
assert
(
sys
->
paused
!=
VLC_TS_INVALID
);
pa_stream_set_latency_update_callback
(
s
,
stream_latency_cb
,
aout
);
date
-=
sys
->
paused
;
msg_Dbg
(
aout
,
"resuming after %"
PRId64
" us"
,
date
);
sys
->
paused
=
VLC_TS_INVALID
;
if
(
likely
(
sys
->
first_pts
!=
VLC_TS_INVALID
))
if
(
likely
(
sys
->
first_pts
!=
VLC_TS_INVALID
))
stream_start_now
(
s
,
aout
);
stream_start_now
(
s
,
aout
);
}
}
pa_threaded_mainloop_unlock
(
sys
->
mainloop
);
pa_threaded_mainloop_unlock
(
sys
->
mainloop
);
(
void
)
date
;
}
}
/**
/**
...
@@ -821,7 +814,6 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
...
@@ -821,7 +814,6 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
sys
->
stream
=
NULL
;
sys
->
stream
=
NULL
;
sys
->
trigger
=
NULL
;
sys
->
trigger
=
NULL
;
sys
->
first_pts
=
VLC_TS_INVALID
;
sys
->
first_pts
=
VLC_TS_INVALID
;
sys
->
paused
=
VLC_TS_INVALID
;
/* Channel volume */
/* Channel volume */
sys
->
base_volume
=
PA_VOLUME_NORM
;
sys
->
base_volume
=
PA_VOLUME_NORM
;
...
...
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