[vlc-commits] DTV: use dvb_enum_systems() instead of dvb_guess_system()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jul 12 17:33:16 2011 +0300| [8ad7caddd52ad98e43e845e30dcd9e11995fe621] | committer: Rémi Denis-Courmont

DTV: use dvb_enum_systems() instead of dvb_guess_system()

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

 modules/access/dtv/access.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
index b5de4ba..0b2fbc3 100644
--- a/modules/access/dtv/access.c
+++ b/modules/access/dtv/access.c
@@ -554,7 +554,16 @@ static const delsys_t *GuessSystem (const char *scheme, dvb_device_t *dev)
     if (!strcasecmp (scheme, "dvb-t2"))
         return &dvbt2;
 
-    return dvb_guess_system (dev);
+    unsigned systems = dvb_enum_systems (dev);
+    if (systems & ATSC)
+        return &atsc;
+    if (systems & DVB_C)
+        return &dvbc;
+    if (systems & DVB_S)
+        return &dvbc;
+    if (systems & DVB_T)
+        return &dvbt;
+    return NULL;
 }
 
 /** Set parameters and tune the device */