Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
ae2c9e4f
Commit
ae2c9e4f
authored
Jun 07, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
var_InheritInteger -> var_InheritBool
parent
46048d0d
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
25 additions
and
25 deletions
+25
-25
modules/access/v4l2.c
modules/access/v4l2.c
+2
-2
modules/access/vcdx/access.c
modules/access/vcdx/access.c
+1
-1
modules/access_output/http.c
modules/access_output/http.c
+1
-1
modules/audio_filter/channel_mixer/headphone.c
modules/audio_filter/channel_mixer/headphone.c
+2
-2
modules/audio_filter/channel_mixer/mono.c
modules/audio_filter/channel_mixer/mono.c
+1
-1
modules/audio_filter/converter/a52tofloat32.c
modules/audio_filter/converter/a52tofloat32.c
+2
-2
modules/audio_filter/resampler/bandlimited.c
modules/audio_filter/resampler/bandlimited.c
+1
-1
modules/audio_output/jack.c
modules/audio_output/jack.c
+1
-1
modules/audio_output/oss.c
modules/audio_output/oss.c
+1
-1
modules/control/motion.c
modules/control/motion.c
+1
-1
modules/control/ntservice.c
modules/control/ntservice.c
+2
-2
modules/demux/avi/avi.c
modules/demux/avi/avi.c
+1
-1
modules/demux/mkv/Ebml_parser.cpp
modules/demux/mkv/Ebml_parser.cpp
+2
-2
modules/demux/mkv/matroska_segment_parse.cpp
modules/demux/mkv/matroska_segment_parse.cpp
+1
-1
modules/demux/mkv/mkv.cpp
modules/demux/mkv/mkv.cpp
+2
-2
modules/gui/fbosd.c
modules/gui/fbosd.c
+1
-1
modules/gui/qt4/components/controller_widget.cpp
modules/gui/qt4/components/controller_widget.cpp
+1
-1
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+1
-1
modules/misc/notify/xosd.c
modules/misc/notify/xosd.c
+1
-1
No files found.
modules/access/v4l2.c
View file @
ae2c9e4f
...
...
@@ -679,7 +679,7 @@ static int DemuxOpen( vlc_object_t *p_this )
ParseMRL
(
p_sys
,
p_demux
->
psz_path
,
(
vlc_object_t
*
)
p_demux
);
#ifdef HAVE_LIBV4L2
if
(
!
var_Inherit
Integer
(
p_this
,
CFG_PREFIX
"use-libv4l2"
)
)
if
(
!
var_Inherit
Bool
(
p_this
,
CFG_PREFIX
"use-libv4l2"
)
)
{
msg_Dbg
(
p_this
,
"Trying direct kernel v4l2"
);
use_kernel_v4l2
(
p_sys
);
...
...
@@ -1134,7 +1134,7 @@ static int AccessOpen( vlc_object_t * p_this )
ParseMRL
(
p_sys
,
p_access
->
psz_location
,
(
vlc_object_t
*
)
p_access
);
#ifdef HAVE_LIBV4L2
if
(
!
var_Inherit
Integer
(
p_this
,
CFG_PREFIX
"use-libv4l2"
)
)
if
(
!
var_Inherit
Bool
(
p_this
,
CFG_PREFIX
"use-libv4l2"
)
)
{
msg_Dbg
(
p_this
,
"Trying direct kernel v4l2"
);
use_kernel_v4l2
(
p_sys
);
...
...
modules/access/vcdx/access.c
View file @
ae2c9e4f
...
...
@@ -546,7 +546,7 @@ VCDParse( access_t * p_access, /*out*/ vcdinfo_itemid_t * p_itemid,
char
*
psz_source
;
char
*
psz_next
;
if
(
var_Inherit
Integer
(
p_access
,
MODULE_STRING
"-PBC"
)
)
{
if
(
var_Inherit
Bool
(
p_access
,
MODULE_STRING
"-PBC"
)
)
{
p_itemid
->
type
=
VCDINFO_ITEM_TYPE_LID
;
p_itemid
->
num
=
1
;
*
play_single_item
=
false
;
...
...
modules/access_output/http.c
View file @
ae2c9e4f
...
...
@@ -279,7 +279,7 @@ static int Open( vlc_object_t *p_this )
}
#if 0 //def HAVE_AVAHI_CLIENT
if( var_Inherit
Integer
(p_this, SOUT_CFG_PREFIX "bonjour") )
if( var_Inherit
Bool
(p_this, SOUT_CFG_PREFIX "bonjour") )
{
char *psz_txt, *psz_name;
playlist_t *p_playlist = pl_Get( p_access );
...
...
modules/audio_filter/channel_mixer/headphone.c
View file @
ae2c9e4f
...
...
@@ -197,7 +197,7 @@ static int Init( vlc_object_t *p_this, struct filter_sys_t * p_data
int
i_source_channel_offset
;
unsigned
int
i
;
if
(
var_Inherit
Integer
(
p_this
,
"headphone-compensate"
)
)
if
(
var_Inherit
Bool
(
p_this
,
"headphone-compensate"
)
)
{
/* minimal distance to any speaker */
if
(
i_physical_channels
&
AOUT_CHAN_REARCENTER
)
...
...
@@ -473,7 +473,7 @@ static int OpenFilter( vlc_object_t *p_this )
}
if
(
p_filter
->
fmt_in
.
audio
.
i_physical_channels
==
(
AOUT_CHAN_LEFT
|
AOUT_CHAN_RIGHT
)
&&
(
p_filter
->
fmt_in
.
audio
.
i_original_channels
&
AOUT_CHAN_DOLBYSTEREO
)
&&
!
var_Inherit
Integer
(
p_filter
,
"headphone-dolby"
)
)
&&
!
var_Inherit
Bool
(
p_filter
,
"headphone-dolby"
)
)
{
b_fit
=
false
;
p_filter
->
fmt_in
.
audio
.
i_physical_channels
=
AOUT_CHAN_LEFT
|
AOUT_CHAN_RIGHT
|
...
...
modules/audio_filter/channel_mixer/mono.c
View file @
ae2c9e4f
...
...
@@ -213,7 +213,7 @@ static int Init( vlc_object_t *p_this, struct filter_sys_t * p_data,
int
i_source_channel_offset
;
unsigned
int
i
;
if
(
var_Inherit
Integer
(
p_this
,
"headphone-compensate"
)
)
if
(
var_Inherit
Bool
(
p_this
,
"headphone-compensate"
)
)
{
/* minimal distance to any speaker */
if
(
i_physical_channels
&
AOUT_CHAN_REARCENTER
)
...
...
modules/audio_filter/converter/a52tofloat32.c
View file @
ae2c9e4f
...
...
@@ -107,14 +107,14 @@ vlc_module_end ()
static
int
Open
(
vlc_object_t
*
p_this
,
filter_sys_t
*
p_sys
,
audio_format_t
input
,
audio_format_t
output
)
{
p_sys
->
b_dynrng
=
var_Inherit
Integer
(
p_this
,
"a52-dynrng"
);
p_sys
->
b_dynrng
=
var_Inherit
Bool
(
p_this
,
"a52-dynrng"
);
p_sys
->
b_dontwarn
=
0
;
/* No upmixing: it's not necessary and some other filters may want to do
* it themselves. */
if
(
aout_FormatNbChannels
(
&
output
)
>
aout_FormatNbChannels
(
&
input
)
)
{
if
(
!
var_Inherit
Integer
(
p_this
,
"a52-upmix"
)
)
if
(
!
var_Inherit
Bool
(
p_this
,
"a52-upmix"
)
)
{
return
VLC_EGENERIC
;
}
...
...
modules/audio_filter/resampler/bandlimited.c
View file @
ae2c9e4f
...
...
@@ -296,7 +296,7 @@ static int OpenFilter( vlc_object_t *p_this )
}
#if !defined( SYS_DARWIN )
if
(
!
var_Inherit
Integer
(
p_this
,
"hq-resampling"
)
)
if
(
!
var_Inherit
Bool
(
p_this
,
"hq-resampling"
)
)
{
return
VLC_EGENERIC
;
}
...
...
modules/audio_output/jack.c
View file @
ae2c9e4f
...
...
@@ -186,7 +186,7 @@ static int Open( vlc_object_t *p_this )
}
/* Auto connect ports if we were asked to */
if
(
var_Inherit
Integer
(
p_aout
,
AUTO_CONNECT_OPTION
)
)
if
(
var_Inherit
Bool
(
p_aout
,
AUTO_CONNECT_OPTION
)
)
{
unsigned
int
i_in_ports
;
char
*
psz_regex
=
var_InheritString
(
p_aout
,
CONNECT_REGEX_OPTION
);
...
...
modules/audio_output/oss.c
View file @
ae2c9e4f
...
...
@@ -509,7 +509,7 @@ static int Open( vlc_object_t *p_this )
}
p_aout
->
output
.
p_sys
->
b_workaround_buggy_driver
=
var_Inherit
Integer
(
p_aout
,
"oss-buggy"
);
var_Inherit
Bool
(
p_aout
,
"oss-buggy"
);
/* Create OSS thread and wait for its readiness. */
if
(
vlc_thread_create
(
p_aout
,
"aout"
,
OSSThread
,
...
...
modules/control/motion.c
View file @
ae2c9e4f
...
...
@@ -157,7 +157,7 @@ int Open ( vlc_object_t *p_this )
p_intf
->
pf_run
=
RunIntf
;
p_intf
->
p_sys
->
b_use_rotate
=
var_Inherit
Integer
(
p_intf
,
"motion-use-rotate"
);
var_Inherit
Bool
(
p_intf
,
"motion-use-rotate"
);
return
VLC_SUCCESS
;
}
...
...
modules/control/ntservice.c
View file @
ae2c9e4f
...
...
@@ -138,13 +138,13 @@ static void Run( intf_thread_t *p_intf )
p_intf
->
p_sys
->
psz_service
=
p_intf
->
p_sys
->
psz_service
?
p_intf
->
p_sys
->
psz_service
:
strdup
(
VLCSERVICENAME
);
if
(
var_Inherit
Integer
(
p_intf
,
"ntservice-install"
)
)
if
(
var_Inherit
Bool
(
p_intf
,
"ntservice-install"
)
)
{
NTServiceInstall
(
p_intf
);
return
;
}
if
(
var_Inherit
Integer
(
p_intf
,
"ntservice-uninstall"
)
)
if
(
var_Inherit
Bool
(
p_intf
,
"ntservice-uninstall"
)
)
{
NTServiceUninstall
(
p_intf
);
return
;
...
...
modules/demux/avi/avi.c
View file @
ae2c9e4f
...
...
@@ -283,7 +283,7 @@ static int Open( vlc_object_t * p_this )
/* For unseekable stream, automaticaly use Demux_UnSeekable */
if
(
!
p_sys
->
b_seekable
||
var_Inherit
Integer
(
p_demux
,
"avi-interleaved"
)
)
||
var_Inherit
Bool
(
p_demux
,
"avi-interleaved"
)
)
{
p_demux
->
pf_demux
=
Demux_UnSeekable
;
}
...
...
modules/demux/mkv/Ebml_parser.cpp
View file @
ae2c9e4f
...
...
@@ -42,7 +42,7 @@ EbmlParser::EbmlParser( EbmlStream *es, EbmlElement *el_start, demux_t *p_demux
mi_level
=
1
;
mi_user_level
=
1
;
mb_keep
=
false
;
mb_dummy
=
var_Inherit
Integer
(
p_demux
,
"mkv-use-dummy"
);
mb_dummy
=
var_Inherit
Bool
(
p_demux
,
"mkv-use-dummy"
);
}
EbmlParser
::~
EbmlParser
(
void
)
...
...
@@ -124,7 +124,7 @@ void EbmlParser::Reset( demux_t *p_demux )
mi_user_level
=
mi_level
=
1
;
// a little faster and cleaner
m_es
->
I_O
().
setFilePointer
(
static_cast
<
KaxSegment
*>
(
m_el
[
0
])
->
GetGlobalPosition
(
0
)
);
mb_dummy
=
var_Inherit
Integer
(
p_demux
,
"mkv-use-dummy"
);
mb_dummy
=
var_Inherit
Bool
(
p_demux
,
"mkv-use-dummy"
);
}
EbmlElement
*
EbmlParser
::
Get
(
void
)
...
...
modules/demux/mkv/matroska_segment_parse.cpp
View file @
ae2c9e4f
...
...
@@ -1032,7 +1032,7 @@ void matroska_segment_c::ParseChapters( KaxChapters *chapters )
}
else
if
(
MKV_IS_ID
(
l
,
KaxEditionFlagOrdered
)
)
{
p_edition
->
b_ordered
=
var_Inherit
Integer
(
&
sys
.
demuxer
,
"mkv-use-ordered-chapters"
)
?
(
uint8
(
*
static_cast
<
KaxEditionFlagOrdered
*>
(
l
))
!=
0
)
:
0
;
p_edition
->
b_ordered
=
var_Inherit
Bool
(
&
sys
.
demuxer
,
"mkv-use-ordered-chapters"
)
?
(
uint8
(
*
static_cast
<
KaxEditionFlagOrdered
*>
(
l
))
!=
0
)
:
0
;
}
else
if
(
MKV_IS_ID
(
l
,
KaxEditionFlagDefault
)
)
{
...
...
modules/demux/mkv/mkv.cpp
View file @
ae2c9e4f
...
...
@@ -139,7 +139,7 @@ static int Open( vlc_object_t * p_this )
goto
error
;
}
if
(
var_Inherit
Integer
(
p_demux
,
"mkv-preload-local-dir"
))
if
(
var_Inherit
Bool
(
p_demux
,
"mkv-preload-local-dir"
))
{
/* get the files from the same dir from the same family (based on p_demux->psz_path) */
if
(
p_demux
->
psz_path
[
0
]
!=
'\0'
&&
!
strcmp
(
p_demux
->
psz_access
,
""
))
...
...
@@ -421,7 +421,7 @@ static void Seek( demux_t *p_demux, mtime_t i_date, double f_percent, chapter_it
}
/* seek without index or without date */
if
(
f_percent
>=
0
&&
(
var_Inherit
Integer
(
p_demux
,
"mkv-seek-percent"
)
||
!
p_segment
->
b_cues
||
i_date
<
0
))
if
(
f_percent
>=
0
&&
(
var_Inherit
Bool
(
p_demux
,
"mkv-seek-percent"
)
||
!
p_segment
->
b_cues
||
i_date
<
0
))
{
if
(
p_sys
->
f_duration
>=
0
&&
p_segment
->
b_cues
)
{
...
...
modules/gui/fbosd.c
View file @
ae2c9e4f
...
...
@@ -538,7 +538,7 @@ static int OpenBlending( intf_thread_t *p_intf )
p_intf
->
p_sys
->
fmt_out
.
i_sar_den
;
p_intf
->
p_sys
->
p_blend
->
fmt_out
.
video
.
i_chroma
=
p_intf
->
p_sys
->
fmt_out
.
i_chroma
;
if
(
var_Inherit
Integer
(
p_intf
,
"freetype-yuvp"
)
)
if
(
var_Inherit
Bool
(
p_intf
,
"freetype-yuvp"
)
)
p_intf
->
p_sys
->
p_blend
->
fmt_in
.
video
.
i_chroma
=
VLC_CODEC_YUVP
;
else
...
...
modules/gui/qt4/components/controller_widget.cpp
View file @
ae2c9e4f
...
...
@@ -87,7 +87,7 @@ SoundWidget::SoundWidget( QWidget *_parent, intf_thread_t * _p_intf,
{
volumeSlider
=
new
SoundSlider
(
this
,
config_GetInt
(
p_intf
,
"volume-step"
),
var_Inherit
Integer
(
p_intf
,
"qt-volume-complete"
),
var_Inherit
Bool
(
p_intf
,
"qt-volume-complete"
),
var_InheritString
(
p_intf
,
"qt-slider-colours"
)
);
}
else
...
...
modules/gui/qt4/main_interface.cpp
View file @
ae2c9e4f
...
...
@@ -110,7 +110,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
b_autoresize
=
var_InheritBool
(
p_intf
,
"qt-video-autoresize"
);
/* Are we in the enhanced always-video mode or not ? */
i_visualmode
=
var_Inherit
Integer
(
p_intf
,
"qt-minimal-view"
);
i_visualmode
=
var_Inherit
Bool
(
p_intf
,
"qt-minimal-view"
);
/* Do we want anoying popups or not */
b_notificationEnabled
=
var_InheritBool
(
p_intf
,
"qt-notification"
);
...
...
modules/misc/notify/xosd.c
View file @
ae2c9e4f
...
...
@@ -141,7 +141,7 @@ static int Open( vlc_object_t *p_this )
xosd_set_font
(
p_osd
,
psz_font
);
xosd_set_colour
(
p_osd
,
psz_colour
);
xosd_set_timeout
(
p_osd
,
3
);
xosd_set_pos
(
p_osd
,
var_Inherit
Integer
(
p_intf
,
"xosd-position"
)
?
xosd_set_pos
(
p_osd
,
var_Inherit
Bool
(
p_intf
,
"xosd-position"
)
?
XOSD_bottom:
XOSD_top
);
xosd_set_horizontal_offset
(
p_osd
,
var_InheritInteger
(
p_intf
,
"xosd-text-offset"
)
);
...
...
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