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
95759bad
Commit
95759bad
authored
Jan 18, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libvlc: config_Get -> var_Inherit
parent
36312a90
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
19 additions
and
14 deletions
+19
-14
src/audio_output/output.c
src/audio_output/output.c
+1
-1
src/input/decoder.c
src/input/decoder.c
+1
-1
src/input/decoder_synchro.c
src/input/decoder_synchro.c
+2
-2
src/misc/action.c
src/misc/action.c
+1
-1
src/misc/pthread.c
src/misc/pthread.c
+2
-2
src/misc/threads.c
src/misc/threads.c
+2
-2
src/osd/osd.c
src/osd/osd.c
+9
-4
src/stream_output/stream_output.c
src/stream_output/stream_output.c
+1
-1
No files found.
src/audio_output/output.c
View file @
95759bad
...
...
@@ -43,7 +43,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
audio_sample_format_t
*
p_format
)
{
/* Retrieve user defaults. */
int
i_rate
=
config_GetInt
(
p_aout
,
"aout-rate"
);
int
i_rate
=
var_InheritInteger
(
p_aout
,
"aout-rate"
);
vlc_value_t
val
,
text
;
/* kludge to avoid a fpu error when rate is 0... */
if
(
i_rate
==
0
)
i_rate
=
-
1
;
...
...
src/input/decoder.c
View file @
95759bad
...
...
@@ -2174,7 +2174,7 @@ static aout_buffer_t *aout_new_buffer( decoder_t *p_dec, int i_samples )
if
(
p_owner
->
p_aout_input
==
NULL
)
{
const
int
i_force_dolby
=
config_GetInt
(
p_dec
,
"force-dolby-surround"
);
const
int
i_force_dolby
=
var_InheritInteger
(
p_dec
,
"force-dolby-surround"
);
audio_sample_format_t
format
;
aout_input_t
*
p_aout_input
;
aout_instance_t
*
p_aout
;
...
...
src/input/decoder_synchro.c
View file @
95759bad
...
...
@@ -166,8 +166,8 @@ decoder_synchro_t * decoder_SynchroInit( decoder_t *p_dec, int i_frame_rate )
return
NULL
;
p_synchro
->
p_dec
=
p_dec
;
p_synchro
->
b_no_skip
=
!
config_GetInt
(
p_dec
,
"skip-frames"
);
p_synchro
->
b_quiet
=
config_GetInt
(
p_dec
,
"quiet-synchro"
);
p_synchro
->
b_no_skip
=
!
var_InheritBool
(
p_dec
,
"skip-frames"
);
p_synchro
->
b_quiet
=
var_InheritBool
(
p_dec
,
"quiet-synchro"
);
/* We use a fake stream pattern, which is often right. */
p_synchro
->
i_n_p
=
p_synchro
->
i_eta_p
=
DEFAULT_NB_P
;
...
...
src/misc/action.c
View file @
95759bad
...
...
@@ -85,7 +85,7 @@ int vlc_InitActions (libvlc_int_t *libvlc)
for
(
size_t
i
=
0
;
i
<
libvlc_actions_count
;
i
++
)
{
keys
[
i
].
psz_action
=
libvlc_actions
[
i
].
name
;
keys
[
i
].
i_key
=
config_GetInt
(
libvlc
,
libvlc_actions
[
i
].
name
);
keys
[
i
].
i_key
=
var_InheritInteger
(
libvlc
,
libvlc_actions
[
i
].
name
);
keys
[
i
].
i_action
=
libvlc_actions
[
i
].
value
;
#ifndef NDEBUG
if
(
i
>
0
...
...
src/misc/pthread.c
View file @
95759bad
...
...
@@ -534,10 +534,10 @@ void vlc_threads_setup (libvlc_int_t *p_libvlc)
if
(
!
initialized
)
{
#ifndef __APPLE__
if
(
config_GetInt
(
p_libvlc
,
"rt-priority"
))
if
(
var_InheritBool
(
p_libvlc
,
"rt-priority"
))
#endif
{
rt_offset
=
config_GetInt
(
p_libvlc
,
"rt-offset"
);
rt_offset
=
var_InheritInteger
(
p_libvlc
,
"rt-offset"
);
rt_priorities
=
true
;
}
initialized
=
true
;
...
...
src/misc/threads.c
View file @
95759bad
...
...
@@ -117,7 +117,7 @@ int __vlc_thread_set_priority( vlc_object_t *p_this, const char * psz_file,
#if defined( LIBVLC_USE_PTHREAD )
# ifndef __APPLE__
if
(
config_GetInt
(
p_this
,
"rt-priority"
)
>
0
)
if
(
var_InheritBool
(
p_this
,
"rt-priority"
)
)
# endif
{
int
i_error
,
i_policy
;
...
...
@@ -125,7 +125,7 @@ int __vlc_thread_set_priority( vlc_object_t *p_this, const char * psz_file,
memset
(
&
param
,
0
,
sizeof
(
struct
sched_param
)
);
if
(
config_GetType
(
p_this
,
"rt-offset"
)
)
i_priority
+=
config_GetInt
(
p_this
,
"rt-offset"
);
i_priority
+=
var_InheritInteger
(
p_this
,
"rt-offset"
);
if
(
i_priority
<=
0
)
{
param
.
sched_priority
=
(
-
1
)
*
i_priority
;
...
...
src/osd/osd.c
View file @
95759bad
...
...
@@ -390,9 +390,12 @@ void __osd_MenuActivate( vlc_object_t *p_this )
p_button
->
p_current_state
->
p_pic
);
osd_SetMenuUpdate
(
p_osd
,
true
);
osd_SetMenuVisible
(
p_osd
,
true
);
osd_SetKeyPressed
(
VLC_OBJECT
(
p_osd
->
p_libvlc
),
config_GetInt
(
p_osd
,
p_button
->
psz_action
)
);
osd_SetKeyPressed
(
VLC_OBJECT
(
p_osd
->
p_libvlc
),
var_InheritInteger
(
p_osd
,
p_button
->
psz_action
)
);
#if defined(OSD_MENU_DEBUG)
msg_Dbg
(
p_osd
,
"select (%d, %s)"
,
config_GetInt
(
p_osd
,
p_button
->
psz_action
),
p_button
->
psz_action
);
msg_Dbg
(
p_osd
,
"select (%d, %s)"
,
var_InheritInteger
(
p_osd
,
p_button
->
psz_action
),
p_button
->
psz_action
);
#endif
}
vlc_mutex_unlock
(
p_lock
);
...
...
@@ -536,7 +539,8 @@ void __osd_MenuUp( vlc_object_t *p_this )
*/
if
(
p_button
->
b_range
)
{
osd_SetKeyPressed
(
VLC_OBJECT
(
p_osd
->
p_libvlc
),
config_GetInt
(
p_osd
,
p_button
->
psz_action
)
);
osd_SetKeyPressed
(
VLC_OBJECT
(
p_osd
->
p_libvlc
),
var_InheritInteger
(
p_osd
,
p_button
->
psz_action
)
);
#if defined(OSD_MENU_DEBUG)
msg_Dbg
(
p_osd
,
"select (%d, %s)"
,
val
.
i_int
,
p_button
->
psz_action
);
#endif
...
...
@@ -601,7 +605,8 @@ void __osd_MenuDown( vlc_object_t *p_this )
*/
if
(
p_button
->
b_range
)
{
osd_SetKeyPressed
(
VLC_OBJECT
(
p_osd
->
p_libvlc
),
config_GetInt
(
p_osd
,
p_button
->
psz_action_down
)
);
osd_SetKeyPressed
(
VLC_OBJECT
(
p_osd
->
p_libvlc
),
var_InheritInteger
(
p_osd
,
p_button
->
psz_action_down
)
);
#if defined(OSD_MENU_DEBUG)
msg_Dbg
(
p_osd
,
"select (%d, %s)"
,
val
.
i_int
,
p_button
->
psz_action_down
);
#endif
...
...
src/stream_output/stream_output.c
View file @
95759bad
...
...
@@ -90,7 +90,7 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, const char *psz_des
else
{
psz_chain
=
sout_stream_url_to_chain
(
config_GetInt
(
p_parent
,
"sout-display"
)
>
0
,
psz_dest
);
var_InheritBool
(
p_parent
,
"sout-display"
)
,
psz_dest
);
}
if
(
!
psz_chain
)
return
NULL
;
...
...
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