DVB: remove unused parameter

diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
index d0369cd37fde9675f9b169e60e19d9ad5ccbf93a..90c3d9eb29476a349cf9f75386b03f3f0c4857d4 100644 (file)
--- a/modules/access/dtv/access.c
+++ b/modules/access/dtv/access.c
@@ -361,9 +361,8 @@ static int Open (vlc_object_t *obj)
         return VLC_ENOMEM;
 
     var_LocationParse (obj, access->psz_location, "dvb-");
-    unsigned freq = var_InheritFrequency (obj);
 
-    dvb_device_t *dev = dvb_open (obj, freq != 0);
+    dvb_device_t *dev = dvb_open (obj);
     if (dev == NULL)
     {
         free (sys);
@@ -373,6 +372,7 @@ static int Open (vlc_object_t *obj)
     sys->dev = dev;
     access->p_sys = sys;
 
+    unsigned freq = var_InheritFrequency (obj);
     if (freq != 0)
     {
         const delsys_t *delsys = GuessSystem (access->psz_access, dev);

diff --git a/modules/access/dtv/bdagraph.cpp b/modules/access/dtv/bdagraph.cpp
index af283155333f9a7adf48820d9e8f0d902b868e7c..23ab96ad968f80623b80cfef1e07af1c52515ced 100644 (file)
--- a/modules/access/dtv/bdagraph.cpp
+++ b/modules/access/dtv/bdagraph.cpp
@@ -130,11 +130,8 @@ struct dvb_device
     uint32_t lowf, highf, switchf;
 };
 
-dvb_device_t *dvb_open (vlc_object_t *obj, bool tune)
+dvb_device_t *dvb_open (vlc_object_t *obj)
 {
-    if (!tune)
-        return NULL; /* not implemented (yet?) */
-
     dvb_device_t *d = new dvb_device_t;
 
     d->module = new BDAGraph (obj);

diff --git a/modules/access/dtv/dtv.h b/modules/access/dtv/dtv.h
index 19349ec4c49545cbec857cc71c246b8440942b78..3cdcd3fbaff7d6558ca1c338ebeb80f22a5a55db 100644 (file)
--- a/modules/access/dtv/dtv.h
+++ b/modules/access/dtv/dtv.h
@@ -32,7 +32,7 @@ extern const delsys_t dvbc, dvbs, dvbs2, dvbt, dvbt2, atsc, cqam;
 
 typedef struct dvb_device dvb_device_t;
 
-dvb_device_t *dvb_open (vlc_object_t *obj, bool tune);
+dvb_device_t *dvb_open (vlc_object_t *obj);
 void dvb_close (dvb_device_t *);
 ssize_t dvb_read (dvb_device_t *, void *, size_t);
 

diff --git a/modules/access/dtv/linux.c b/modules/access/dtv/linux.c
index df0f7ecbe54f83913578e65a3d4b2fa3214feb15..b6c22f17af1468886bf3634242446c09b8f87cdc 100644 (file)
--- a/modules/access/dtv/linux.c
+++ b/modules/access/dtv/linux.c
@@ -192,7 +192,7 @@ struct dvb_device
 /**
  * Opens the DVB tuner
  */
-dvb_device_t *dvb_open (vlc_object_t *obj, bool tune)
+dvb_device_t *dvb_open (vlc_object_t *obj)
 {
     dvb_device_t *d = malloc (sizeof (*d));
     if (unlikely(d == NULL))