stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mpegts scan: some minor corrections so stuff doesn't crash!

Browse source
This commit is contained in:
Adam Sutton 2014-05-17 10:11:36 +01:00
parent f393203b6e
commit 91fdd8914f
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/input/mpegts.c
View file

@ -27,6 +27,11 @@ mpegts_init ( int linuxdvb_mask, str_list_t *satip_client,
idclass_register(&mpegts_mux_class);
idclass_register(&mpegts_service_class);
/* Network scanner */
#if ENABLE_MPEGTS
mpegts_network_scan_init();
#endif
/* Setup DVB networks */
#if ENABLE_MPEGTS_DVB
dvb_network_init();
@ -67,6 +72,7 @@ mpegts_init ( int linuxdvb_mask, str_list_t *satip_client,
void
mpegts_done ( void )
{
tvhftrace("main", mpegts_network_scan_done);
tvhftrace("main", mpegts_mux_sched_done);
#if ENABLE_MPEGTS_DVB
tvhftrace("main", dvb_network_done);

3
src/input/mpegts/mpegts_mux.c
View file

@ -337,6 +337,9 @@ mpegts_mux_delete ( mpegts_mux_t *mm, int delconf )
/* Stop */
mm->mm_stop(mm, 1);
/* Remove from network */
LIST_REMOVE(mm, mm_network_link);
/* Cancel scan */
mpegts_network_scan_mux_cancel(mm, 0);

6
src/input/mpegts/mpegts_network_scan.c
View file

@ -107,6 +107,7 @@ void
mpegts_network_scan_mux_fail ( mpegts_mux_t *mm )
{
mm->mm_scan_ok = 0;
mpegts_mux_unsubscribe_by_name(mm, "scan");
mpegts_network_scan_queue_del(mm);
}
@ -115,6 +116,7 @@ void
mpegts_network_scan_mux_done ( mpegts_mux_t *mm )
{
mm->mm_scan_ok = 1;
mpegts_mux_unsubscribe_by_name(mm, "scan");
mpegts_network_scan_queue_del(mm);
}
@ -129,9 +131,8 @@ mpegts_network_scan_mux_timeout ( mpegts_mux_t *mm )
void
mpegts_network_scan_mux_cancel ( mpegts_mux_t *mm, int reinsert )
{
assert(mm->mm_scan_state == MM_SCAN_STATE_ACTIVE);
/* Remove */
mpegts_mux_unsubscribe_by_name(mm, "scan");
mpegts_network_scan_queue_del(mm);
/* Re-insert */
@ -162,6 +163,7 @@ mpegts_network_scan_queue_del ( mpegts_mux_t *mm )
TAILQ_REMOVE(&mpegts_network_scan_active, mm, mm_scan_link);
mm->mm_scan_state = MM_SCAN_STATE_IDLE;
gtimer_disarm(&mm->mm_scan_timeout);
mpegts_network_scan_timer_arm(0);
}
void