diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c index dda3e734..5ed3fb26 100644 --- a/src/input/mpegts/dvb_psi.c +++ b/src/input/mpegts/dvb_psi.c @@ -423,7 +423,7 @@ dvb_table_complete struct mpegts_table_state *st; tvhtrace(mt->mt_name, "status: "); RB_FOREACH(st, &mt->mt_state, link) { - tvhtrace(mt->mt_name, " tableid %02X extraid %04X sect %2d last %2d ver %2d complete %d", + tvhtrace(mt->mt_name, " tableid %02X extraid %08X sect %2d last %2d ver %2d complete %d", st->tableid, st->extraid, st->section, st->last, st->version, st->complete); if (!st->complete) p = 1; @@ -472,7 +472,6 @@ dvb_table_begin return -1; tvhtrace(mt->mt_name, "tableid %02X len %d", tableid, len); - tvhlog_hexdump(mt->mt_name, ptr, len); /* Section info */ if (sect) { @@ -481,6 +480,7 @@ dvb_table_begin *ver = (ptr[2] >> 1) & 0x1F; tvhtrace(mt->mt_name, " extraid %08X", extraid); tvhtrace(mt->mt_name, " section %d last %d ver %d", *sect, *last, *ver); + tvhlog_hexdump(mt->mt_name, ptr, len); st = mpegts_table_state_find(mt, tableid, extraid); /* New version */ @@ -503,6 +503,8 @@ dvb_table_begin tvhtrace(mt->mt_name, " skip, wrong section"); return -1; } + } else { + tvhlog_hexdump(mt->mt_name, ptr, len); } return 1; diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c index 22de3b18..bd6838b8 100644 --- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c +++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c @@ -678,8 +678,8 @@ linuxdvb_frontend_tune0 assert(LIST_FIRST(&lfe->mi_mux_active) == NULL); /* Open FE */ + lfe->mi_display_name((mpegts_input_t*)lfe, buf1, sizeof(buf1)); if (lfe->lfe_fe_fd <= 0) { - lfe->mi_display_name((mpegts_input_t*)lfe, buf1, sizeof(buf1)); lfe->lfe_fe_fd = tvh_open(lfe->lfe_fe_path, O_RDWR | O_NONBLOCK, 0); tvhtrace("linuxdvb", "%s - opening FE %s (%d)", buf1, lfe->lfe_fe_path, lfe->lfe_fe_fd); if (lfe->lfe_fe_fd <= 0) { diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c index 4a18eaf6..b7143d53 100644 --- a/src/input/mpegts/mpegts_mux.c +++ b/src/input/mpegts/mpegts_mux.c @@ -95,6 +95,9 @@ mpegts_mux_instance_start ( mpegts_mux_instance_t **mmiptr ) tvhdebug("mpegts", "%s - started", buf); mmi->mmi_input->mi_started_mux(mmi->mmi_input, mmi); + /* Event handler */ + mpegts_fire_event(mm, ml_mux_start); + /* Initial scanning */ if (mm->mm_initial_scan_status == MM_SCAN_PENDING) { tvhtrace("mpegts", "%s - adding to current scan Q", buf);