Add support for adding ATSC muxes manually

diff --git a/src/dvb/dvb_multiplex.c b/src/dvb/dvb_multiplex.c
index 7fd5e2c25e9794e7b55deddcda9d7e5e4e73e4cb..986765ae7d8055f472013cee4b8d086ddb54d4bf 100644 (file)
--- a/src/dvb/dvb_multiplex.c
+++ b/src/dvb/dvb_multiplex.c
@@ -1169,7 +1169,7 @@ dvb_mux_add_by_params(th_dvb_adapter_t *tda,
     break;
 
   case FE_ATSC:
-    dmc.dmc_fe_params.frequency = freq;
+    dmc.dmc_fe_params.frequency = freq * 1000;
 
     if(!val2str(constellation, qamtab))
       return "Invalid VSB constellation";

diff --git a/src/webui/static/app/dvb.js b/src/webui/static/app/dvb.js
index eeca7090f7c6dc204fb1cfb04783e3b3338388c6..4d423d3f420d27f0c56f55a576f00bf67a042060 100644 (file)
--- a/src/webui/static/app/dvb.js
+++ b/src/webui/static/app/dvb.js
@@ -792,6 +792,36 @@ tvheadend.addMuxManually = function(adapterData, satConfStore) {
        var items = [];
 
        switch (adapterData.deliverySystem) {
+               case 'ATSC':
+                       items.push(new Ext.form.NumberField({
+                               fieldLabel : 'Frequency (kHz)',
+                               name : 'frequency',
+                               allowNegative : false,
+                               allowBlank : false,
+                               minValue : adapterData.freqMin,
+                               maxValue : adapterData.freqMax
+                       }));
+
+                       items.push(new Ext.form.ComboBox({
+                               fieldLabel : 'Modulation',
+                               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
+                               })
+                       }));
+
+                break;
+
+
                case 'DVB-T':
 
                        items.push(new Ext.form.NumberField({