Removes trailing spaces. Removes tabs.

[vlc] / modules / access / bda / bda.c

diff --git a/modules/access/bda/bda.c b/modules/access/bda/bda.c
index f217897b10f339339adf29ca6e59bd4521629431..f3da942d3a0cbd215ac987b955284474b5078a08 100644 (file)
--- a/modules/access/bda/bda.c
+++ b/modules/access/bda/bda.c
@@ -119,14 +119,14 @@ static const char *ppsz_qam_text[] = { N_("Undefined"), N_("16"), N_("32"),
     "[Undefined,1/2,2/3,3/4,5/6,7/8]")
 static const int i_hp_fec_list[] = { -1, 1, 2, 3, 4, 5 };
 static const char *ppsz_hp_fec_text[] = { N_("Undefined"), N_("1/2"), N_("2/3"),
-    N_("3/4"), N_("5/6"), N_("7/8") };    
+    N_("3/4"), N_("5/6"), N_("7/8") };
 
 #define CODE_RATE_LP_TEXT N_("Terrestrial low priority stream code rate (FEC)")
 #define CODE_RATE_LP_LONGTEXT N_("Low Priority FEC Rate " \
     "[Undefined,1/2,2/3,3/4,5/6,7/8]")
 static const int i_lp_fec_list[] = { -1, 1, 2, 3, 4, 5 };
 static const char *ppsz_lp_fec_text[] = { N_("Undefined"), N_("1/2"), N_("2/3"),
-    N_("3/4"), N_("5/6"), N_("7/8") }; 
+    N_("3/4"), N_("5/6"), N_("7/8") };
 
 #define BANDWIDTH_TEXT N_("Terrestrial bandwidth")
 #define BANDWIDTH_LONGTEXT N_("Terrestrial bandwidth [0=auto,6,7,8 in MHz]")
@@ -253,13 +253,18 @@ vlc_module_begin();
     add_shortcut( "dvb" );      /* Generic name */
 
     add_shortcut( "dvb-s" );    /* Satellite */
+    add_shortcut( "dvbs" );
     add_shortcut( "qpsk" );
     add_shortcut( "satellite" );
 
     add_shortcut( "dvb-c" );    /* Cable */
+    add_shortcut( "dvbc" );
+    add_shortcut( "qam" );
     add_shortcut( "cable" );
 
-    add_shortcut( "dvb-t" );    /* Terrestrial */
+    add_shortcut( "dvbt" );    /* Terrestrial */
+    add_shortcut( "dvb-t" );
+    add_shortcut( "ofdm" );
     add_shortcut( "terrestrial" );
 
     add_shortcut( "atsc" );     /* Atsc */
@@ -336,17 +341,22 @@ static int Open( vlc_object_t *p_this )
 
     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 )
     {
         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, "dvb-c", 5 ) == 0  ||
+        strncmp( p_access->psz_access, "dvbc", 4 ) == 0  ||
+        strncmp( p_access->psz_access, "qam", 3 ) == 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, "dvb-t", 5 ) == 0 ||
+        strncmp( p_access->psz_access, "ofdm", 4 ) == 0 ||
+        strncmp( p_access->psz_access, "dvbt", 4 ) == 0 )
     {
         i_ret = dvb_SubmitDVBTTuneRequest( p_access );
     }
@@ -436,7 +446,7 @@ static int ParsePath( access_t *p_access, const char* psz_module,
         }
         b_used[i_this_param] = TRUE;
 
-        /* if "=" was found in token then value starts at 
+        /* if "=" was found in token then value starts at
          * psz_token + i_paramlen + 1
          * else there is no value specified so we use an empty string */
         psz_value = psz_token + i_param_len + 1;