* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define ID_TEXT N_("ID")
+
+#define ID_TEXT N_("Elementary Stream ID")
#define ID_LONGTEXT N_( \
"Specify an identifier integer for this elementary stream to change" )
#define MAGAZINE_TEXT N_("Magazine")
#define SOUT_CFG_PREFIX "sout-langfromtelx-"
vlc_module_begin()
- set_shortname( _("langfromtelx"))
- set_description( _("Dynamic language setting from telx"))
+ set_shortname( N_("Lang From Telx"))
+ set_description( N_("Dynamic language setting from teletext"))
set_capability( "sout stream", 50 )
add_shortcut( "langfromtelx" )
+ set_category( CAT_SOUT )
+ set_subcategory( SUBCAT_SOUT_STREAM )
+
set_callbacks( Open, Close )
add_integer( SOUT_CFG_PREFIX "id", 0, ID_TEXT, ID_LONGTEXT,
false )
struct sout_stream_sys_t
{
- sout_stream_t *p_out;
int i_id, i_magazine, i_page, i_row;
char *psz_language, *psz_old_language;
sout_stream_id_t *p_id, *p_telx;
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys;
- p_sys = malloc( sizeof( sout_stream_sys_t ) );
- if( unlikely( !p_sys ) )
- return VLC_ENOMEM;
-
if( !p_stream->p_next )
{
msg_Err( p_stream, "cannot create chain" );
- free( p_sys );
return VLC_EGENERIC;
}
+ p_sys = malloc( sizeof( sout_stream_sys_t ) );
+ if( unlikely( !p_sys ) )
+ return VLC_ENOMEM;
+
config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_cfg );
strcpy( p_fmt->psz_language, "unk" );
p_fmt->psz_language[3] = '\0';
- p_sys->p_id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
+ p_sys->p_id = p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
return p_sys->p_id;
}
if ( p_fmt->i_codec == VLC_CODEC_TELETEXT )
{
- p_sys->p_telx = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
+ p_sys->p_telx = p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
return p_sys->p_telx;
}
- return p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
+ return p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
if ( id == p_sys->p_id ) p_sys->p_id = NULL;
if ( id == p_sys->p_telx ) p_sys->p_telx = NULL;
- return p_sys->p_out->pf_del( p_sys->p_out, id );
+ return p_stream->p_next->pf_del( p_stream->p_next, id );
}
static void SetLanguage( sout_stream_t *p_stream, char *psz_language )
if ( id == p_sys->p_telx )
HandleTelx( p_stream, p_buffer );
- return p_sys->p_out->pf_send( p_sys->p_out, id, p_buffer );
+ return p_stream->p_next->pf_send( p_stream->p_next, id, p_buffer );
}