From 52a38108e9549a533bdd12c4c374f33daffa0282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96man?= <andreas@lonelycoder.com>
Date: Sat, 18 Jul 2009 17:10:04 +0000
Subject: [PATCH] Display adapter frequency range and symbol rate capabilities
 in the DVB general tab.

---
 src/dvb/dvb_adapter.c       | 11 +++++++++++
 src/webui/static/app/dvb.js | 15 +++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

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(
 	'<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}' +