From ce2109c3e79a9a138efd77c7225837d58ba55b37 Mon Sep 17 00:00:00 2001
From: Robert <robert@burger-system.de>
Date: Fri, 13 Nov 2009 18:08:05 +0000
Subject: [PATCH] some work on displaying and adding dvb-s(2)

---
 src/dvb/dvb_adapter.c       |  7 ++++++-
 src/dvb/dvb_multiplex.c     |  4 +++-
 src/webui/static/app/dvb.js | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/dvb/dvb_adapter.c b/src/dvb/dvb_adapter.c
index 29c85921..849f8ac7 100644
--- a/src/dvb/dvb_adapter.c
+++ b/src/dvb/dvb_adapter.c
@@ -549,7 +549,12 @@ dvb_fe_opts(th_dvb_adapter_t *tda, const char *which)
 
   if(!strcmp(which, "constellations")) {
     if(c & FE_CAN_QAM_AUTO)    fe_opts_add(a, "Auto", QAM_AUTO);
-    if(c & FE_CAN_QPSK)        fe_opts_add(a, "QPSK",     QPSK);
+    if(c & FE_CAN_QPSK) {
+      fe_opts_add(a, "QPSK",     QPSK);
+      fe_opts_add(a, "PSK_8",    PSK_8);
+      fe_opts_add(a, "APSK_16",  APSK_16);
+      fe_opts_add(a, "APSK_32",  APSK_32);
+    }
     if(c & FE_CAN_QAM_16)      fe_opts_add(a, "QAM-16",   QAM_16);
     if(c & FE_CAN_QAM_32)      fe_opts_add(a, "QAM-32",   QAM_32);
     if(c & FE_CAN_QAM_64)      fe_opts_add(a, "QAM-64",   QAM_64);
diff --git a/src/dvb/dvb_multiplex.c b/src/dvb/dvb_multiplex.c
index 564cbd26..4aa44c54 100644
--- a/src/dvb/dvb_multiplex.c
+++ b/src/dvb/dvb_multiplex.c
@@ -785,7 +785,9 @@ dvb_mux_modulation(char *buf, size_t size, th_dvb_mux_instance_t *tdmi)
     break;
 
   case FE_QPSK:
-    snprintf(buf, size, "%d kBaud", f->u.qpsk.symbol_rate / 1000);
+    snprintf(buf, size, "%d kBaud, %s, %s", f->u.qpsk.symbol_rate / 1000,
+      val2str(tdmi->tdmi_conf.dmc_fe_delsys, delsystab),
+      val2str(tdmi->tdmi_conf.dmc_fe_modulation, qamtab));
     break;
 	     
   case FE_QAM:
diff --git a/src/webui/static/app/dvb.js b/src/webui/static/app/dvb.js
index 7b9b9f93..5c12f7c7 100644
--- a/src/webui/static/app/dvb.js
+++ b/src/webui/static/app/dvb.js
@@ -839,6 +839,23 @@ tvheadend.addMuxManually = function(adapterData, satConfStore) {
 	    })
 	}));
 
+	items.push(new Ext.form.ComboBox({
+	    fieldLabel: 'Constellation',
+	    name: 'constellation',
+	    hiddenName: 'constellationID',
+	    editable: false,
+	    allowBlank: false,
+	    displayField: 'title',
+	    valueField:'id',
+	    mode:'remote',
+	    triggerAction: 'all',
+	    store: new Ext.data.JsonStore({
+		root:'entries',
+		fields: ['title', 'id'],
+		url: 'dvb/feopts/constellations/' + adId
+	    })
+	}));
+
 	items.push(new Ext.form.ComboBox({
 	    fieldLabel: 'Polarisation',
 	    name: 'polarisation',