[MPlayer-cvslog] r32225 - in trunk/stream: tv.c tv.h tvi_bsdbt848.c tvi_def.h tvi_dshow.c tvi_dummy.c tvi_v4l.c tvi_v4l2.c

[diego]

Author: diego
Date: Mon Sep 13 20:09:29 2010
New Revision: 32225

Log:
Move TV input new_handle static function to tv.c and make it non-static.
There is no need to pointlessly duplicate the function in the binary.

Modified:
   trunk/stream/tv.c
   trunk/stream/tv.h
   trunk/stream/tvi_bsdbt848.c
   trunk/stream/tvi_def.h
   trunk/stream/tvi_dshow.c
   trunk/stream/tvi_dummy.c
   trunk/stream/tvi_v4l.c
   trunk/stream/tvi_v4l2.c

Modified: trunk/stream/tv.c
==============================================================================
--- trunk/stream/tv.c	Mon Sep 13 20:06:20 2010	(r32224)
+++ trunk/stream/tv.c	Mon Sep 13 20:09:29 2010	(r32225)
@@ -81,6 +81,31 @@ static const tvi_info_t* tvi_driver_list
     NULL
 };
 
+tvi_handle_t *tv_new_handle(int size, const tvi_functions_t *functions)
+{
+    tvi_handle_t *h = malloc(sizeof(*h));
+
+    if (!h)
+        return NULL;
+
+    h->priv = calloc(1, size);
+
+    if (!h->priv) {
+        free(h);
+        return NULL;
+    }
+
+    h->functions  = functions;
+    h->seq        = 0;
+    h->chanlist   = -1;
+    h->chanlist_s = NULL;
+    h->norm       = -1;
+    h->channel    = -1;
+    h->scan       = NULL;
+
+    return h;
+}
+
 void tv_free_handle(tvi_handle_t *h)
 {
     if (h) {

Modified: trunk/stream/tv.h
==============================================================================
--- trunk/stream/tv.h	Mon Sep 13 20:06:20 2010	(r32224)
+++ trunk/stream/tv.h	Mon Sep 13 20:09:29 2010	(r32225)
@@ -255,6 +255,7 @@ int tv_set_norm(tvi_handle_t *tvh, char*
 
 void tv_start_scan(tvi_handle_t *tvh, int start);
 
+tvi_handle_t *tv_new_handle(int size, const tvi_functions_t *functions);
 void tv_free_handle(tvi_handle_t *h);
 
 #define TV_NORM_PAL		1

Modified: trunk/stream/tvi_bsdbt848.c
==============================================================================
--- trunk/stream/tvi_bsdbt848.c	Mon Sep 13 20:06:20 2010	(r32224)
+++ trunk/stream/tvi_bsdbt848.c	Mon Sep 13 20:09:29 2010	(r32225)
@@ -196,7 +196,7 @@ static tvi_handle_t *tvi_init_bsdbt848(t
     tvi_handle_t* tvh;
     priv_t* priv;
 
-    tvh=new_handle();
+    tvh = tv_new_handle(sizeof(priv_t), &functions);
     if(!tvh)
         return NULL;
     priv=(priv_t*)tvh->priv;

Modified: trunk/stream/tvi_def.h
==============================================================================
--- trunk/stream/tvi_def.h	Mon Sep 13 20:06:20 2010	(r32224)
+++ trunk/stream/tvi_def.h	Mon Sep 13 20:09:29 2010	(r32225)
@@ -45,29 +45,6 @@ static const tvi_functions_t functions =
     get_audio_framesize
 };
 
-static tvi_handle_t *new_handle(void)
-{
-    tvi_handle_t *h = malloc(sizeof(*h));
-
-    if (!h)
-	return NULL;
-    h->priv = calloc(1, sizeof(priv_t));
-    if (!h->priv)
-    {
-	free(h);
-	return NULL;
-    }
-
-    h->functions = &functions;
-    h->seq = 0;
-    h->chanlist = -1;
-    h->chanlist_s = NULL;
-    h->norm = -1;
-    h->channel = -1;
-    h->scan = NULL;
-    return h;
-}
-
 /**
  Fills video frame in given buffer with blue color for yv12,i420,uyvy,yuy2.
  Other formats will be filled with 0xC0

Modified: trunk/stream/tvi_dshow.c
==============================================================================
--- trunk/stream/tvi_dshow.c	Mon Sep 13 20:06:20 2010	(r32224)
+++ trunk/stream/tvi_dshow.c	Mon Sep 13 20:09:29 2010	(r32225)
@@ -3060,7 +3060,7 @@ static tvi_handle_t *tvi_init_dshow(tv_p
     priv_t *priv;
     int a;
 
-    h = new_handle();
+    h = tv_new_handle(sizeof(priv_t), &functions);
     if (!h)
 	return NULL;
 

Modified: trunk/stream/tvi_dummy.c
==============================================================================
--- trunk/stream/tvi_dummy.c	Mon Sep 13 20:06:20 2010	(r32224)
+++ trunk/stream/tvi_dummy.c	Mon Sep 13 20:09:29 2010	(r32225)
@@ -45,7 +45,7 @@ typedef struct priv {
 /* handler creator - entry point ! */
 static tvi_handle_t *tvi_init_dummy(tv_param_t* tv_param)
 {
-    return new_handle();
+    return tv_new_handle(sizeof(priv_t), &functions);
 }
 
 /* initialisation */

Modified: trunk/stream/tvi_v4l.c
==============================================================================
--- trunk/stream/tvi_v4l.c	Mon Sep 13 20:06:20 2010	(r32224)
+++ trunk/stream/tvi_v4l.c	Mon Sep 13 20:09:29 2010	(r32225)
@@ -309,7 +309,7 @@ static tvi_handle_t *tvi_init_v4l(tv_par
     tvi_handle_t *h;
     priv_t *priv;
 
-    h = new_handle();
+    h = tv_new_handle(sizeof(priv_t), &functions);
     if (!h)
         return NULL;
 

Modified: trunk/stream/tvi_v4l2.c
==============================================================================
--- trunk/stream/tvi_v4l2.c	Mon Sep 13 20:06:20 2010	(r32224)
+++ trunk/stream/tvi_v4l2.c	Mon Sep 13 20:09:29 2010	(r32225)
@@ -1068,8 +1068,7 @@ static tvi_handle_t *tvi_init_v4l2(tv_pa
 {
     tvi_handle_t *tvi_handle;
 
-    /* new_handle initializes priv with memset 0 */
-    tvi_handle = new_handle();
+    tvi_handle = tv_new_handle(sizeof(priv_t), &functions);
     if (!tvi_handle) {
         return NULL;
     }