From e92996132baac8790f1cc816821da79d76a718b2 Mon Sep 17 00:00:00 2001 From: CrazyCat Date: Wed, 28 Jan 2015 23:14:45 +0200 Subject: [PATCH] Fixed DVB-S2 multistream tuning. --- src/input/mpegts/linuxdvb/linuxdvb_frontend.c | 2 +- src/input/mpegts/mpegts_network_dvb.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c index f56bad69..fea9bea4 100644 --- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c +++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c @@ -1322,7 +1322,7 @@ linuxdvb_frontend_tune0 S2CMD(DTV_PILOT, TR(pilot, pilot_tbl, PILOT_AUTO)); S2CMD(DTV_ROLLOFF, TR(rolloff, rolloff_tbl, ROLLOFF_AUTO)); r = dmc->dmc_fe_stream_id != -1 ? (dmc->dmc_fe_stream_id & 0xFF) | - ((dmc->dmc_fe_pls_code & 0x3FFFF)<<8) | ((dmc->dmc_fe_pls_mode & 0x3)<<26) : r; + ((dmc->dmc_fe_pls_code & 0x3FFFF)<<8) | ((dmc->dmc_fe_pls_mode & 0x3)<<26) : dmc->dmc_fe_stream_id; #if DVB_VER_ATLEAST(5,9) S2CMD(DTV_STREAM_ID, r ); #elif DVB_VER_ATLEAST(5,3) diff --git a/src/input/mpegts/mpegts_network_dvb.c b/src/input/mpegts/mpegts_network_dvb.c index 6404dc3b..98bb0564 100644 --- a/src/input/mpegts/mpegts_network_dvb.c +++ b/src/input/mpegts/mpegts_network_dvb.c @@ -304,7 +304,6 @@ dvb_network_find_mux /* Reject if not same symbol rate (some tolerance due to changes and diff in NIT) */ if (dvb_network_check_symbol_rate(lm, dmc, deltar)) continue; - /* DVB-S extra checks */ if (lm->lm_tuning.dmc_fe_type == DVB_TYPE_S) {