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

Display adapter frequency range and symbol rate capabilities in the DVB general tab.

Browse source
This commit is contained in:
Andreas Öman 2009-07-18 17:10:04 +00:00
parent adbcaa0cee
commit 52a38108e9
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/dvb/dvb_adapter.c
View file

@ -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;
}

15
src/webui/static/app/dvb.js
View file

@ -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(
'<h2 style="font-size: 150%">Hardware</h2>' +
'<h3>Device path:</h3>{path}' +
'<h3>Device name:</h3>{devicename}' +
'<h3><tpl if="satConf != 0">Intermediate </tpl>Frequency range:</h3>{freqMin} kHz - {freqMax} kHz' +
', in steps of {freqStep} kHz' +
'<tpl if="symrateMin != 0">' +
'<h3>Symbolrate range:</h3>' +
'{symrateMin} kBaud/s - {symrateMax} kBaud/s</tpl>' +
'<h2 style="font-size: 150%">Status</h2>' +
'<h3>Currently tuned to:</h3>{currentMux}&nbsp' +
'<h3>Services:</h3>{services}' +