X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Flangfromtelx.c;h=3a32b28e88fc2130408228bdd90f33e9a8029931;hb=ae9ae8a104b1484c4e9268fe95eeb4fbd1fc79ac;hp=5173779c0a2b56fbe5ca40a32158071bdca5af3d;hpb=c495c265de8ee928e99fb78a61ff1161be126e94;p=vlc diff --git a/modules/stream_out/langfromtelx.c b/modules/stream_out/langfromtelx.c index 5173779c0a..3a32b28e88 100644 --- a/modules/stream_out/langfromtelx.c +++ b/modules/stream_out/langfromtelx.c @@ -1,35 +1,35 @@ /***************************************************************************** * langfromtelx.c: dynamic language setting from telx ***************************************************************************** - * Copyright (C) 2009, 2011 VideoLAN + * Copyright © 2009-2011 VLC authors and VideoLAN * $Id$ * * Authors: Christophe Massiot * - * 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 + * This program is free software; you can redistribute it and/or modify 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, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser 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. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include - #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include + #include #include #include @@ -84,16 +84,15 @@ static const char *ppsz_sout_options[] = { "id", "magazine", "page", "row", NULL }; -static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * ); -static int Del ( sout_stream_t *, sout_stream_id_t * ); -static int Send ( sout_stream_t *, sout_stream_id_t *, block_t * ); +static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * ); +static int Del ( sout_stream_t *, sout_stream_id_sys_t * ); +static int Send ( sout_stream_t *, sout_stream_id_sys_t *, block_t * ); 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_id_sys_t *p_id, *p_telx; int i_current_page; }; @@ -144,7 +143,7 @@ static void Close( vlc_object_t * p_this ) free( p_sys ); } -static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) +static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) { sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys; @@ -161,27 +160,27 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt ) 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 ) +static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id ) { sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys; 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 ) @@ -191,7 +190,7 @@ static void SetLanguage( sout_stream_t *p_stream, char *psz_language ) if ( strncmp( p_sys->psz_language, psz_language, 3 ) ) msg_Dbg( p_stream, "changing language to %s", psz_language ); - strncpy( p_sys->psz_language, psz_language, 3 ); + strncpy( p_sys->psz_language, (const char *)psz_language, 3 ); } /***************************************************************************** @@ -304,7 +303,7 @@ static void HandleTelx( sout_stream_t *p_stream, block_t *p_block ) /***************************************************************************** * Send: *****************************************************************************/ -static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, +static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id, block_t *p_buffer ) { sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys; @@ -312,5 +311,5 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id, 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 ); }