Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
3fada58d
Commit
3fada58d
authored
Nov 26, 2006
by
zorglub
Browse files
Make the global b_can_pace_control flag public
parent
ea6f725b
Changes
5
Hide whitespace changes
Inline
Side-by-side
include/vlc_input.h
View file @
3fada58d
...
...
@@ -351,8 +351,11 @@ struct input_thread_t
vlc_bool_t
b_eof
;
vlc_bool_t
b_preparsing
;
int
i_state
;
vlc_bool_t
b_can_pace_control
;
int64_t
i_time
;
/* Current time */
/* Internal caching common to all inputs */
int
i_pts_delay
;
...
...
modules/gui/macosx/controls.m
View file @
3fada58d
...
...
@@ -39,10 +39,6 @@
#import "playlist.h"
#include <vlc_osd.h>
/* UGLY UGLY UGLY FIXME FIXME FIXME. Need solution for b_can_pace_control.
* Put it public ? Is it needed here ?*/
#include "../../../src/input/input_internal.h"
/*****************************************************************************
* VLCControls implementation
*****************************************************************************/
...
...
@@ -788,7 +784,7 @@
{
if
(
p_input
!=
NULL
)
{
bEnabled
=
p_input
->
p
->
input
.
b_can_pace_control
;
bEnabled
=
p_input
->
b_can_pace_control
;
}
else
{
...
...
src/input/clock.c
View file @
3fada58d
...
...
@@ -247,7 +247,7 @@ void input_ClockSetPCR( input_thread_t *p_input,
cl
->
last_pts
+
CR_MEAN_PTS_GAP
:
mdate
()
);
cl
->
i_synchro_state
=
SYNCHRO_OK
;
if
(
p_input
->
p
->
b_can_pace_control
&&
cl
->
b_master
)
if
(
p_input
->
b_can_pace_control
&&
cl
->
b_master
)
{
cl
->
last_cr
=
i_clock
;
if
(
!
p_input
->
p
->
b_out_pace_control
)
...
...
@@ -288,7 +288,7 @@ void input_ClockSetPCR( input_thread_t *p_input,
cl
->
last_cr
=
i_clock
;
if
(
p_input
->
p
->
b_can_pace_control
&&
cl
->
b_master
)
if
(
p_input
->
b_can_pace_control
&&
cl
->
b_master
)
{
/* Wait a while before delivering the packets to the decoder.
* In case of multiple programs, we arbitrarily follow the
...
...
src/input/input.c
View file @
3fada58d
...
...
@@ -137,7 +137,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
/* Init Common fields */
p_input
->
b_eof
=
VLC_FALSE
;
p_input
->
p
->
b_can_pace_control
=
VLC_TRUE
;
p_input
->
b_can_pace_control
=
VLC_TRUE
;
p_input
->
p
->
i_start
=
0
;
p_input
->
i_time
=
0
;
p_input
->
p
->
i_stop
=
0
;
...
...
@@ -809,7 +809,7 @@ static int Init( input_thread_t * p_input )
}
/* Global flag */
p_input
->
p
->
b_can_pace_control
=
p_input
->
p
->
input
.
b_can_pace_control
;
p_input
->
b_can_pace_control
=
p_input
->
p
->
input
.
b_can_pace_control
;
p_input
->
p
->
b_can_pause
=
p_input
->
p
->
input
.
b_can_pause
;
/* Fix pts delay */
...
...
@@ -1044,7 +1044,7 @@ static int Init( input_thread_t * p_input )
p_input
->
p
->
b_out_pace_control
=
VLC_TRUE
;
}
if
(
p_input
->
p
->
b_can_pace_control
&&
p_input
->
p
->
b_out_pace_control
)
if
(
p_input
->
b_can_pace_control
&&
p_input
->
p
->
b_out_pace_control
)
{
/* We don't want a high input priority here or we'll
* end-up sucking up all the CPU time */
...
...
@@ -1498,7 +1498,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
i_rate
=
INPUT_RATE_MAX
;
}
if
(
i_rate
!=
INPUT_RATE_DEFAULT
&&
(
!
p_input
->
p
->
b_can_pace_control
||
(
!
p_input
->
b_can_pace_control
||
(
p_input
->
p
->
p_sout
&&
!
p_input
->
p
->
b_out_pace_control
)
)
)
{
msg_Dbg
(
p_input
,
"cannot change rate"
);
...
...
src/input/input_internal.h
View file @
3fada58d
...
...
@@ -69,7 +69,6 @@ typedef struct
struct
input_thread_private_t
{
/* Global properties */
vlc_bool_t
b_can_pace_control
;
vlc_bool_t
b_can_pause
;
int
i_rate
;
...
...
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