fixed some stuff for dvb-s(2) mux creation

src/dvb/dvb.h

@@ -258,6 +258,7 @@ const char *dvb_mux_add_by_params(th_dvb_adapter_t *tda,
 				  int symrate,
 				  int bw,
 				  int constellation,
+				  int delsys,
 				  int tmode,
 				  int guard,
 				  int hier,

src/dvb/dvb_adapter.c

@@ -563,6 +563,15 @@ dvb_fe_opts(th_dvb_adapter_t *tda, const char *which)
     return a;
   }
 
+  if(!strcmp(which, "delsys")) {
+    if(c & FE_CAN_QPSK) {
+      fe_opts_add(a, "SYS_DVBS",     SYS_DVBS);
+      fe_opts_add(a, "SYS_DVBS2",    SYS_DVBS2);
+    } else
+      fe_opts_add(a, "SYS_UNDEFINED",    SYS_UNDEFINED);
+    return a;
+  }
+
   if(!strcmp(which, "transmissionmodes")) {
     if(c & FE_CAN_TRANSMISSION_MODE_AUTO) 
       fe_opts_add(a, "Auto", TRANSMISSION_MODE_AUTO);

src/dvb/dvb_multiplex.c

@@ -858,6 +858,7 @@ dvb_mux_add_by_params(th_dvb_adapter_t *tda,
 		      int symrate,
 		      int bw,
 		      int constellation,
+		      int delsys,
 		      int tmode,
 		      int guard,
 		      int hier,
@@ -931,8 +932,16 @@ dvb_mux_add_by_params(th_dvb_adapter_t *tda,
     if(!val2str(polarisation, poltab))
       return "Invalid polarisation";
 
+    if(!val2str(constellation, qamtab))
+      return "Invalid QPSK constellation";
+
+    if(!val2str(delsys, delsystab))
+      return "Invalid delivery system";
+
     dmc.dmc_fe_params.u.qpsk.symbol_rate = symrate;
     dmc.dmc_fe_params.u.qpsk.fec_inner   = fec;
+    dmc.dmc_fe_delsys                    = delsys;
+    dmc.dmc_fe_modulation                = constellation;
     break;
 
   case FE_ATSC:

src/webui/extjs.c

@@ -1507,6 +1507,7 @@ extjs_dvb_addmux(http_connection_t *hc, const char *remain, void *opaque)
 			  atoi(http_arg_get(args, "symbolrate")?: "-1"),
 			  atoi(http_arg_get(args, "bandwidthID")?: "-1"),
 			  atoi(http_arg_get(args, "constellationID")?: "-1"),
+			  atoi(http_arg_get(args, "delsysID")?: "-1"),
 			  atoi(http_arg_get(args, "tmodeID")?: "-1"),
 			  atoi(http_arg_get(args, "guardintervalID")?: "-1"),
 			  atoi(http_arg_get(args, "hierarchyID")?: "-1"),

src/webui/static/app/dvb.js

@@ -839,6 +839,23 @@ tvheadend.addMuxManually = function(adapterData, satConfStore) {
 	    })
 	}));
 
+	items.push(new Ext.form.ComboBox({
+	    fieldLabel: 'Delivery System',
+	    name: 'delsys',
+	    hiddenName: 'delsysID',
+	    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/delsys/' + adId
+	    })
+	}));
+
 	items.push(new Ext.form.ComboBox({
 	    fieldLabel: 'Constellation',
 	    name: 'constellation',