summaryrefslogtreecommitdiffstats
path: root/stream/tv.c
diff options
context:
space:
mode:
authorvoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-29 03:33:39 +0000
committervoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-29 03:33:39 +0000
commit96addffa41c4bbf0ddea7468fe1782ab38a9e94e (patch)
tree1e3e38f4fcc4ddc90581acd92cf48b93c1ee5631 /stream/tv.c
parentacad91a5d2ad335ab6d88a52019128f08fe86fb9 (diff)
downloadmpv-96addffa41c4bbf0ddea7468fe1782ab38a9e94e.tar.bz2
mpv-96addffa41c4bbf0ddea7468fe1782ab38a9e94e.tar.xz
Cosmetics: move two routines up
to avoid requirement of forward declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23899 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/tv.c')
-rw-r--r--stream/tv.c68
1 files changed, 34 insertions, 34 deletions
diff --git a/stream/tv.c b/stream/tv.c
index fd686e38a7..94e41cec8c 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -505,6 +505,40 @@ done:
return 1;
}
+/* ================== STREAM_TV ===================== */
+
+tvi_handle_t *tv_begin(void)
+{
+ int i;
+ tvi_handle_t* h;
+ if(!strcmp(tv_param_driver,"help")){
+ mp_msg(MSGT_TV,MSGL_INFO,MSGTR_TV_AvailableDrivers);
+ for(i=0;tvi_driver_list[i];i++){
+ mp_msg(MSGT_TV,MSGL_INFO," %s\t%s",tvi_driver_list[i]->short_name,tvi_driver_list[i]->name);
+ if(tvi_driver_list[i]->comment)
+ mp_msg(MSGT_TV,MSGL_INFO," (%s)",tvi_driver_list[i]->comment);
+ mp_msg(MSGT_TV,MSGL_INFO,"\n");
+ }
+ return NULL;
+ }
+
+ for(i=0;tvi_driver_list[i];i++){
+ if (!strcmp(tvi_driver_list[i]->short_name, tv_param_driver)){
+ h=tvi_driver_list[i]->tvi_init(tv_param_device,tv_param_adevice);
+ if(!h) return NULL;
+
+ mp_msg(MSGT_TV, MSGL_INFO, MSGTR_TV_DriverInfo, tvi_driver_list[i]->short_name,
+ tvi_driver_list[i]->name,
+ tvi_driver_list[i]->author,
+ tvi_driver_list[i]->comment?tvi_driver_list[i]->comment:"");
+ return h;
+ }
+ }
+
+ mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_NoSuchDriver, tv_param_driver);
+ return(NULL);
+}
+
static demuxer_t* demux_open_tv(demuxer_t *demuxer)
{
tvi_handle_t *tvh;
@@ -663,40 +697,6 @@ static void demux_close_tv(demuxer_t *demuxer)
demuxer->priv=NULL;
}
-/* ================== STREAM_TV ===================== */
-
-tvi_handle_t *tv_begin(void)
-{
- int i;
- tvi_handle_t* h;
- if(!strcmp(tv_param_driver,"help")){
- mp_msg(MSGT_TV,MSGL_INFO,MSGTR_TV_AvailableDrivers);
- for(i=0;tvi_driver_list[i];i++){
- mp_msg(MSGT_TV,MSGL_INFO," %s\t%s",tvi_driver_list[i]->short_name,tvi_driver_list[i]->name);
- if(tvi_driver_list[i]->comment)
- mp_msg(MSGT_TV,MSGL_INFO," (%s)",tvi_driver_list[i]->comment);
- mp_msg(MSGT_TV,MSGL_INFO,"\n");
- }
- return NULL;
- }
-
- for(i=0;tvi_driver_list[i];i++){
- if (!strcmp(tvi_driver_list[i]->short_name, tv_param_driver)){
- h=tvi_driver_list[i]->tvi_init(tv_param_device,tv_param_adevice);
- if(!h) return NULL;
-
- mp_msg(MSGT_TV, MSGL_INFO, MSGTR_TV_DriverInfo, tvi_driver_list[i]->short_name,
- tvi_driver_list[i]->name,
- tvi_driver_list[i]->author,
- tvi_driver_list[i]->comment?tvi_driver_list[i]->comment:"");
- return h;
- }
- }
-
- mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_NoSuchDriver, tv_param_driver);
- return(NULL);
-}
-
int tv_uninit(tvi_handle_t *tvh)
{
int res;