Skip to content

V
vlc
Commit de66f7b1 authored by Christophe Massiot's avatar Christophe Massiot Committed by Jean-Baptiste Kempf
Browse files
Options

Delay, langfromtelx, setid: relicense to LGPL, simplify and fix 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent dae71aac
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 33 deletions
modules/stream_out/delay.c
View file @ de66f7b1
......@@ -7,8 +7,8 @@
* 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,
......@@ -17,8 +17,8 @@
* 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.
*****************************************************************************/
/*****************************************************************************
......@@ -78,7 +78,6 @@ static int Send ( sout_stream_t *, sout_stream_id_t *, block_t *
struct sout_stream_sys_t
{
sout_stream_t *p_out;
sout_stream_id_t *id;
int i_id;
mtime_t i_delay;
......@@ -137,12 +136,11 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
msg_Dbg( p_stream, "delaying ID %d by %"PRId64,
p_sys->i_id, p_sys->i_delay );
p_sys->id = p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
p_sys->id = p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
return p_sys->id;
}
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 )
......@@ -152,7 +150,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
if ( id == p_sys->id )
p_sys->id = 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 int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
......@@ -173,5 +171,5 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
}
}
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 );
}
modules/stream_out/langfromtelx.c
View file @ de66f7b1
......@@ -7,8 +7,8 @@
* 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,
......@@ -17,8 +17,8 @@
* 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.
*****************************************************************************/
/*****************************************************************************
......@@ -90,7 +90,6 @@ static int Send ( sout_stream_t *, sout_stream_id_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;
......@@ -161,17 +160,17 @@ 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 )
......@@ -181,7 +180,7 @@ 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 )
......@@ -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 );
}
modules/stream_out/setid.c
View file @ de66f7b1
......@@ -6,8 +6,8 @@
* 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,
......@@ -16,8 +16,8 @@
* 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.
*****************************************************************************/
/*****************************************************************************
......@@ -102,7 +102,6 @@ static int Send ( sout_stream_t *, sout_stream_id_t *, block_t
struct sout_stream_sys_t
{
sout_stream_t *p_out;
int i_id;
int i_new_id;
char *psz_language;
......@@ -197,7 +196,7 @@ static sout_stream_id_t * AddId( sout_stream_t *p_stream, es_format_t *p_fmt )
p_fmt->i_id = p_sys->i_new_id;
}
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 sout_stream_id_t * AddLang( sout_stream_t *p_stream, es_format_t *p_fmt )
......@@ -212,20 +211,16 @@ static sout_stream_id_t * AddLang( sout_stream_t *p_stream, es_format_t *p_fmt )
p_fmt->psz_language = strdup( p_sys->psz_language );
}
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 )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
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 int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
block_t *p_buffer )
{
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
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 );
}
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