From 32a3a8e4d2269e2aeb55f8c1dda087b3f0605090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Tue, 17 Nov 2009 22:00:23 +0000 Subject: [PATCH] ifdef'ery for DVB_API_VERSION >= 5 --- src/dvb/dvb_adapter.c | 4 ++++ src/dvb/dvb_multiplex.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/dvb/dvb_adapter.c b/src/dvb/dvb_adapter.c index 0f9e7894..52f2b876 100644 --- a/src/dvb/dvb_adapter.c +++ b/src/dvb/dvb_adapter.c @@ -551,9 +551,11 @@ dvb_fe_opts(th_dvb_adapter_t *tda, const char *which) 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 DVB_API_VERSION >= 5 fe_opts_add(a, "PSK_8", PSK_8); fe_opts_add(a, "APSK_16", APSK_16); fe_opts_add(a, "APSK_32", APSK_32); +#endif } 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); @@ -563,6 +565,7 @@ dvb_fe_opts(th_dvb_adapter_t *tda, const char *which) return a; } +#if DVB_API_VERSION >= 5 if(!strcmp(which, "delsys")) { if(c & FE_CAN_QPSK) { fe_opts_add(a, "SYS_DVBS", SYS_DVBS); @@ -571,6 +574,7 @@ dvb_fe_opts(th_dvb_adapter_t *tda, const char *which) fe_opts_add(a, "SYS_UNDEFINED", SYS_UNDEFINED); return a; } +#endif if(!strcmp(which, "transmissionmodes")) { if(c & FE_CAN_TRANSMISSION_MODE_AUTO) diff --git a/src/dvb/dvb_multiplex.c b/src/dvb/dvb_multiplex.c index a41ca62b..d8267914 100644 --- a/src/dvb/dvb_multiplex.c +++ b/src/dvb/dvb_multiplex.c @@ -785,9 +785,13 @@ dvb_mux_modulation(char *buf, size_t size, th_dvb_mux_instance_t *tdmi) break; case FE_QPSK: +#if DVB_API_VERSION >= 5 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)); +#else + snprintf(buf, size, "%d kBaud", f->u.qpsk.symbol_rate / 1000); +#endif break; case FE_QAM: @@ -932,16 +936,19 @@ dvb_mux_add_by_params(th_dvb_adapter_t *tda, if(!val2str(polarisation, poltab)) return "Invalid polarisation"; + dmc.dmc_fe_params.u.qpsk.symbol_rate = symrate; + dmc.dmc_fe_params.u.qpsk.fec_inner = fec; + +#if DVB_API_VERSION >= 5 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; +#endif break; case FE_ATSC: