diff --git a/src/dvb/dvb_adapter.c b/src/dvb/dvb_adapter.c index 38b87776..2cbfc610 100644 --- a/src/dvb/dvb_adapter.c +++ b/src/dvb/dvb_adapter.c @@ -516,6 +516,7 @@ dvb_adapter_build_msg(th_dvb_adapter_t *tda) th_transport_t *t; int nummux = 0; int numsvc = 0; + int fdiv; htsmsg_add_str(m, "identifier", tda->tda_identifier); htsmsg_add_str(m, "name", tda->tda_displayname); @@ -543,6 +544,16 @@ dvb_adapter_build_msg(th_dvb_adapter_t *tda) val2str(tda->tda_type, deliverysystemtab) ?: ""); htsmsg_add_u32(m, "satConf", tda->tda_sat); + + fdiv = tda->tda_type == FE_QPSK ? 1 : 1000; + + htsmsg_add_u32(m, "freqMin", tda->tda_fe_info->frequency_min / fdiv); + htsmsg_add_u32(m, "freqMax", tda->tda_fe_info->frequency_max / fdiv); + htsmsg_add_u32(m, "freqStep", tda->tda_fe_info->frequency_stepsize / fdiv); + + htsmsg_add_u32(m, "symrateMin", tda->tda_fe_info->symbol_rate_min); + htsmsg_add_u32(m, "symrateMax", tda->tda_fe_info->symbol_rate_max); + return m; } diff --git a/src/webui/static/app/dvb.js b/src/webui/static/app/dvb.js index 83e58bf5..ba3f0856 100644 --- a/src/webui/static/app/dvb.js +++ b/src/webui/static/app/dvb.js @@ -13,7 +13,13 @@ tvheadend.dvbAdapterStore = new Ext.data.JsonStore({ 'muxes', 'initialMuxes', 'satConf', - 'deliverySystem'], + 'deliverySystem', + 'freqMin', + 'freqMax', + 'freqStep', + 'symrateMin', + 'symrateMax' + ], url:'dvb/adapter' }); @@ -957,10 +963,15 @@ tvheadend.dvb_adapter_general = function(adapterData, satConfStore) { * Information / capabilities panel */ - var infoTemplate = new Ext.Template( + var infoTemplate = new Ext.XTemplate( '