Add BDA shortcuts dvbt, dvbc, dvbs (without hyphens) to conform to rev 20427: only...

diff --git a/modules/access/bda/bda.c b/modules/access/bda/bda.c
index f217897b10f339339adf29ca6e59bd4521629431..068053d63c9dd2223d377229c962d72d1103d3a7 100644 (file)
--- a/modules/access/bda/bda.c
+++ b/modules/access/bda/bda.c
@@ -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 );
     }

diff --git a/modules/access/bda/bdagraph.cpp b/modules/access/bda/bdagraph.cpp
index 040013d4b19f72dfb140f1479a1d4218da070644..64615ff114da1e06b46c536c7527a2f8825c44dd 100644 (file)
--- a/modules/access/bda/bdagraph.cpp
+++ b/modules/access/bda/bdagraph.cpp
@@ -1270,6 +1270,7 @@ HRESULT BDAGraph::Start()
         return hr;
 
     /* The Graph is not running so stop it and return an error */
+    msg_Warn( p_access, "Start: Graph not started: %d", i_state );
     hr = p_media_control->Stop();
     if( FAILED( hr ) )
     {