mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-04 09:11:33 +02:00
bda: little cleanup.
This commit is contained in:
parent
358afe661f
commit
d806641379
@ -413,7 +413,7 @@ static int ParsePath( access_t *p_access, const char* psz_module,
|
||||
const int i_param_count, const char** psz_param, const int* i_type )
|
||||
{
|
||||
const int MAXPARAM = 40;
|
||||
BOOL b_used[MAXPARAM];
|
||||
bool b_used[MAXPARAM];
|
||||
char* psz_parser;
|
||||
char* psz_token;
|
||||
char* psz_value;
|
||||
@ -429,7 +429,7 @@ static int ParsePath( access_t *p_access, const char* psz_module,
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
for( int i = 0; i < i_param_count; i++ )
|
||||
b_used[i] = FALSE;
|
||||
b_used[i] = false;
|
||||
psz_parser = p_access->psz_path;
|
||||
if( strlen( psz_parser ) <= 0 )
|
||||
return VLC_SUCCESS;
|
||||
@ -446,8 +446,7 @@ static int ParsePath( access_t *p_access, const char* psz_module,
|
||||
{
|
||||
msg_Warn( p_access, "ParsePath: Unspecified parameter %s",
|
||||
psz_token );
|
||||
if( psz_token )
|
||||
free( psz_token );
|
||||
free( psz_token );
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
i_this_param = -1;
|
||||
@ -462,19 +461,17 @@ static int ParsePath( access_t *p_access, const char* psz_module,
|
||||
if( i_this_param < 0 )
|
||||
{
|
||||
msg_Warn( p_access, "ParsePath: Unknown parameter %s", psz_token );
|
||||
if( psz_token )
|
||||
free( psz_token );
|
||||
free( psz_token );
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
if( b_used[i_this_param] )
|
||||
{
|
||||
msg_Warn( p_access, "ParsePath: Duplicate parameter %s",
|
||||
psz_token );
|
||||
if( psz_token )
|
||||
free( psz_token );
|
||||
free( psz_token );
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
b_used[i_this_param] = TRUE;
|
||||
b_used[i_this_param] = true;
|
||||
|
||||
/* if "=" was found in token then value starts at
|
||||
* psz_token + i_paramlen + 1
|
||||
@ -490,14 +487,13 @@ static int ParsePath( access_t *p_access, const char* psz_module,
|
||||
psz_param[i_this_param] );
|
||||
var_Set( p_access, psz_full_name, v_value );
|
||||
|
||||
if( psz_token )
|
||||
free( psz_token );
|
||||
free( psz_token );
|
||||
if( i_token_len >= strlen( psz_parser ) )
|
||||
break;
|
||||
psz_parser += i_token_len + 1;
|
||||
i_token_len = strcspn( psz_parser, ":" );
|
||||
}
|
||||
while( TRUE );
|
||||
while( true );
|
||||
return VLC_SUCCESS;
|
||||
}
|
||||
|
||||
|
@ -80,10 +80,10 @@ typedef enum ComponentStatus
|
||||
} ComponentStatus;
|
||||
|
||||
typedef enum DVBSystemType
|
||||
{
|
||||
DVB_Cable,
|
||||
DVB_Terrestrial,
|
||||
DVB_Satellite,
|
||||
{
|
||||
DVB_Cable,
|
||||
DVB_Terrestrial,
|
||||
DVB_Satellite,
|
||||
} DVBSystemType;
|
||||
|
||||
typedef enum FECMethod
|
||||
@ -161,13 +161,13 @@ typedef enum Polarisation
|
||||
} Polarisation;
|
||||
|
||||
typedef enum SpectralInversion
|
||||
{
|
||||
BDA_SPECTRAL_INVERSION_NOT_SET = -1,
|
||||
BDA_SPECTRAL_INVERSION_NOT_DEFINED = 0,
|
||||
BDA_SPECTRAL_INVERSION_AUTOMATIC = 1,
|
||||
BDA_SPECTRAL_INVERSION_NORMAL,
|
||||
BDA_SPECTRAL_INVERSION_INVERTED,
|
||||
BDA_SPECTRAL_INVERSION_MAX
|
||||
{
|
||||
BDA_SPECTRAL_INVERSION_NOT_SET = -1,
|
||||
BDA_SPECTRAL_INVERSION_NOT_DEFINED = 0,
|
||||
BDA_SPECTRAL_INVERSION_AUTOMATIC = 1,
|
||||
BDA_SPECTRAL_INVERSION_NORMAL,
|
||||
BDA_SPECTRAL_INVERSION_INVERTED,
|
||||
BDA_SPECTRAL_INVERSION_MAX
|
||||
} SpectralInversion;
|
||||
|
||||
typedef enum TransmissionMode
|
||||
@ -473,35 +473,35 @@ public:
|
||||
virtual HRESULT __stdcall Clone( ITuningSpace** p_p_tuning_space )=0;
|
||||
};
|
||||
|
||||
class IDVBTuningSpace : public ITuningSpace
|
||||
{
|
||||
public:
|
||||
virtual HRESULT __stdcall get_SystemType( DVBSystemType* p_sys_type )=0;
|
||||
virtual HRESULT __stdcall put_SystemType( DVBSystemType sys_type )=0;
|
||||
};
|
||||
|
||||
class IDVBTuningSpace2 : public IDVBTuningSpace
|
||||
{
|
||||
public:
|
||||
virtual HRESULT __stdcall get_NetworkID( long* p_l_network_id )=0;
|
||||
virtual HRESULT __stdcall put_NetworkID( long l_network_id )=0;
|
||||
class IDVBTuningSpace : public ITuningSpace
|
||||
{
|
||||
public:
|
||||
virtual HRESULT __stdcall get_SystemType( DVBSystemType* p_sys_type )=0;
|
||||
virtual HRESULT __stdcall put_SystemType( DVBSystemType sys_type )=0;
|
||||
};
|
||||
|
||||
class IDVBSTuningSpace : public IDVBTuningSpace2
|
||||
{
|
||||
public:
|
||||
virtual HRESULT __stdcall get_LowOscillator( long* p_l_low_osc )=0;
|
||||
virtual HRESULT __stdcall put_LowOscillator( long l_low_osc )=0;
|
||||
virtual HRESULT __stdcall get_HighOscillator( long* p_l_high_osc )=0;
|
||||
virtual HRESULT __stdcall put_HighOscillator( long l_high_osc )=0;
|
||||
virtual HRESULT __stdcall get_LNBSwitch( long* p_l_lnb_switch )=0;
|
||||
virtual HRESULT __stdcall put_LNBSwitch( long l_lnb_switch )=0;
|
||||
virtual HRESULT __stdcall get_InputRange( BSTR* p_bstr_input_range )=0;
|
||||
virtual HRESULT __stdcall put_InputRange( BSTR bstr_input_range )=0;
|
||||
|
||||
class IDVBTuningSpace2 : public IDVBTuningSpace
|
||||
{
|
||||
public:
|
||||
virtual HRESULT __stdcall get_NetworkID( long* p_l_network_id )=0;
|
||||
virtual HRESULT __stdcall put_NetworkID( long l_network_id )=0;
|
||||
};
|
||||
|
||||
class IDVBSTuningSpace : public IDVBTuningSpace2
|
||||
{
|
||||
public:
|
||||
virtual HRESULT __stdcall get_LowOscillator( long* p_l_low_osc )=0;
|
||||
virtual HRESULT __stdcall put_LowOscillator( long l_low_osc )=0;
|
||||
virtual HRESULT __stdcall get_HighOscillator( long* p_l_high_osc )=0;
|
||||
virtual HRESULT __stdcall put_HighOscillator( long l_high_osc )=0;
|
||||
virtual HRESULT __stdcall get_LNBSwitch( long* p_l_lnb_switch )=0;
|
||||
virtual HRESULT __stdcall put_LNBSwitch( long l_lnb_switch )=0;
|
||||
virtual HRESULT __stdcall get_InputRange( BSTR* p_bstr_input_range )=0;
|
||||
virtual HRESULT __stdcall put_InputRange( BSTR bstr_input_range )=0;
|
||||
virtual HRESULT __stdcall get_SpectralInversion(
|
||||
SpectralInversion* p_spectral_inv )=0;
|
||||
SpectralInversion* p_spectral_inv )=0;
|
||||
virtual HRESULT __stdcall put_SpectralInversion(
|
||||
SpectralInversion spectral_inv )=0;
|
||||
SpectralInversion spectral_inv )=0;
|
||||
};
|
||||
|
||||
class ITuningSpaceContainer : public IDispatch
|
||||
@ -585,10 +585,10 @@ extern const GUID MEDIATYPE_MPEG2_SECTIONS;
|
||||
extern const GUID MEDIASUBTYPE_None;
|
||||
extern const GUID FORMAT_None;
|
||||
|
||||
const GUID KSCATEGORY_BDA_TRANSPORT_INFORMATION =
|
||||
{0xa2e3074f,0x6c3d,0x11d3,{0xb6,0x53,0x00,0xc0,0x4f,0x79,0x49,0x8e}};
|
||||
const GUID KSCATEGORY_BDA_RECEIVER_COMPONENT =
|
||||
{0xFD0A5AF4,0xB41D,0x11d2,{0x9c,0x95,0x00,0xc0,0x4f,0x79,0x71,0xe0}};
|
||||
const GUID KSCATEGORY_BDA_NETWORK_TUNER =
|
||||
const GUID KSCATEGORY_BDA_TRANSPORT_INFORMATION =
|
||||
{0xa2e3074f,0x6c3d,0x11d3,{0xb6,0x53,0x00,0xc0,0x4f,0x79,0x49,0x8e}};
|
||||
const GUID KSCATEGORY_BDA_RECEIVER_COMPONENT =
|
||||
{0xFD0A5AF4,0xB41D,0x11d2,{0x9c,0x95,0x00,0xc0,0x4f,0x79,0x71,0xe0}};
|
||||
const GUID KSCATEGORY_BDA_NETWORK_TUNER =
|
||||
{0x71985f48,0x1ca1,0x11d3,{0x9c,0xc8,0x00,0xc0,0x4f,0x79,0x71,0xe0}};
|
||||
};
|
||||
|
@ -94,7 +94,7 @@ BDAGraph::BDAGraph( access_t* p_this ):
|
||||
l_tuner_used(-1),
|
||||
d_graph_register( 0 )
|
||||
{
|
||||
b_ready = FALSE;
|
||||
b_ready = false;
|
||||
p_tuning_space = NULL;
|
||||
p_tune_request = NULL;
|
||||
p_media_control = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user