summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-19 07:13:50 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-06-19 07:13:50 +0000
commit864dc161406201d88b40bbfedf26772a281a1d83 (patch)
treef678a8c87fecfef8cb930f7f3463ec012e93799f /stream
parentdc8383d0a985115a89c48755e1f91f9b5cae8af6 (diff)
downloadmpv-864dc161406201d88b40bbfedf26772a281a1d83.tar.bz2
mpv-864dc161406201d88b40bbfedf26772a281a1d83.tar.xz
Reorder some functions to avoid implicit declaration warnings.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27099 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/tv.c55
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",