#include "tvheadend.h"
#include "input.h"
-#include "linuxdvb_private.h"
+#include "mpegts_dvb.h"
#include "queue.h"
#include "settings.h"
* *************************************************************************/
static void
-linuxdvb_mux_delete ( mpegts_mux_t *mm, int delconf );
+dvb_mux_delete ( mpegts_mux_t *mm, int delconf );
extern const idclass_t mpegts_mux_class;
*/
/* Macro to define mux class str get/set */
-#define linuxdvb_mux_class_R(c, f, l, ...)\
+#define dvb_mux_class_R(c, f, l, ...)\
static const void * \
-linuxdvb_mux_##c##_class_##l##_get (void *o)\
+dvb_mux_##c##_class_##l##_get (void *o)\
{\
static const char *s;\
- linuxdvb_mux_t *lm = o;\
+ dvb_mux_t *lm = o;\
s = dvb_##l##2str(lm->lm_tuning.dmc_fe_##f);\
return &s;\
}\
static int \
-linuxdvb_mux_##c##_class_##l##_set (void *o, const void *v)\
+dvb_mux_##c##_class_##l##_set (void *o, const void *v)\
{\
- linuxdvb_mux_t *lm = o;\
+ dvb_mux_t *lm = o;\
lm->lm_tuning.dmc_fe_##f = dvb_str2##l ((const char*)v);\
return 1;\
}\
static htsmsg_t *\
-linuxdvb_mux_##c##_class_##l##_enum (void *o)\
+dvb_mux_##c##_class_##l##_enum (void *o)\
{\
static const int t[] = { __VA_ARGS__ };\
int i;\
htsmsg_add_str(m, NULL, dvb_##l##2str(t[i]));\
return m;\
}
-#define linuxdvb_mux_class_X(c, f, p, l, ...)\
+#define dvb_mux_class_X(c, f, p, l, ...)\
static const void * \
-linuxdvb_mux_##c##_class_##l##_get (void *o)\
+dvb_mux_##c##_class_##l##_get (void *o)\
{\
static const char *s;\
- linuxdvb_mux_t *lm = o;\
+ dvb_mux_t *lm = o;\
s = dvb_##l##2str(lm->lm_tuning.u.dmc_fe_##f.p);\
return &s;\
}\
static int \
-linuxdvb_mux_##c##_class_##l##_set (void *o, const void *v)\
+dvb_mux_##c##_class_##l##_set (void *o, const void *v)\
{\
- linuxdvb_mux_t *lm = o;\
+ dvb_mux_t *lm = o;\
lm->lm_tuning.u.dmc_fe_##f.p = dvb_str2##l ((const char*)v);\
return 1;\
}\
static htsmsg_t *\
-linuxdvb_mux_##c##_class_##l##_enum (void *o)\
+dvb_mux_##c##_class_##l##_enum (void *o)\
{\
static const int t[] = { __VA_ARGS__ };\
int i;\
.type = PT_STR,\
.id = _id,\
.name = _name,\
- .get = linuxdvb_mux_##t##_class_##l##_get,\
- .set = linuxdvb_mux_##t##_class_##l##_set,\
- .list = linuxdvb_mux_##t##_class_##l##_enum,\
+ .get = dvb_mux_##t##_class_##l##_get,\
+ .set = dvb_mux_##t##_class_##l##_set,\
+ .list = dvb_mux_##t##_class_##l##_enum,\
.def.s = d
static const void *
-linuxdvb_mux_class_delsys_get (void *o)
+dvb_mux_class_delsys_get (void *o)
{
static const char *s;
- linuxdvb_mux_t *lm = o;
+ dvb_mux_t *lm = o;
s = dvb_delsys2str(lm->lm_tuning.dmc_fe_delsys);
return &s;
}
+
static int
-linuxdvb_mux_class_delsys_set (void *o, const void *v)
+dvb_mux_class_delsys_set (void *o, const void *v)
{
-#if DVB_VER_ATLEAST(5,0)
const char *s = v;
int delsys = dvb_str2delsys(s);
- linuxdvb_mux_t *lm = o;
+ dvb_mux_t *lm = o;
if (delsys != lm->lm_tuning.dmc_fe_delsys) {
lm->lm_tuning.dmc_fe_delsys = dvb_str2delsys(s);
return 1;
}
-#endif
return 0;
}
-const idclass_t linuxdvb_mux_class =
+const idclass_t dvb_mux_class =
{
.ic_super = &mpegts_mux_class,
- .ic_class = "linuxdvb_mux",
+ .ic_class = "dvb_mux",
.ic_caption = "Linux DVB Multiplex",
.ic_properties = (const property_t[]){
{}
* DVB-T
*/
-linuxdvb_mux_class_X(dvbt, ofdm, bandwidth, bw,
- DVB_BANDWIDTH_AUTO
- , DVB_BANDWIDTH_8_MHZ, DVB_BANDWIDTH_7_MHZ
- , DVB_BANDWIDTH_6_MHZ
-#if DVB_VER_ATLEAST(5,4)
- , DVB_BANDWIDTH_5_MHZ
- , DVB_BANDWIDTH_10_MHZ
- , DVB_BANDWIDTH_1_712_MHZ
-#endif
- );
-linuxdvb_mux_class_R(dvbt, modulation, qam,
+dvb_mux_class_X(dvbt, ofdm, bandwidth, bw,
+ DVB_BANDWIDTH_AUTO, DVB_BANDWIDTH_10_MHZ,
+ DVB_BANDWIDTH_8_MHZ, DVB_BANDWIDTH_7_MHZ,
+ DVB_BANDWIDTH_6_MHZ, DVB_BANDWIDTH_5_MHZ,
+ DVB_BANDWIDTH_1_712_MHZ);
+dvb_mux_class_R(dvbt, modulation, qam,
DVB_MOD_QAM_AUTO, DVB_MOD_QPSK, DVB_MOD_QAM_16,
- DVB_MOD_QAM_64, DVB_MOD_QAM_256
- );
-linuxdvb_mux_class_X(dvbt, ofdm, transmission_mode, mode,
- DVB_TRANSMISSION_MODE_AUTO,
- DVB_TRANSMISSION_MODE_2K, DVB_TRANSMISSION_MODE_8K
-#if DVB_VER_ATLEAST(5,4)
- , DVB_TRANSMISSION_MODE_1K, DVB_TRANSMISSION_MODE_16K
- , DVB_TRANSMISSION_MODE_32K
-#endif
- );
-linuxdvb_mux_class_X(dvbt, ofdm, guard_interval, guard,
- DVB_GUARD_INTERVAL_AUTO, DVB_GUARD_INTERVAL_1_4,
- DVB_GUARD_INTERVAL_1_8, DVB_GUARD_INTERVAL_1_16,
- DVB_GUARD_INTERVAL_1_32
-#if DVB_VER_ATLEAST(5,4)
- , DVB_GUARD_INTERVAL_1_128, DVB_GUARD_INTERVAL_19_128
- , DVB_GUARD_INTERVAL_19_256
-#endif
- );
-linuxdvb_mux_class_X(dvbt, ofdm, hierarchy_information, hier,
+ DVB_MOD_QAM_64, DVB_MOD_QAM_256);
+dvb_mux_class_X(dvbt, ofdm, transmission_mode, mode,
+ DVB_TRANSMISSION_MODE_AUTO, DVB_TRANSMISSION_MODE_32K,
+ DVB_TRANSMISSION_MODE_16K, DVB_TRANSMISSION_MODE_8K,
+ DVB_TRANSMISSION_MODE_2K, DVB_TRANSMISSION_MODE_1K);
+dvb_mux_class_X(dvbt, ofdm, guard_interval, guard,
+ DVB_GUARD_INTERVAL_AUTO, DVB_GUARD_INTERVAL_1_32,
+ DVB_GUARD_INTERVAL_1_16, DVB_GUARD_INTERVAL_1_8,
+ DVB_GUARD_INTERVAL_1_4, DVB_GUARD_INTERVAL_1_128,
+ DVB_GUARD_INTERVAL_19_128, DVB_GUARD_INTERVAL_19_256);
+dvb_mux_class_X(dvbt, ofdm, hierarchy_information, hier,
DVB_HIERARCHY_AUTO, DVB_HIERARCHY_NONE,
- DVB_HIERARCHY_1, DVB_HIERARCHY_2, DVB_HIERARCHY_4
- );
-linuxdvb_mux_class_X(dvbt, ofdm, code_rate_HP, fechi,
- DVB_FEC_AUTO,
- DVB_FEC_1_2, DVB_FEC_2_3, DVB_FEC_3_4, DVB_FEC_4_5,
- DVB_FEC_5_6, DVB_FEC_7_8
-#if DVB_VER_ATLEAST(5,4)
- , DVB_FEC_3_5
-#endif
- );
-linuxdvb_mux_class_X(dvbt, ofdm, code_rate_LP, feclo,
- DVB_FEC_AUTO,
- DVB_FEC_1_2, DVB_FEC_2_3, DVB_FEC_3_4,
- DVB_FEC_4_5, DVB_FEC_5_6, DVB_FEC_7_8
-#if DVB_VER_ATLEAST(5,4)
- , DVB_FEC_3_5
-#endif
- );
-
-#define linuxdvb_mux_dvbt_class_delsys_get linuxdvb_mux_class_delsys_get
-#define linuxdvb_mux_dvbt_class_delsys_set linuxdvb_mux_class_delsys_set
+ DVB_HIERARCHY_1, DVB_HIERARCHY_2, DVB_HIERARCHY_4);
+dvb_mux_class_X(dvbt, ofdm, code_rate_HP, fechi,
+ DVB_FEC_AUTO, DVB_FEC_1_2, DVB_FEC_2_3, DVB_FEC_3_4,
+ DVB_FEC_3_5, DVB_FEC_4_5, DVB_FEC_5_6, DVB_FEC_7_8);
+dvb_mux_class_X(dvbt, ofdm, code_rate_LP, feclo,
+ DVB_FEC_AUTO, DVB_FEC_1_2, DVB_FEC_2_3, DVB_FEC_3_4,
+ DVB_FEC_3_5, DVB_FEC_4_5, DVB_FEC_5_6, DVB_FEC_7_8);
+
+#define dvb_mux_dvbt_class_delsys_get dvb_mux_class_delsys_get
+#define dvb_mux_dvbt_class_delsys_set dvb_mux_class_delsys_set
+
static htsmsg_t *
-linuxdvb_mux_dvbt_class_delsys_enum (void *o)
+dvb_mux_dvbt_class_delsys_enum (void *o)
{
htsmsg_t *list = htsmsg_create_list();
-#if DVB_VER_ATLEAST(5,0)
htsmsg_add_str(list, NULL, dvb_delsys2str(DVB_SYS_DVBT));
-#endif
-#if DVB_VER_ATLEAST(5,4)
htsmsg_add_str(list, NULL, dvb_delsys2str(DVB_SYS_DVBT2));
htsmsg_add_str(list, NULL, dvb_delsys2str(DVB_SYS_TURBO));
-#endif
return list;
}
-const idclass_t linuxdvb_mux_dvbt_class =
+const idclass_t dvb_mux_dvbt_class =
{
- .ic_super = &linuxdvb_mux_class,
- .ic_class = "linuxdvb_mux_dvbt",
+ .ic_super = &dvb_mux_class,
+ .ic_class = "dvb_mux_dvbt",
.ic_caption = "Linux DVB-T Multiplex",
.ic_properties = (const property_t[]){
{
.id = "frequency",
.name = "Frequency (Hz)",
.opts = PO_WRONCE,
- .off = offsetof(linuxdvb_mux_t, lm_tuning.dmc_fe_freq),
+ .off = offsetof(dvb_mux_t, lm_tuning.dmc_fe_freq),
},
{
MUX_PROP_STR("bandwidth", "Bandwidth", dvbt, bw, "AUTO")
* DVB-C
*/
-linuxdvb_mux_class_R(dvbc, modulation, qam,
+dvb_mux_class_R(dvbc, modulation, qam,
DVB_MOD_QAM_AUTO, DVB_MOD_QAM_16, DVB_MOD_QAM_32,
- DVB_MOD_QAM_64, DVB_MOD_QAM_128, DVB_MOD_QAM_256
- );
-linuxdvb_mux_class_X(dvbc, qam, fec_inner, fec,
+ DVB_MOD_QAM_64, DVB_MOD_QAM_128, DVB_MOD_QAM_256);
+dvb_mux_class_X(dvbc, qam, fec_inner, fec,
DVB_FEC_AUTO, DVB_FEC_NONE,
DVB_FEC_1_2, DVB_FEC_2_3, DVB_FEC_3_4, DVB_FEC_4_5,
- DVB_FEC_5_6, DVB_FEC_8_9
-#if DVB_VER_ATLEAST(5,4)
- , DVB_FEC_9_10
-#endif
- );
-
-#define linuxdvb_mux_dvbc_class_delsys_get linuxdvb_mux_class_delsys_get
-#define linuxdvb_mux_dvbc_class_delsys_set linuxdvb_mux_class_delsys_set
+ DVB_FEC_5_6, DVB_FEC_8_9, DVB_FEC_9_10);
+
+#define dvb_mux_dvbc_class_delsys_get dvb_mux_class_delsys_get
+#define dvb_mux_dvbc_class_delsys_set dvb_mux_class_delsys_set
static htsmsg_t *
-linuxdvb_mux_dvbc_class_delsys_enum (void *o)
+dvb_mux_dvbc_class_delsys_enum (void *o)
{
htsmsg_t *list = htsmsg_create_list();
-#if DVB_VER_ATLEAST(5,0)
htsmsg_add_str(list, NULL, dvb_delsys2str(DVB_SYS_DVBC_ANNEX_A));
htsmsg_add_str(list, NULL, dvb_delsys2str(DVB_SYS_DVBC_ANNEX_B));
-#if DVB_VER_ATLEAST(5,3)
htsmsg_add_str(list, NULL, dvb_delsys2str(DVB_SYS_DVBC_ANNEX_C));
-#endif
-#endif
return list;
}
-const idclass_t linuxdvb_mux_dvbc_class =
+const idclass_t dvb_mux_dvbc_class =
{
- .ic_super = &linuxdvb_mux_class,
- .ic_class = "linuxdvb_mux_dvbc",
+ .ic_super = &dvb_mux_class,
+ .ic_class = "dvb_mux_dvbc",
.ic_caption = "Linux DVB-C Multiplex",
.ic_properties = (const property_t[]){
{
.id = "frequency",
.name = "Frequency (Hz)",
.opts = PO_WRONCE,
- .off = offsetof(linuxdvb_mux_t, lm_tuning.dmc_fe_freq),
+ .off = offsetof(dvb_mux_t, lm_tuning.dmc_fe_freq),
},
{
.type = PT_U32,
.id = "symbolrate",
.name = "Symbol Rate (Sym/s)",
.opts = PO_WRONCE,
- .off = offsetof(linuxdvb_mux_t, lm_tuning.u.dmc_fe_qam.symbol_rate),
+ .off = offsetof(dvb_mux_t, lm_tuning.u.dmc_fe_qam.symbol_rate),
},
{
MUX_PROP_STR("constellation", "Constellation", dvbc, qam, "AUTO")
}
};
-linuxdvb_mux_class_X(dvbs, qpsk, fec_inner, fec,
+dvb_mux_class_X(dvbs, qpsk, fec_inner, fec,
DVB_FEC_AUTO, DVB_FEC_NONE,
- DVB_FEC_1_2, DVB_FEC_2_3, DVB_FEC_3_4, DVB_FEC_4_5,
- DVB_FEC_5_6, DVB_FEC_7_8, DVB_FEC_8_9
-#if DVB_VER_ATLEAST(5,4)
- , DVB_FEC_3_5, DVB_FEC_9_10
-#endif
- );
+ DVB_FEC_1_2, DVB_FEC_2_3, DVB_FEC_3_4, DVB_FEC_3_5,
+ DVB_FEC_4_5, DVB_FEC_5_6, DVB_FEC_7_8, DVB_FEC_8_9,
+ DVB_FEC_9_10);
+
static const void *
-linuxdvb_mux_dvbs_class_polarity_get (void *o)
+dvb_mux_dvbs_class_polarity_get (void *o)
{
static const char *s;
- linuxdvb_mux_t *lm = o;
+ dvb_mux_t *lm = o;
s = dvb_pol2str(lm->lm_tuning.u.dmc_fe_qpsk.polarisation);
return &s;
}
+
static int
-linuxdvb_mux_dvbs_class_polarity_set (void *o, const void *s)
+dvb_mux_dvbs_class_polarity_set (void *o, const void *s)
{
- linuxdvb_mux_t *lm = o;
+ dvb_mux_t *lm = o;
lm->lm_tuning.u.dmc_fe_qpsk.polarisation = dvb_str2pol((const char*)s);
return 1;
}
+
static htsmsg_t *
-linuxdvb_mux_dvbs_class_polarity_enum (void *o)
+dvb_mux_dvbs_class_polarity_enum (void *o)
{
htsmsg_t *list = htsmsg_create_list();
htsmsg_add_str(list, NULL, dvb_pol2str(DVB_POLARISATION_VERTICAL));
}
static const void *
-linuxdvb_mux_dvbs_class_modulation_get ( void *o )
+dvb_mux_dvbs_class_modulation_get ( void *o )
{
static const char *s;
- linuxdvb_mux_t *lm = o;
+ dvb_mux_t *lm = o;
s = dvb_qam2str(lm->lm_tuning.dmc_fe_modulation);
return &s;
}
+
static int
-linuxdvb_mux_dvbs_class_modulation_set (void *o, const void *s)
+dvb_mux_dvbs_class_modulation_set (void *o, const void *s)
{
int mod = dvb_str2qam(s);
- linuxdvb_mux_t *lm = o;
+ dvb_mux_t *lm = o;
if (mod != lm->lm_tuning.dmc_fe_modulation) {
lm->lm_tuning.dmc_fe_modulation = mod;
return 1;
}
return 0;
}
+
static htsmsg_t *
-linuxdvb_mux_dvbs_class_modulation_list ( void *o )
+dvb_mux_dvbs_class_modulation_list ( void *o )
{
htsmsg_t *list = htsmsg_create_list();
- htsmsg_add_str(list, NULL, dvb_qam2str(DVB_MOD_QAM_AUTO));
+ htsmsg_add_str(list, NULL, dvb_qam2str(DVB_MOD_AUTO));
htsmsg_add_str(list, NULL, dvb_qam2str(DVB_MOD_QPSK));
htsmsg_add_str(list, NULL, dvb_qam2str(DVB_MOD_QAM_16));
-#if DVB_VER_ATLEAST(5,4)
htsmsg_add_str(list, NULL, dvb_qam2str(DVB_MOD_PSK_8));
htsmsg_add_str(list, NULL, dvb_qam2str(DVB_MOD_APSK_16));
htsmsg_add_str(list, NULL, dvb_qam2str(DVB_MOD_APSK_32));
-#endif
return list;
}
-#if DVB_VER_ATLEAST(5,0)
static const void *
-linuxdvb_mux_dvbs_class_rolloff_get ( void *o )
+dvb_mux_dvbs_class_rolloff_get ( void *o )
{
static const char *s;
- linuxdvb_mux_t *lm = o;
+ dvb_mux_t *lm = o;
s = dvb_rolloff2str(lm->lm_tuning.dmc_fe_rolloff);
return &s;
}
+
static int
-linuxdvb_mux_dvbs_class_rolloff_set ( void *o, const void *s )
+dvb_mux_dvbs_class_rolloff_set ( void *o, const void *s )
{
- linuxdvb_mux_t *lm = o;
+ dvb_mux_t *lm = o;
lm->lm_tuning.dmc_fe_rolloff = dvb_str2rolloff(s);
return 1;
}
+
static htsmsg_t *
-linuxdvb_mux_dvbs_class_rolloff_list ( void *o )
+dvb_mux_dvbs_class_rolloff_list ( void *o )
{
htsmsg_t *list = htsmsg_create_list();
htsmsg_add_str(list, NULL, dvb_rolloff2str(DVB_ROLLOFF_35));
}
static const void *
-linuxdvb_mux_dvbs_class_pilot_get ( void *o )
+dvb_mux_dvbs_class_pilot_get ( void *o )
{
static const char *s;
- linuxdvb_mux_t *lm = o;
+ dvb_mux_t *lm = o;
s = dvb_pilot2str(lm->lm_tuning.dmc_fe_pilot);
return &s;
}
+
static int
-linuxdvb_mux_dvbs_class_pilot_set ( void *o, const void *s )
+dvb_mux_dvbs_class_pilot_set ( void *o, const void *s )
{
- linuxdvb_mux_t *lm = o;
+ dvb_mux_t *lm = o;
lm->lm_tuning.dmc_fe_pilot = dvb_str2pilot(s);
return 1;
}
static htsmsg_t *
-linuxdvb_mux_dvbs_class_pilot_list ( void *o )
+dvb_mux_dvbs_class_pilot_list ( void *o )
{
htsmsg_t *list = htsmsg_create_list();
htsmsg_add_str(list, NULL, dvb_pilot2str(DVB_PILOT_AUTO));
htsmsg_add_str(list, NULL, dvb_pilot2str(DVB_PILOT_OFF));
return list;
}
-#endif
-#define linuxdvb_mux_dvbs_class_delsys_get linuxdvb_mux_class_delsys_get
-#define linuxdvb_mux_dvbs_class_delsys_set linuxdvb_mux_class_delsys_set
+#define dvb_mux_dvbs_class_delsys_get dvb_mux_class_delsys_get
+#define dvb_mux_dvbs_class_delsys_set dvb_mux_class_delsys_set
+
static htsmsg_t *
-linuxdvb_mux_dvbs_class_delsys_enum (void *o)
+dvb_mux_dvbs_class_delsys_enum (void *o)
{
htsmsg_t *list = htsmsg_create_list();
htsmsg_add_str(list, NULL, dvb_delsys2str(DVB_SYS_DVBS));
}
static const void *
-linuxdvb_mux_dvbs_class_orbital_get ( void *o )
+dvb_mux_dvbs_class_orbital_get ( void *o )
{
static char buf[256], *s = buf;
- linuxdvb_mux_t *lm = o;
+ dvb_mux_t *lm = o;
snprintf(buf, sizeof(buf), "%0.1f%c",
lm->lm_tuning.u.dmc_fe_qpsk.orbital_pos / 10.0,
lm->lm_tuning.u.dmc_fe_qpsk.orbital_dir);
}
static int
-linuxdvb_mux_dvbs_class_orbital_set ( void *o, const void *s )
+dvb_mux_dvbs_class_orbital_set ( void *o, const void *s )
{
int pos, save = 0;
char dir;
char *tmp = tvh_strdupa(s);
- linuxdvb_mux_t *lm = o;
+ dvb_mux_t *lm = o;
dir = tmp[strlen(tmp)-1];
tmp[strlen(tmp)-1] = '\0';
return save;
}
-const idclass_t linuxdvb_mux_dvbs_class =
+const idclass_t dvb_mux_dvbs_class =
{
- .ic_super = &linuxdvb_mux_class,
- .ic_class = "linuxdvb_mux_dvbs",
+ .ic_super = &dvb_mux_class,
+ .ic_class = "dvb_mux_dvbs",
.ic_caption = "Linux DVB-S Multiplex",
.ic_properties = (const property_t[]){
{
.id = "frequency",
.name = "Frequency (kHz)",
.opts = PO_WRONCE,
- .off = offsetof(linuxdvb_mux_t, lm_tuning.dmc_fe_freq),
+ .off = offsetof(dvb_mux_t, lm_tuning.dmc_fe_freq),
},
{
.type = PT_U32,
.id = "symbolrate",
.name = "Symbol Rate (Sym/s)",
.opts = PO_WRONCE,
- .off = offsetof(linuxdvb_mux_t, lm_tuning.u.dmc_fe_qpsk.symbol_rate),
+ .off = offsetof(dvb_mux_t, lm_tuning.u.dmc_fe_qpsk.symbol_rate),
},
{
MUX_PROP_STR("polarisation", "Polarisation", dvbs, polarity, NULL)
.type = PT_STR,
.id = "modulation",
.name = "Modulation",
- .set = linuxdvb_mux_dvbs_class_modulation_set,
- .get = linuxdvb_mux_dvbs_class_modulation_get,
- .list = linuxdvb_mux_dvbs_class_modulation_list,
+ .set = dvb_mux_dvbs_class_modulation_set,
+ .get = dvb_mux_dvbs_class_modulation_get,
+ .list = dvb_mux_dvbs_class_modulation_list,
.def.s = "AUTO",
},
{
MUX_PROP_STR("fec", "FEC", dvbs, fec, "AUTO")
},
-#if DVB_VER_ATLEAST(5,0)
{
.type = PT_STR,
.id = "rolloff",
.name = "Rolloff",
- .set = linuxdvb_mux_dvbs_class_rolloff_set,
- .get = linuxdvb_mux_dvbs_class_rolloff_get,
- .list = linuxdvb_mux_dvbs_class_rolloff_list,
+ .set = dvb_mux_dvbs_class_rolloff_set,
+ .get = dvb_mux_dvbs_class_rolloff_get,
+ .list = dvb_mux_dvbs_class_rolloff_list,
.def.s = "AUTO"
},
{
.id = "pilot",
.name = "Pilot",
.opts = PO_ADVANCED,
- .set = linuxdvb_mux_dvbs_class_pilot_set,
- .get = linuxdvb_mux_dvbs_class_pilot_get,
- .list = linuxdvb_mux_dvbs_class_pilot_list,
+ .set = dvb_mux_dvbs_class_pilot_set,
+ .get = dvb_mux_dvbs_class_pilot_get,
+ .list = dvb_mux_dvbs_class_pilot_list,
},
-#endif
{
.type = PT_STR,
.id = "orbital",
.name = "Orbital Pos.",
- .set = linuxdvb_mux_dvbs_class_orbital_set,
- .get = linuxdvb_mux_dvbs_class_orbital_get,
+ .set = dvb_mux_dvbs_class_orbital_set,
+ .get = dvb_mux_dvbs_class_orbital_get,
.opts = PO_ADVANCED | PO_RDONLY
},
{}
}
};
-#define linuxdvb_mux_atsc_class_delsys_get linuxdvb_mux_class_delsys_get
-#define linuxdvb_mux_atsc_class_delsys_set linuxdvb_mux_class_delsys_set
+#define dvb_mux_atsc_class_delsys_get dvb_mux_class_delsys_get
+#define dvb_mux_atsc_class_delsys_set dvb_mux_class_delsys_set
+
static htsmsg_t *
-linuxdvb_mux_atsc_class_delsys_enum (void *o)
+dvb_mux_atsc_class_delsys_enum (void *o)
{
htsmsg_t *list = htsmsg_create_list();
-#if DVB_VER_ATLEAST(5,0)
htsmsg_add_str(list, NULL, dvb_delsys2str(DVB_SYS_ATSC));
htsmsg_add_str(list, NULL, dvb_delsys2str(DVB_SYS_ATSCMH));
-#endif
return list;
}
-linuxdvb_mux_class_R(atsc, modulation, qam,
+dvb_mux_class_R(atsc, modulation, qam,
DVB_MOD_QAM_AUTO, DVB_MOD_QAM_256, DVB_MOD_VSB_8);
-const idclass_t linuxdvb_mux_atsc_class =
+const idclass_t dvb_mux_atsc_class =
{
- .ic_super = &linuxdvb_mux_class,
- .ic_class = "linuxdvb_mux_atsc",
+ .ic_super = &dvb_mux_class,
+ .ic_class = "dvb_mux_atsc",
.ic_caption = "Linux ATSC Multiplex",
.ic_properties = (const property_t[]){
{
.id = "frequency",
.name = "Frequency (kHz)",
.opts = PO_WRONCE,
- .off = offsetof(linuxdvb_mux_t, lm_tuning.dmc_fe_freq),
+ .off = offsetof(dvb_mux_t, lm_tuning.dmc_fe_freq),
},
{
MUX_PROP_STR("modulation", "Modulation", atsc, qam, "AUTO")
* *************************************************************************/
static void
-linuxdvb_mux_config_save ( mpegts_mux_t *mm )
+dvb_mux_config_save ( mpegts_mux_t *mm )
{
htsmsg_t *c = htsmsg_create_map();
mpegts_mux_save(mm, c);
- hts_settings_save(c, "input/linuxdvb/networks/%s/muxes/%s/config",
+ hts_settings_save(c, "input/dvb/networks/%s/muxes/%s/config",
idnode_uuid_as_str(&mm->mm_network->mn_id),
idnode_uuid_as_str(&mm->mm_id));
htsmsg_destroy(c);
}
static void
-linuxdvb_mux_display_name ( mpegts_mux_t *mm, char *buf, size_t len )
+dvb_mux_display_name ( mpegts_mux_t *mm, char *buf, size_t len )
{
- linuxdvb_mux_t *lm = (linuxdvb_mux_t*)mm;
+ dvb_mux_t *lm = (dvb_mux_t*)mm;
dvb_network_t *ln = (dvb_network_t*)mm->mm_network;
uint32_t freq = lm->lm_tuning.dmc_fe_freq;
char pol[2] = { 0 };
}
static void
-linuxdvb_mux_create_instances ( mpegts_mux_t *mm )
+dvb_mux_create_instances ( mpegts_mux_t *mm )
{
mpegts_network_link_t *mnl;
LIST_FOREACH(mnl, &mm->mm_network->mn_inputs, mnl_mn_link) {
}
static void
-linuxdvb_mux_delete ( mpegts_mux_t *mm, int delconf )
+dvb_mux_delete ( mpegts_mux_t *mm, int delconf )
{
/* Remove config */
if (delconf)
- hts_settings_remove("input/linuxdvb/networks/%s/muxes/%s",
+ hts_settings_remove("input/dvb/networks/%s/muxes/%s",
idnode_uuid_as_str(&mm->mm_network->mn_id),
idnode_uuid_as_str(&mm->mm_id));
* Creation/Config
* *************************************************************************/
-linuxdvb_mux_t *
-linuxdvb_mux_create0
+dvb_mux_t *
+dvb_mux_create0
( dvb_network_t *ln,
uint16_t onid, uint16_t tsid, const dvb_mux_conf_t *dmc,
const char *uuid, htsmsg_t *conf )
{
const idclass_t *idc;
mpegts_mux_t *mm;
- linuxdvb_mux_t *lm;
+ dvb_mux_t *lm;
htsmsg_t *c, *e;
htsmsg_field_t *f;
mpegts_service_t *ts;
/* Class */
if (ln->ln_type == DVB_TYPE_S)
- idc = &linuxdvb_mux_dvbs_class;
+ idc = &dvb_mux_dvbs_class;
else if (ln->ln_type == DVB_TYPE_C)
- idc = &linuxdvb_mux_dvbc_class;
+ idc = &dvb_mux_dvbc_class;
else if (ln->ln_type == DVB_TYPE_T)
- idc = &linuxdvb_mux_dvbt_class;
+ idc = &dvb_mux_dvbt_class;
else if (ln->ln_type == DVB_TYPE_ATSC)
- idc = &linuxdvb_mux_atsc_class;
+ idc = &dvb_mux_atsc_class;
else {
- tvherror("linuxdvb", "unknown FE type %d", ln->ln_type);
+ tvherror("dvb", "unknown FE type %d", ln->ln_type);
return NULL;
}
/* Create */
- if (!(mm = mpegts_mux_create0(calloc(1, sizeof(linuxdvb_mux_t)), idc, uuid,
+ if (!(mm = mpegts_mux_create0(calloc(1, sizeof(dvb_mux_t)), idc, uuid,
(mpegts_network_t*)ln, onid, tsid, conf)))
return NULL;
- lm = (linuxdvb_mux_t*)mm;
+ lm = (dvb_mux_t*)mm;
lm->lm_tuning.dmc_fe_type = ln->ln_type;
/* Tuning */
}
/* Callbacks */
- lm->mm_delete = linuxdvb_mux_delete;
- lm->mm_display_name = linuxdvb_mux_display_name;
- lm->mm_config_save = linuxdvb_mux_config_save;
- lm->mm_create_instances = linuxdvb_mux_create_instances;
+ lm->mm_delete = dvb_mux_delete;
+ lm->mm_display_name = dvb_mux_display_name;
+ lm->mm_config_save = dvb_mux_config_save;
+ lm->mm_create_instances = dvb_mux_create_instances;
/* Defaults */
if (dmc == NULL) {
lm->lm_tuning.dmc_fe_inversion = DVB_INVERSION_AUTO;
-#if DVB_VER_ATLEAST(5,0)
lm->lm_tuning.dmc_fe_pilot = DVB_PILOT_AUTO;
-#endif
}
/* No config */
projects / thirdparty / tvheadend.git / commitdiff
