diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
| commit | de560e8167c21a8fd9ea34f5f42f377102d65232 (patch) | |
| tree | d5ef49221ccbb17308b0d14a96e6bd8cfba5916f /stream | |
| parent | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (diff) | |
| parent | 5eee4632d3e2bcf17a29483467d247c71c202e0d (diff) | |
| download | mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.bz2 mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.xz | |
Merge svn changes up to r27123
Conflicts:
libmenu/menu_filesel.c
libmenu/menu_pt.c
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/tv.c | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/stream/tv.c b/stream/tv.c index 48ddb8fb49..1d31f1daf7 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -323,6 +323,34 @@ static void parse_channels(tvi_handle_t *tvh) tv_channel_current->prev->next = NULL; free(tv_channel_current); } + +int tv_set_norm(tvi_handle_t *tvh, char* norm) +{ + tvh->norm = norm_from_string(tvh, norm); + + mp_msg(MSGT_TV, MSGL_V, MSGTR_TV_SelectedNorm, norm); + if (tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm) != TVI_CONTROL_TRUE) { + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_CannotSetNorm); + return 0; + } + tvh->functions->control(tvh->priv,TV_VBI_CONTROL_RESET,tvh->tv_param); + return 1; +} + +int tv_set_norm_i(tvi_handle_t *tvh, int norm) +{ + tvh->norm = norm; + + mp_msg(MSGT_TV, MSGL_V, MSGTR_TV_SelectedNormId, norm); + if (tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm) != TVI_CONTROL_TRUE) { + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_CannotSetNorm); + return 0; + } + + tvh->functions->control(tvh->priv,TV_VBI_CONTROL_RESET,tvh->tv_param); + return(1); +} + static int open_tv(tvi_handle_t *tvh) { int i; @@ -1048,33 +1076,6 @@ int tv_step_chanlist(tvi_handle_t *tvh) return 1; } -int tv_set_norm(tvi_handle_t *tvh, char* norm) -{ - tvh->norm = norm_from_string(tvh, norm); - - mp_msg(MSGT_TV, MSGL_V, MSGTR_TV_SelectedNorm, norm); - if (tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm) != TVI_CONTROL_TRUE) { - mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_CannotSetNorm); - return 0; - } - tvh->functions->control(tvh->priv,TV_VBI_CONTROL_RESET,tvh->tv_param); - return 1; -} - -int tv_set_norm_i(tvi_handle_t *tvh, int norm) -{ - tvh->norm = norm; - - mp_msg(MSGT_TV, MSGL_V, MSGTR_TV_SelectedNormId, norm); - if (tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm) != TVI_CONTROL_TRUE) { - mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_CannotSetNorm); - return 0; - } - - tvh->functions->control(tvh->priv,TV_VBI_CONTROL_RESET,tvh->tv_param); - return(1); -} - demuxer_desc_t demuxer_desc_tv = { "Tv card demuxer", "tv", |