From 50f563f9279f01a9f2177cac84178b153365f037 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 8 Oct 2009 11:25:01 +0000 Subject: cosmetics: Remove some pointless parentheses from return calls. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29759 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stream/tv.c') diff --git a/stream/tv.c b/stream/tv.c index 240596b32d..34e184a37f 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -348,7 +348,7 @@ int tv_set_norm_i(tvi_handle_t *tvh, int norm) } tvh->functions->control(tvh->priv,TV_VBI_CONTROL_RESET,tvh->tv_param); - return(1); + return 1; } static int open_tv(tvi_handle_t *tvh) -- cgit v1.2.3 From a9474b0b39b999ef17163bec9337a96a72ddb458 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Thu, 29 Oct 2009 22:13:04 +0000 Subject: Move teletext specific code from stream into libmpcodecs. Patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29801 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tv.c | 1 + 1 file changed, 1 insertion(+) (limited to 'stream/tv.c') diff --git a/stream/tv.c b/stream/tv.c index 34e184a37f..7e7ba263fa 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -29,6 +29,7 @@ #include "libaf/af_format.h" #include "libmpcodecs/img_format.h" +#include "libmpcodecs/dec_teletext.h" #include "libavutil/avstring.h" #include "osdep/timer.h" -- cgit v1.2.3 From 423c415534f7393c07247b87ab4d95f6d0635474 Mon Sep 17 00:00:00 2001 From: cehoyos Date: Sat, 7 Nov 2009 12:31:05 +0000 Subject: Separate teletext from tv support. Path by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29848 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tv.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'stream/tv.c') diff --git a/stream/tv.c b/stream/tv.c index 7e7ba263fa..b27486d086 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -334,7 +334,8 @@ int tv_set_norm(tvi_handle_t *tvh, char* norm) mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_CannotSetNorm); return 0; } - tvh->functions->control(tvh->priv,TV_VBI_CONTROL_RESET,tvh->tv_param); + teletext_control(tvh->demuxer->teletext,TV_VBI_CONTROL_RESET, + &tvh->tv_param->teletext); return 1; } @@ -348,7 +349,8 @@ int tv_set_norm_i(tvi_handle_t *tvh, int norm) return 0; } - tvh->functions->control(tvh->priv,TV_VBI_CONTROL_RESET,tvh->tv_param); + teletext_control(tvh->demuxer->teletext,TV_VBI_CONTROL_RESET, + &tvh->tv_param->teletext); return 1; } @@ -669,7 +671,11 @@ static demuxer_t* demux_open_tv(demuxer_t *demuxer) if(!(tvh=tv_begin(demuxer->stream->priv))) return NULL; if (!tvh->functions->init(tvh->priv)) return NULL; - tvh->functions->control(tvh->priv,TVI_CONTROL_VBI_INIT,&(tvh->tv_param->tdevice)); + tvh->demuxer = demuxer; + tvh->functions->control(tvh->priv,TVI_CONTROL_VBI_INIT, + &(tvh->tv_param->teletext.device)); + tvh->functions->control(tvh->priv,TVI_CONTROL_GET_VBI_PTR, + &demuxer->teletext); if (!open_tv(tvh)){ tv_uninit(tvh); @@ -812,7 +818,8 @@ no_audio: if(funcs->control(tvh->priv,TVI_CONTROL_VID_SET_GAIN,&tvh->tv_param->gain)!=TVI_CONTROL_TRUE) mp_msg(MSGT_TV,MSGL_WARN,"Unable to set gain control!\n"); - funcs->control(tvh->priv,TV_VBI_CONTROL_RESET,tvh->tv_param); + teletext_control(demuxer->teletext,TV_VBI_CONTROL_RESET, + &tvh->tv_param->teletext); return demuxer; } @@ -893,7 +900,8 @@ int tv_set_freq(tvi_handle_t *tvh, unsigned long freq) mp_msg(MSGT_TV, MSGL_V, MSGTR_TV_CurrentFrequency, freq, (float)freq/16); } - tvh->functions->control(tvh->priv,TV_VBI_CONTROL_RESET,tvh->tv_param); + teletext_control(tvh->demuxer->teletext,TV_VBI_CONTROL_RESET, + &tvh->tv_param->teletext); return 1; } @@ -1074,7 +1082,8 @@ int tv_step_norm(tvi_handle_t *tvh) return 0; } } - tvh->functions->control(tvh->priv,TV_VBI_CONTROL_RESET,tvh->tv_param); + teletext_control(tvh->demuxer->teletext,TV_VBI_CONTROL_RESET, + &tvh->tv_param->teletext); return 1; } -- cgit v1.2.3 From bd82936f6353c29d9ef11e9eafe944771dcd2db3 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 10 Nov 2009 11:24:29 +0000 Subject: Set demuxer->teletext to NULL when closing the TV interface, since analog teletext can not (yet) work without the TV interface. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29873 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tv.c | 1 + 1 file changed, 1 insertion(+) (limited to 'stream/tv.c') diff --git a/stream/tv.c b/stream/tv.c index b27486d086..6d4609840b 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -831,6 +831,7 @@ static void demux_close_tv(demuxer_t *demuxer) tv_uninit(tvh); free(tvh); demuxer->priv=NULL; + demuxer->teletext=NULL; } /* utilities for mplayer (not mencoder!!) */ -- cgit v1.2.3