[vlc-commits] DTV: remove dvb_guess_system()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jul 12 17:34:27 2011 +0300| [5c735144c7ee83175372345bf8a2c2f6d5141e22] | committer: Rémi Denis-Courmont

DTV: remove dvb_guess_system()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5c735144c7ee83175372345bf8a2c2f6d5141e22
---

 modules/access/dtv/bdagraph.cpp |    5 -----
 modules/access/dtv/dtv.h        |    1 -
 modules/access/dtv/linux.c      |   31 -------------------------------
 3 files changed, 0 insertions(+), 37 deletions(-)

diff --git a/modules/access/dtv/bdagraph.cpp b/modules/access/dtv/bdagraph.cpp
index e0f9d08..5081ae5 100644
--- a/modules/access/dtv/bdagraph.cpp
+++ b/modules/access/dtv/bdagraph.cpp
@@ -169,11 +169,6 @@ unsigned dvb_enum_systems (dvb_device_t *)
 #warning TODO
 }
 
-const delsys_t *dvb_guess_system (dvb_device_t *)
-{
-    return NULL;
-}
-
 float dvb_get_signal_strength (dvb_device_t *)
 {
     return 0.;
diff --git a/modules/access/dtv/dtv.h b/modules/access/dtv/dtv.h
index 90fc237..a25caf7 100644
--- a/modules/access/dtv/dtv.h
+++ b/modules/access/dtv/dtv.h
@@ -51,7 +51,6 @@ int dvb_add_pid (dvb_device_t *, uint16_t);
 void dvb_remove_pid (dvb_device_t *, uint16_t);
 
 unsigned dvb_enum_systems (dvb_device_t *);
-const delsys_t *dvb_guess_system (dvb_device_t *);
 float dvb_get_signal_strength (dvb_device_t *);
 float dvb_get_snr (dvb_device_t *);
 
diff --git a/modules/access/dtv/linux.c b/modules/access/dtv/linux.c
index 73e18bc..9e353dd 100644
--- a/modules/access/dtv/linux.c
+++ b/modules/access/dtv/linux.c
@@ -539,37 +539,6 @@ unsigned dvb_enum_systems (dvb_device_t *d)
     return systems;
 }
 
-const delsys_t *dvb_guess_system (dvb_device_t *d)
-{
-    if (d->frontend == -1)
-    {
-        d->frontend = dvb_open_node (d->dir, "frontend", 0, O_RDWR);
-        if (d->frontend == -1)
-        {
-            msg_Err (d->obj, "cannot access frontend %u; %m", 0);
-            return NULL;
-        }
-
-        if (ioctl (d->frontend, FE_GET_INFO, &d->info) < 0)
-        {
-            msg_Err (d->obj, "cannot get frontend %u info: %m", 0);
-            close (d->frontend);
-            d->frontend = -1;
-            return NULL;
-        }
-    }
-
-    //bool v2 = d->info.caps & FE_CAN_2G_MODULATION;
-    switch (d->info.type)
-    {
-        case FE_QPSK: return /*v2 ? &dvbs2 :*/ &dvbs;
-        case FE_QAM:  return &dvbc;
-        case FE_OFDM: return /*v2 ? &dvbt2 :*/ &dvbt;
-        case FE_ATSC: return &atsc;
-    }
-    return NULL;
-}
-
 float dvb_get_signal_strength (dvb_device_t *d)
 {
     uint16_t strength;