Commit 7a01aa9c authored by David Kaplan's avatar David Kaplan Committed by Rémi Denis-Courmont

DVB access module format improvements

ScanDvbTNextExhaustive() -> ScanDvbNextExhaustive() as is used for both DVB-T/C
Various code format improvements
Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 100ef2ea
...@@ -182,7 +182,7 @@ struct access_sys_t ...@@ -182,7 +182,7 @@ struct access_sys_t
vlc_mutex_t httpd_mutex; vlc_mutex_t httpd_mutex;
vlc_cond_t httpd_cond; vlc_cond_t httpd_cond;
mtime_t i_httpd_timeout; mtime_t i_httpd_timeout;
bool b_request_frontend_info, b_request_mmi_info; bool b_request_frontend_info, b_request_mmi_info;
char *psz_frontend_info, *psz_mmi_info; char *psz_frontend_info, *psz_mmi_info;
char *psz_request; char *psz_request;
#endif #endif
......
...@@ -759,7 +759,7 @@ static fe_spectral_inversion_t DecodeInversion( access_t *p_access ) ...@@ -759,7 +759,7 @@ static fe_spectral_inversion_t DecodeInversion( access_t *p_access )
static fe_code_rate_t DecodeFEC( access_t *p_access, int i_val ) static fe_code_rate_t DecodeFEC( access_t *p_access, int i_val )
{ {
fe_code_rate_t fe_fec = FEC_NONE; fe_code_rate_t fe_fec = FEC_NONE;
msg_Dbg( p_access, "using fec=%d", i_val ); msg_Dbg( p_access, "using fec=%d", i_val );
......
...@@ -177,7 +177,7 @@ static int ScanDvbCNextFast( scan_t *p_scan, scan_configuration_t *p_cfg, double ...@@ -177,7 +177,7 @@ static int ScanDvbCNextFast( scan_t *p_scan, scan_configuration_t *p_cfg, double
return VLC_EGENERIC; return VLC_EGENERIC;
} }
static int ScanDvbTNextExhaustive( scan_t *p_scan, scan_configuration_t *p_cfg, double *pf_pos ) static int ScanDvbNextExhaustive( scan_t *p_scan, scan_configuration_t *p_cfg, double *pf_pos )
{ {
if( p_scan->i_index > p_scan->parameter.frequency.i_count * p_scan->parameter.bandwidth.i_count ) if( p_scan->i_index > p_scan->parameter.frequency.i_count * p_scan->parameter.bandwidth.i_count )
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -267,7 +267,7 @@ static int ScanDvbTNextFast( scan_t *p_scan, scan_configuration_t *p_cfg, double ...@@ -267,7 +267,7 @@ static int ScanDvbTNextFast( scan_t *p_scan, scan_configuration_t *p_cfg, double
static int ScanDvbCNext( scan_t *p_scan, scan_configuration_t *p_cfg, double *pf_pos ) static int ScanDvbCNext( scan_t *p_scan, scan_configuration_t *p_cfg, double *pf_pos )
{ {
if( p_scan->parameter.b_exhaustive ) if( p_scan->parameter.b_exhaustive )
return ScanDvbTNextExhaustive( p_scan, p_cfg, pf_pos ); return ScanDvbNextExhaustive( p_scan, p_cfg, pf_pos );
else else
return ScanDvbCNextFast( p_scan, p_cfg, pf_pos ); return ScanDvbCNextFast( p_scan, p_cfg, pf_pos );
} }
...@@ -275,7 +275,7 @@ static int ScanDvbCNext( scan_t *p_scan, scan_configuration_t *p_cfg, double *pf ...@@ -275,7 +275,7 @@ static int ScanDvbCNext( scan_t *p_scan, scan_configuration_t *p_cfg, double *pf
static int ScanDvbTNext( scan_t *p_scan, scan_configuration_t *p_cfg, double *pf_pos ) static int ScanDvbTNext( scan_t *p_scan, scan_configuration_t *p_cfg, double *pf_pos )
{ {
if( p_scan->parameter.b_exhaustive ) if( p_scan->parameter.b_exhaustive )
return ScanDvbTNextExhaustive( p_scan, p_cfg, pf_pos ); return ScanDvbNextExhaustive( p_scan, p_cfg, pf_pos );
else else
return ScanDvbTNextFast( p_scan, p_cfg, pf_pos ); return ScanDvbTNextFast( p_scan, p_cfg, pf_pos );
} }
......
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