Commit 55a13f9a authored by Thomas Guillem's avatar Thomas Guillem

webvtt: rename entry functions

This fixes duplicate symbols with a static build.
parent c6e4f569
......@@ -31,7 +31,7 @@
static block_t *Encode ( encoder_t *, subpicture_t * );
int OpenEncoder( vlc_object_t *p_this )
int webvtt_OpenEncoder( vlc_object_t *p_this )
{
encoder_t *p_enc = (encoder_t *)p_this;
......@@ -46,7 +46,7 @@ int OpenEncoder( vlc_object_t *p_this )
}
void CloseEncoder( vlc_object_t *p_this )
void webvtt_CloseEncoder( vlc_object_t *p_this )
{
(void)p_this;
}
......
......@@ -2035,9 +2035,9 @@ static int DecodeBlock( decoder_t *p_dec, block_t *p_block )
}
/*****************************************************************************
* CloseDecoder: clean up the decoder
* webvtt_CloseDecoder: clean up the decoder
*****************************************************************************/
void CloseDecoder( vlc_object_t *p_this )
void webvtt_CloseDecoder( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t *)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
......@@ -2052,9 +2052,9 @@ void CloseDecoder( vlc_object_t *p_this )
}
/*****************************************************************************
* OpenDecoder: probe the decoder and return score
* webvtt_OpenDecoder: probe the decoder and return score
*****************************************************************************/
int OpenDecoder( vlc_object_t *p_this )
int webvtt_OpenDecoder( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys;
......
......@@ -39,7 +39,7 @@ vlc_module_begin ()
set_capability( "spu decoder", 10 )
set_shortname( N_("WEBVTT decoder"))
set_description( N_("WEBVTT subtitles decoder") )
set_callbacks( OpenDecoder, CloseDecoder )
set_callbacks( webvtt_OpenDecoder, webvtt_CloseDecoder )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_SCODEC )
add_submodule()
......@@ -48,7 +48,7 @@ vlc_module_begin ()
set_capability( "demux", 3 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
set_callbacks( OpenDemux, CloseDemux )
set_callbacks( webvtt_OpenDemux, webvtt_CloseDemux )
add_shortcut( "webvtt" )
add_submodule()
set_shortname( "WEBVTT" )
......@@ -56,14 +56,14 @@ vlc_module_begin ()
set_capability( "demux", 0 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
set_callbacks( OpenDemuxStream, CloseDemux )
set_callbacks( webvtt_OpenDemuxStream, webvtt_CloseDemux )
add_shortcut( "webvttstream" )
#ifdef ENABLE_SOUT
add_submodule()
set_description( "WEBVTT text encoder" )
set_capability( "encoder", 101 )
set_subcategory( SUBCAT_INPUT_SCODEC )
set_callbacks( OpenEncoder, CloseEncoder )
set_callbacks( webvtt_OpenEncoder, webvtt_CloseEncoder )
#endif
vlc_module_end ()
......
......@@ -20,16 +20,16 @@
#ifndef WEBVTT_H
#define WEBVTT_H
int OpenDecoder ( vlc_object_t * );
void CloseDecoder ( vlc_object_t * );
int webvtt_OpenDecoder ( vlc_object_t * );
void webvtt_CloseDecoder ( vlc_object_t * );
int OpenDemux ( vlc_object_t * );
int OpenDemuxStream (vlc_object_t *);
void CloseDemux ( vlc_object_t * );
int webvtt_OpenDemux ( vlc_object_t * );
int webvtt_OpenDemuxStream (vlc_object_t *);
void webvtt_CloseDemux ( vlc_object_t * );
#ifdef ENABLE_SOUT
int OpenEncoder ( vlc_object_t * );
void CloseEncoder ( vlc_object_t * );
int webvtt_OpenEncoder ( vlc_object_t * );
void webvtt_CloseEncoder ( vlc_object_t * );
#endif
typedef struct webvtt_text_parser_t webvtt_text_parser_t;
......
......@@ -627,7 +627,7 @@ static int ProbeWEBVTT( demux_t *p_demux )
/*****************************************************************************
* Module initializers
*****************************************************************************/
int OpenDemux ( vlc_object_t *p_this )
int webvtt_OpenDemux ( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
......@@ -645,7 +645,7 @@ int OpenDemux ( vlc_object_t *p_this )
if( ReadWEBVTT( p_demux ) != VLC_SUCCESS )
{
CloseDemux( p_this );
webvtt_CloseDemux( p_this );
return VLC_EGENERIC;
}
......@@ -658,14 +658,14 @@ int OpenDemux ( vlc_object_t *p_this )
es_format_Clean( &fmt );
if( p_sys->es == NULL )
{
CloseDemux( p_this );
webvtt_CloseDemux( p_this );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
int OpenDemuxStream ( vlc_object_t *p_this )
int webvtt_OpenDemuxStream ( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
......@@ -687,7 +687,7 @@ int OpenDemuxStream ( vlc_object_t *p_this )
NULL );
if( !p_sys->p_streamparser )
{
CloseDemux( p_this );
webvtt_CloseDemux( p_this );
return VLC_EGENERIC;
}
......@@ -697,7 +697,7 @@ int OpenDemuxStream ( vlc_object_t *p_this )
es_format_Clean( &fmt );
if( p_sys->es == NULL )
{
CloseDemux( p_this );
webvtt_CloseDemux( p_this );
return VLC_EGENERIC;
}
......@@ -707,7 +707,7 @@ int OpenDemuxStream ( vlc_object_t *p_this )
/*****************************************************************************
* Close: Close subtitle demux
*****************************************************************************/
void CloseDemux( vlc_object_t *p_this )
void webvtt_CloseDemux( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment