# HG changeset patch # User diego # Date 1213859630 0 # Node ID 833ec0c12cb992f849f15e5341c98a2e6feb1b38 # Parent 361349e1ac6bf44f9c95e8c823f4ffc57ff5b437 Reorder some functions to avoid implicit declaration warnings. diff -r 361349e1ac6b -r 833ec0c12cb9 stream/tv.c --- a/stream/tv.c Wed Jun 18 17:18:49 2008 +0000 +++ b/stream/tv.c Thu Jun 19 07:13:50 2008 +0000 @@ -323,6 +323,34 @@ 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 @@ 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",