From fcf9bb95b5d95dc8b0f45b368074d0f67bd4e7d2 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 10 Jun 2014 00:47:10 +0200
Subject: tv: remove printing of useless comment information

---
 stream/tv.c        | 11 +++--------
 stream/tv.h        |  2 --
 stream/tvi_dummy.c |  2 --
 stream/tvi_v4l2.c  |  2 --
 4 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'stream')

diff --git a/stream/tv.c b/stream/tv.c
index 1e71c08742..c9791a2b50 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -724,10 +724,7 @@ static tvi_handle_t *tv_begin(tv_param_t* tv_param, struct mp_log *log)
     if(tv_param->driver && !strcmp(tv_param->driver,"help")){
         mp_info(log, "Available drivers:\n");
         for(i=0;tvi_driver_list[i];i++){
-            mp_info(log, " %s\t%s",tvi_driver_list[i]->short_name,tvi_driver_list[i]->name);
-            if(tvi_driver_list[i]->comment)
-                mp_info(log, " (%s)",tvi_driver_list[i]->comment);
-            mp_info(log, "\n");
+            mp_info(log, " %s\t%s\n",tvi_driver_list[i]->short_name,tvi_driver_list[i]->name);
         }
         return NULL;
     }
@@ -743,10 +740,8 @@ static tvi_handle_t *tv_begin(tv_param_t* tv_param, struct mp_log *log)
                 continue;
 
             h->tv_param=tv_param;
-            MP_INFO(h, "Selected driver: %s\n name: %s\n author: %s\n comment: %s\n", 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:"");
+            MP_INFO(h, "Selected driver: %s\n name: %s\n", tvi_driver_list[i]->short_name,
+            tvi_driver_list[i]->name);
             talloc_free(tv_param->driver);
             tv_param->driver=talloc_strdup(NULL, tvi_driver_list[i]->short_name);
             return h;
diff --git a/stream/tv.h b/stream/tv.h
index 74363ae846..d6d75e8ee4 100644
--- a/stream/tv.h
+++ b/stream/tv.h
@@ -80,8 +80,6 @@ typedef struct tvi_info_s
     struct tvi_handle_s * (*tvi_init)(struct mp_log *log, tv_param_t* tv_param);
     const char *name;
     const char *short_name;
-    const char *author;
-    const char *comment;
 } tvi_info_t;
 
 
diff --git a/stream/tvi_dummy.c b/stream/tvi_dummy.c
index 3ce47f7a7c..e0bfdb9966 100644
--- a/stream/tvi_dummy.c
+++ b/stream/tvi_dummy.c
@@ -30,8 +30,6 @@ const tvi_info_t tvi_info_dummy = {
         tvi_init_dummy,
         "NULL-TV",
         "dummy",
-        "alex",
-        NULL
 };
 
 /* private data's */
diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c
index 04725bfca1..6980ceb349 100644
--- a/stream/tvi_v4l2.c
+++ b/stream/tvi_v4l2.c
@@ -75,8 +75,6 @@ const tvi_info_t tvi_info_v4l2 = {
     tvi_init_v4l2,
     "Video 4 Linux 2 input",
     "v4l2",
-    "Martin Olschewski <olschewski@zpr.uni-koeln.de>",
-    "first try, more to come ;-)"
 };
 
 struct map {
-- 
cgit v1.2.3