[vlc-commits] commit: Remove Wrong BDA shortcuts (Manol Manolov )

[git at videolan.org]

vlc | branch: master | Manol Manolov <man40dev at gmail.com> | Wed Jul 21 14:40:49 2010 -0400| [539dfc8477945811d07f59f2252d6454acaddeab] | committer: Jean-Baptiste Kempf 

Remove Wrong BDA shortcuts

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/access/bda/bda.c |   29 +++++++++++------------------
 1 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/modules/access/bda/bda.c b/modules/access/bda/bda.c
index 24a0d6f..548a14b 100644
--- a/modules/access/bda/bda.c
+++ b/modules/access/bda/bda.c
@@ -293,11 +293,11 @@ vlc_module_begin ()
         change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, NULL )
 
     set_capability( "access", 0 )
-    add_shortcut( "dvb",                                    /* Generic name */
-                  "dvb-s", "dvbs", "qpsk", "satellite",     /* Satellite */
-                  "dvb-c", "dvbc", "qam", "cable",          /* Cable */
-                  "dvbt", "dvb-t", "ofdm", "terrestrial",   /* Terrestrial */
-                  "atsc", "usdigital" )                     /* Atsc */
+    add_shortcut( "dvb",                  /* Generic name */
+                  "dvb-s", "dvbs",        /* Satellite */
+                  "dvb-c", "dvbc",        /* Cable */
+                  "dvb-t", "dvbt",        /* Terrestrial */
+                  "atsc" )                /* Atsc */
 
     set_callbacks( Open, Close )
 vlc_module_end ()
@@ -368,29 +368,22 @@ static int Open( vlc_object_t *p_this )
 
     i_ret = VLC_EGENERIC;
 
-    if( strncmp( p_access->psz_access, "qpsk", 4 ) == 0 ||
-        strncmp( p_access->psz_access, "dvb-s", 5 ) == 0 ||
-        strncmp( p_access->psz_access, "dvbs", 4 ) == 0 ||
-        strncmp( p_access->psz_access, "satellite", 9 ) == 0 )
+    if( strncmp( p_access->psz_access, "dvb-s", 5 ) == 0 ||
+        strncmp( p_access->psz_access, "dvbs", 4 ) == 0 )
     {
         i_ret = dvb_SubmitDVBSTuneRequest( p_access );
     }
-    if( strncmp( p_access->psz_access, "cable", 5 ) == 0 ||
-        strncmp( p_access->psz_access, "dvb-c", 5 ) == 0  ||
-        strncmp( p_access->psz_access, "dvbc", 4 ) == 0  ||
-        strncmp( p_access->psz_access, "qam", 3 ) == 0 )
+    if( strncmp( p_access->psz_access, "dvb-c", 5 ) == 0  ||
+        strncmp( p_access->psz_access, "dvbc", 4 ) == 0 )
     {
         i_ret = dvb_SubmitDVBCTuneRequest( p_access );
     }
-    if( strncmp( p_access->psz_access, "terrestrial", 11 ) == 0 ||
-        strncmp( p_access->psz_access, "dvb-t", 5 ) == 0 ||
-        strncmp( p_access->psz_access, "ofdm", 4 ) == 0 ||
+    if( strncmp( p_access->psz_access, "dvb-t", 5 ) == 0 ||
         strncmp( p_access->psz_access, "dvbt", 4 ) == 0 )
     {
         i_ret = dvb_SubmitDVBTTuneRequest( p_access );
     }
-    if( strncmp( p_access->psz_access, "usdigital", 9 ) == 0 ||
-        strncmp( p_access->psz_access, "atsc", 4 ) == 0 )
+    if( strncmp( p_access->psz_access, "atsc", 4 ) == 0 )
     {
         i_ret = dvb_SubmitATSCTuneRequest( p_access );
     }