Commit bef8181d authored by François Cartegnie's avatar François Cartegnie 🤞

access: dvb: cleanup

parent ee21d0f8
...@@ -96,10 +96,6 @@ static int Control( access_t *, int, va_list ); ...@@ -96,10 +96,6 @@ static int Control( access_t *, int, va_list );
static block_t *BlockScan( access_t * ); static block_t *BlockScan( access_t * );
#define DVB_READ_ONCE 20
#define DVB_READ_ONCE_START 2
#define DVB_READ_ONCE_SCAN 1
#define DVB_SCAN_MAX_SIGNAL_TIME (1000*1000) #define DVB_SCAN_MAX_SIGNAL_TIME (1000*1000)
#define DVB_SCAN_MAX_LOCK_TIME (5000*1000) #define DVB_SCAN_MAX_LOCK_TIME (5000*1000)
...@@ -159,36 +155,32 @@ static int Open( vlc_object_t *p_this ) ...@@ -159,36 +155,32 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
{ scan_parameter_t parameter;
scan_parameter_t parameter; scan_t *p_scan;
scan_t *p_scan;
scan_parameter_Init( &parameter ); scan_parameter_Init( &parameter );
parameter.b_use_nit = var_InheritBool( p_access, "dvb-scan-nit" ); parameter.b_use_nit = var_InheritBool( p_access, "dvb-scan-nit" );
msg_Dbg( p_access, "setting filter on PAT/NIT/SDT (DVB only)" ); msg_Dbg( p_access, "setting filter on PAT/NIT/SDT (DVB only)" );
FilterSet( p_access, 0x00, OTHER_TYPE ); // PAT FilterSet( p_access, 0x00, OTHER_TYPE ); // PAT
FilterSet( p_access, 0x11, OTHER_TYPE ); // SDT FilterSet( p_access, 0x11, OTHER_TYPE ); // SDT
if( parameter.b_use_nit ) if( parameter.b_use_nit )
FilterSet( p_access, 0x10, OTHER_TYPE ); // NIT FilterSet( p_access, 0x10, OTHER_TYPE ); // NIT
if( FrontendFillScanParameter( p_access, &parameter ) || if( FrontendFillScanParameter( p_access, &parameter ) ||
(p_scan = scan_New( VLC_OBJECT(p_access), &parameter )) == NULL ) (p_scan = scan_New( VLC_OBJECT(p_access), &parameter )) == NULL )
{ {
scan_parameter_Clean( &parameter );
Close( VLC_OBJECT(p_access) );
return VLC_EGENERIC;
}
scan_parameter_Clean( &parameter ); scan_parameter_Clean( &parameter );
p_sys->scan = p_scan; Close( VLC_OBJECT(p_access) );
p_sys->i_read_once = DVB_READ_ONCE_SCAN; return VLC_EGENERIC;
} }
scan_parameter_Clean( &parameter );
p_sys->scan = p_scan;
/* Set up access */ /* Set up access */
p_access->pf_read = NULL;
p_access->pf_control = Control; p_access->pf_control = Control;
p_access->pf_seek = NULL;
access_InitFields( p_access ); access_InitFields( p_access );
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -455,9 +447,6 @@ static void FilterSet( access_t *p_access, int i_pid, int i_type ) ...@@ -455,9 +447,6 @@ static void FilterSet( access_t *p_access, int i_pid, int i_type )
} }
p_sys->p_demux_handles[i].i_type = i_type; p_sys->p_demux_handles[i].i_type = i_type;
p_sys->p_demux_handles[i].i_pid = i_pid; p_sys->p_demux_handles[i].i_pid = i_pid;
if( p_sys->i_read_once < DVB_READ_ONCE )
p_sys->i_read_once++;
} }
static void FilterUnset( access_t *p_access, int i_max ) static void FilterUnset( access_t *p_access, int i_max )
......
...@@ -60,14 +60,6 @@ struct access_sys_t ...@@ -60,14 +60,6 @@ struct access_sys_t
demux_handle_t p_demux_handles[MAX_DEMUX]; demux_handle_t p_demux_handles[MAX_DEMUX];
frontend_t *p_frontend; frontend_t *p_frontend;
mtime_t i_frontend_timeout; mtime_t i_frontend_timeout;
bool b_budget_mode;
struct cam *p_cam;
/* */
int i_read_once;
int i_stat_counter;
/* Scan */ /* Scan */
struct scan_t *scan; struct scan_t *scan;
......
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