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
62fffadf
Commit
62fffadf
authored
Oct 01, 2006
by
dionoea
Browse files
Rename all sout_Cfg* stuff to config_Chain* (as it isn't really sout specific)
parent
bebdb992
Changes
40
Hide whitespace changes
Inline
Side-by-side
include/configuration.h
View file @
62fffadf
...
...
@@ -407,3 +407,45 @@ int config_AutoSaveConfigFile( vlc_object_t * );
#define change_autosave() \
p_config[i_config].b_autosave = VLC_TRUE;
/****************************************************************************
* config_chain_t:
****************************************************************************/
struct
config_chain_t
{
config_chain_t
*
p_next
;
char
*
psz_name
;
char
*
psz_value
;
};
#define config_ChainParse( a, b, c, d ) __config_ChainParse( VLC_OBJECT(a), b, c, d )
VLC_EXPORT
(
void
,
__config_ChainParse
,
(
vlc_object_t
*
,
char
*
psz_prefix
,
const
char
**
ppsz_options
,
config_chain_t
*
)
);
VLC_EXPORT
(
char
*
,
config_ChainCreate
,
(
char
**
,
config_chain_t
**
,
char
*
)
);
VLC_EXPORT
(
void
,
config_ChainDestroy
,
(
config_chain_t
*
)
);
static
inline
config_chain_t
*
config_chain_find
(
config_chain_t
*
p_cfg
,
char
*
psz_name
)
{
while
(
p_cfg
&&
strcmp
(
p_cfg
->
psz_name
,
psz_name
)
)
{
p_cfg
=
p_cfg
->
p_next
;
}
return
p_cfg
;
}
static
inline
char
*
config_chain_find_value
(
config_chain_t
*
p_cfg
,
char
*
psz_name
)
{
while
(
p_cfg
&&
strcmp
(
p_cfg
->
psz_name
,
psz_name
)
)
{
p_cfg
=
p_cfg
->
p_next
;
}
if
(
p_cfg
&&
p_cfg
->
psz_value
)
{
return
(
p_cfg
->
psz_value
);
}
return
NULL
;
}
include/stream_output.h
View file @
62fffadf
...
...
@@ -52,21 +52,6 @@ struct sout_instance_t
sout_instance_sys_t
*
p_sys
;
};
/****************************************************************************
* sout_cfg_t:
****************************************************************************/
struct
sout_cfg_t
{
sout_cfg_t
*
p_next
;
char
*
psz_name
;
char
*
psz_value
;
};
#define sout_CfgParse( a, b, c, d ) __sout_CfgParse( VLC_OBJECT(a), b, c, d )
VLC_EXPORT
(
void
,
__sout_CfgParse
,
(
vlc_object_t
*
,
char
*
psz_prefix
,
const
char
**
ppsz_options
,
sout_cfg_t
*
)
);
VLC_EXPORT
(
char
*
,
sout_CfgCreate
,
(
char
**
,
sout_cfg_t
**
,
char
*
)
);
/****************************************************************************
* sout_stream_id_t: opaque (private for all sout_stream_t)
****************************************************************************/
...
...
@@ -104,7 +89,7 @@ struct sout_access_out_t
sout_instance_t
*
p_sout
;
char
*
psz_access
;
sout_cfg
_t
*
p_cfg
;
config_chain
_t
*
p_cfg
;
int
i_writes
;
int64_t
i_sent_bytes
;
///< This is a "local" counter that is reset each
...
...
@@ -134,7 +119,7 @@ struct sout_mux_t
sout_instance_t
*
p_sout
;
char
*
psz_mux
;
sout_cfg
_t
*
p_cfg
;
config_chain
_t
*
p_cfg
;
sout_access_out_t
*
p_access
;
...
...
@@ -208,7 +193,7 @@ struct sout_stream_t
sout_instance_t
*
p_sout
;
char
*
psz_name
;
sout_cfg
_t
*
p_cfg
;
config_chain
_t
*
p_cfg
;
char
*
psz_next
;
/* Subpicture unit */
...
...
@@ -312,32 +297,6 @@ struct announce_handler_t
/* End */
static
inline
sout_cfg_t
*
sout_cfg_find
(
sout_cfg_t
*
p_cfg
,
char
*
psz_name
)
{
while
(
p_cfg
&&
strcmp
(
p_cfg
->
psz_name
,
psz_name
)
)
{
p_cfg
=
p_cfg
->
p_next
;
}
return
p_cfg
;
}
static
inline
char
*
sout_cfg_find_value
(
sout_cfg_t
*
p_cfg
,
char
*
psz_name
)
{
while
(
p_cfg
&&
strcmp
(
p_cfg
->
psz_name
,
psz_name
)
)
{
p_cfg
=
p_cfg
->
p_next
;
}
if
(
p_cfg
&&
p_cfg
->
psz_value
)
{
return
(
p_cfg
->
psz_value
);
}
return
NULL
;
}
/* Announce system */
VLC_EXPORT
(
int
,
sout_AnnounceRegister
,
(
sout_instance_t
*
,
session_descriptor_t
*
,
announce_method_t
*
)
);
VLC_EXPORT
(
session_descriptor_t
*
,
sout_AnnounceRegisterSDP
,
(
sout_instance_t
*
,
const
char
*
,
const
char
*
,
announce_method_t
*
)
);
...
...
include/video_output.h
View file @
62fffadf
...
...
@@ -157,7 +157,7 @@ struct vout_thread_t
* these are handled like in transcode.c
* XXX: we might need to merge the two chains (v1 and v2 filters) */
char
*
psz_vfilters
[
MAX_VFILTERS
];
sout_cfg
_t
*
p_vfilters_cfg
[
MAX_VFILTERS
];
config_chain
_t
*
p_vfilters_cfg
[
MAX_VFILTERS
];
int
i_vfilters_cfg
;
filter_t
*
pp_vfilters
[
MAX_VFILTERS
];
...
...
include/vlc_codec.h
View file @
62fffadf
...
...
@@ -127,7 +127,7 @@ struct encoder_t
int
i_tolerance
;
/* Bitrate tolerance */
/* Encoder config */
sout_cfg
_t
*
p_cfg
;
config_chain
_t
*
p_cfg
;
};
/**
...
...
include/vlc_common.h
View file @
62fffadf
...
...
@@ -328,7 +328,7 @@ typedef struct sout_mux_sys_t sout_mux_sys_t;
typedef
struct
sout_stream_t
sout_stream_t
;
typedef
struct
sout_stream_sys_t
sout_stream_sys_t
;
typedef
struct
sout_cfg_t
sout_cfg
_t
;
typedef
struct
config_chain_t
config_chain
_t
;
typedef
struct
sap_session_t
sap_session_t
;
typedef
struct
sap_address_t
sap_address_t
;
typedef
struct
session_descriptor_t
session_descriptor_t
;
...
...
include/vlc_filter.h
View file @
62fffadf
...
...
@@ -58,7 +58,7 @@ struct filter_t
es_format_t
fmt_out
;
/* Filter configuration */
sout_cfg
_t
*
p_cfg
;
config_chain
_t
*
p_cfg
;
picture_t
*
(
*
pf_video_filter
)
(
filter_t
*
,
picture_t
*
);
block_t
*
(
*
pf_audio_filter
)
(
filter_t
*
,
block_t
*
);
...
...
include/vlc_symbols.h
View file @
62fffadf
...
...
@@ -109,8 +109,8 @@ struct module_symbols_t
void
(
*
__vout_OSDMessage_inner
)
(
vlc_object_t
*
,
int
,
char
*
,
...);
void
(
*
vout_OSDSlider_inner
)
(
vlc_object_t
*
,
int
,
int
,
short
);
void
(
*
vout_OSDIcon_inner
)
(
vlc_object_t
*
,
int
,
short
);
void
(
*
__sout_CfgParse_
inner
)
(
vlc_object_t
*
,
char
*
psz_prefix
,
const
char
**
ppsz_options
,
sout_cfg_t
*
)
;
char
*
(
*
sout_CfgCreate_
inner
)
(
char
**
,
sout_cfg_t
**
,
char
*
)
;
void
*
__sout_CfgParse_
deprecated
;
void
*
sout_CfgCreate_
deprecated
;
sout_instance_t
*
(
*
__sout_NewInstance_inner
)
(
vlc_object_t
*
,
char
*
);
void
(
*
sout_DeleteInstance_inner
)
(
sout_instance_t
*
);
sout_packetizer_input_t
*
(
*
sout_InputNew_inner
)
(
sout_instance_t
*
,
es_format_t
*
);
...
...
@@ -550,6 +550,9 @@ struct module_symbols_t
void
*
input_AskForArt_deprecated
;
int
(
*
playlist_AskForArtEnqueue_inner
)
(
playlist_t
*
,
input_item_t
*
);
uint32_t
(
*
input_CurrentMetaFlags_inner
)
(
vlc_meta_t
*
p_meta
);
void
(
*
__config_ChainParse_inner
)
(
vlc_object_t
*
,
char
*
psz_prefix
,
const
char
**
ppsz_options
,
config_chain_t
*
);
void
(
*
config_ChainDestroy_inner
)
(
config_chain_t
*
);
char
*
(
*
config_ChainCreate_inner
)
(
char
**
,
config_chain_t
**
,
char
*
);
};
# if defined (__PLUGIN__)
# define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner
...
...
@@ -641,8 +644,6 @@ struct module_symbols_t
# define __vout_OSDMessage (p_symbols)->__vout_OSDMessage_inner
# define vout_OSDSlider (p_symbols)->vout_OSDSlider_inner
# define vout_OSDIcon (p_symbols)->vout_OSDIcon_inner
# define __sout_CfgParse (p_symbols)->__sout_CfgParse_inner
# define sout_CfgCreate (p_symbols)->sout_CfgCreate_inner
# define __sout_NewInstance (p_symbols)->__sout_NewInstance_inner
# define sout_DeleteInstance (p_symbols)->sout_DeleteInstance_inner
# define sout_InputNew (p_symbols)->sout_InputNew_inner
...
...
@@ -1025,6 +1026,9 @@ struct module_symbols_t
# define input_ItemAddOptionNoDup (p_symbols)->input_ItemAddOptionNoDup_inner
# define playlist_AskForArtEnqueue (p_symbols)->playlist_AskForArtEnqueue_inner
# define input_CurrentMetaFlags (p_symbols)->input_CurrentMetaFlags_inner
# define __config_ChainParse (p_symbols)->__config_ChainParse_inner
# define config_ChainDestroy (p_symbols)->config_ChainDestroy_inner
# define config_ChainCreate (p_symbols)->config_ChainCreate_inner
# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
/******************************************************************
* STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
...
...
@@ -1119,8 +1123,6 @@ struct module_symbols_t
((p_symbols)->__vout_OSDMessage_inner) = __vout_OSDMessage; \
((p_symbols)->vout_OSDSlider_inner) = vout_OSDSlider; \
((p_symbols)->vout_OSDIcon_inner) = vout_OSDIcon; \
((p_symbols)->__sout_CfgParse_inner) = __sout_CfgParse; \
((p_symbols)->sout_CfgCreate_inner) = sout_CfgCreate; \
((p_symbols)->__sout_NewInstance_inner) = __sout_NewInstance; \
((p_symbols)->sout_DeleteInstance_inner) = sout_DeleteInstance; \
((p_symbols)->sout_InputNew_inner) = sout_InputNew; \
...
...
@@ -1503,7 +1505,12 @@ struct module_symbols_t
((p_symbols)->input_ItemAddOptionNoDup_inner) = input_ItemAddOptionNoDup; \
((p_symbols)->playlist_AskForArtEnqueue_inner) = playlist_AskForArtEnqueue; \
((p_symbols)->input_CurrentMetaFlags_inner) = input_CurrentMetaFlags; \
((p_symbols)->__config_ChainParse_inner) = __config_ChainParse; \
((p_symbols)->config_ChainDestroy_inner) = config_ChainDestroy; \
((p_symbols)->config_ChainCreate_inner) = config_ChainCreate; \
(p_symbols)->net_ConvertIPv4_deprecated = NULL; \
(p_symbols)->__sout_CfgParse_deprecated = NULL; \
(p_symbols)->sout_CfgCreate_deprecated = NULL; \
(p_symbols)->vlc_input_item_GetInfo_deprecated = NULL; \
(p_symbols)->vlc_input_item_AddInfo_deprecated = NULL; \
(p_symbols)->__playlist_ItemNew_deprecated = NULL; \
...
...
modules/access_output/file.c
View file @
62fffadf
...
...
@@ -101,7 +101,7 @@ static int Open( vlc_object_t *p_this )
int
i_flags
;
vlc_value_t
val
;
sout_Cfg
Parse
(
p_access
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_access
->
p_cfg
);
config_Chain
Parse
(
p_access
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_access
->
p_cfg
);
if
(
!
p_access
->
psz_name
)
{
...
...
modules/access_output/http.c
View file @
62fffadf
...
...
@@ -172,7 +172,7 @@ static int Open( vlc_object_t *p_this )
return
VLC_ENOMEM
;
}
sout_Cfg
Parse
(
p_access
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_access
->
p_cfg
);
config_Chain
Parse
(
p_access
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_access
->
p_cfg
);
/* p_access->psz_name = "hostname:port/filename" */
psz_bind_addr
=
psz_parser
=
strdup
(
p_access
->
psz_name
);
...
...
modules/access_output/shout.c
View file @
62fffadf
...
...
@@ -177,7 +177,7 @@ static int Open( vlc_object_t *p_this )
char
*
psz_genre
=
NULL
;
char
*
psz_url
=
NULL
;
sout_Cfg
Parse
(
p_access
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_access
->
p_cfg
);
config_Chain
Parse
(
p_access
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_access
->
p_cfg
);
psz_accessname
=
psz_parser
=
strdup
(
p_access
->
psz_name
);
...
...
modules/access_output/udp.c
View file @
62fffadf
...
...
@@ -182,7 +182,7 @@ static int Open( vlc_object_t *p_this )
vlc_value_t
val
;
sout_Cfg
Parse
(
p_access
,
SOUT_CFG_PREFIX
,
config_Chain
Parse
(
p_access
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_access
->
p_cfg
);
if
(
!
(
p_sys
=
malloc
(
sizeof
(
sout_access_out_sys_t
)
)
)
)
...
...
modules/codec/dirac.c
View file @
62fffadf
...
...
@@ -350,7 +350,7 @@ static int OpenEncoder( vlc_object_t *p_this )
p_enc
->
fmt_in
.
video
.
i_bits_per_pixel
=
12
;
p_enc
->
fmt_out
.
i_codec
=
VLC_FOURCC
(
'd'
,
'r'
,
'a'
,
'c'
);
sout_Cfg
Parse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
config_Chain
Parse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
/* Initialse the encoder context with the presets for SD576 - Standard
* Definition Digital (some parameters will be overwritten later on) */
...
...
modules/codec/dvbsub.c
View file @
62fffadf
...
...
@@ -1526,7 +1526,7 @@ static int OpenEncoder( vlc_object_t *p_this )
p_enc
->
fmt_out
.
i_codec
=
VLC_FOURCC
(
'd'
,
'v'
,
'b'
,
's'
);
p_enc
->
fmt_out
.
subs
.
dvb
.
i_id
=
1
<<
16
|
1
;
sout_Cfg
Parse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
config_Chain
Parse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
p_sys
->
i_page_ver
=
0
;
p_sys
->
i_region_ver
=
0
;
...
...
modules/codec/ffmpeg/encoder.c
View file @
62fffadf
...
...
@@ -289,7 +289,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
p_context
->
dsp_mask
|=
FF_MM_SSE2
;
}
sout_Cfg
Parse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
config_Chain
Parse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
var_Get
(
p_enc
,
ENC_CFG_PREFIX
"keyint"
,
&
val
);
p_sys
->
i_key_int
=
val
.
i_int
;
...
...
modules/codec/theora.c
View file @
62fffadf
...
...
@@ -619,7 +619,7 @@ static int OpenEncoder( vlc_object_t *p_this )
p_enc
->
fmt_in
.
i_codec
=
VLC_FOURCC
(
'I'
,
'4'
,
'2'
,
'0'
);
p_enc
->
fmt_out
.
i_codec
=
VLC_FOURCC
(
't'
,
'h'
,
'e'
,
'o'
);
sout_Cfg
Parse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
config_Chain
Parse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
var_Get
(
p_enc
,
ENC_CFG_PREFIX
"quality"
,
&
val
);
i_quality
=
val
.
i_int
;
...
...
modules/codec/twolame.c
View file @
62fffadf
...
...
@@ -165,7 +165,7 @@ static int OpenEncoder( vlc_object_t *p_this )
p_enc
->
fmt_in
.
i_codec
=
AOUT_FMT_S16_NE
;
p_enc
->
fmt_out
.
i_codec
=
VLC_FOURCC
(
'm'
,
'p'
,
'g'
,
'a'
);
sout_Cfg
Parse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
config_Chain
Parse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
p_sys
->
p_twolame
=
twolame_init
();
...
...
modules/codec/vorbis.c
View file @
62fffadf
...
...
@@ -792,7 +792,7 @@ static int OpenEncoder( vlc_object_t *p_this )
p_enc
->
fmt_in
.
i_codec
=
VLC_FOURCC
(
'f'
,
'l'
,
'3'
,
'2'
);
p_enc
->
fmt_out
.
i_codec
=
VLC_FOURCC
(
'v'
,
'o'
,
'r'
,
'b'
);
sout_Cfg
Parse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
config_Chain
Parse
(
p_enc
,
ENC_CFG_PREFIX
,
ppsz_enc_options
,
p_enc
->
p_cfg
);
var_Get
(
p_enc
,
ENC_CFG_PREFIX
"quality"
,
&
val
);
i_quality
=
val
.
i_int
;
...
...
modules/codec/x264.c
View file @
62fffadf
...
...
@@ -576,7 +576,7 @@ static int Open ( vlc_object_t *p_this )
}
#endif
sout_Cfg
Parse
(
p_enc
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_enc
->
p_cfg
);
config_Chain
Parse
(
p_enc
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_enc
->
p_cfg
);
p_enc
->
fmt_out
.
i_codec
=
VLC_FOURCC
(
'h'
,
'2'
,
'6'
,
'4'
);
p_enc
->
fmt_in
.
i_codec
=
VLC_FOURCC
(
'I'
,
'4'
,
'2'
,
'0'
);
...
...
modules/gui/wxwidgets/timer.cpp
View file @
62fffadf
...
...
@@ -104,6 +104,7 @@ void Timer::Notify()
if
(
p_intf
->
p_sys
->
b_intf_show
)
{
p_main_interface
->
Raise
();
p_main_interface
->
Show
();
p_intf
->
p_sys
->
b_intf_show
=
VLC_FALSE
;
}
...
...
modules/mux/asf.c
View file @
62fffadf
...
...
@@ -182,7 +182,7 @@ static int Open( vlc_object_t *p_this )
int
i
;
msg_Dbg
(
p_mux
,
"asf muxer opened"
);
sout_Cfg
Parse
(
p_mux
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_mux
->
p_cfg
);
config_Chain
Parse
(
p_mux
,
SOUT_CFG_PREFIX
,
ppsz_sout_options
,
p_mux
->
p_cfg
);
p_mux
->
pf_control
=
Control
;
p_mux
->
pf_addstream
=
AddStream
;
...
...
Prev
1
2
Next
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