Commit 63c7e4a5 authored by Ken Self's avatar Ken Self

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

Add BDA shortcuts dvbt, dvbc, dvbs (without hyphens) to conform to rev 20427: only allow letters, digits and slash in access/demux. Also an extra error message if graph does not start running.
parent 34435b49
......@@ -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 );
}
......
......@@ -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 ) )
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment