]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
wizard: another code shuffling to make --disable-iptv work, fixes #3521
authorJaroslav Kysela <perex@perex.cz>
Mon, 1 Feb 2016 20:57:10 +0000 (21:57 +0100)
committerJaroslav Kysela <perex@perex.cz>
Mon, 1 Feb 2016 20:57:10 +0000 (21:57 +0100)
src/wizard.c

index 01051135b45486d99b434ff5283d48cd267fa45e..768c5a88426ab82811ce8b75ae0a1336c260fd55 100644 (file)
@@ -840,7 +840,19 @@ static htsmsg_t *muxes_get_list##num(void *o, const char *lang) \
   wizard_muxes_t *w = p->aux; \
   mpegts_network_t *mn = mpegts_network_find(w->networkid[num-1]); \
   return mn ? dvb_network_class_scanfile_list(mn, lang) : NULL; \
-} \
+}
+
+
+MUXES_FCN(1)
+MUXES_FCN(2)
+MUXES_FCN(3)
+MUXES_FCN(4)
+MUXES_FCN(5)
+MUXES_FCN(6)
+
+#if ENABLE_IPTV
+
+#define MUXES_IPTV_FCN(num) \
 static const void *muxes_get_iptv_value##num(void *o) \
 { \
   wizard_page_t *p = o; \
@@ -856,12 +868,14 @@ static int muxes_set_iptv_value##num(void *o, const void *v) \
   return 1; \
 }
 
-MUXES_FCN(1)
-MUXES_FCN(2)
-MUXES_FCN(3)
-MUXES_FCN(4)
-MUXES_FCN(5)
-MUXES_FCN(6)
+MUXES_IPTV_FCN(1)
+MUXES_IPTV_FCN(2)
+MUXES_IPTV_FCN(3)
+MUXES_IPTV_FCN(4)
+MUXES_IPTV_FCN(5)
+MUXES_IPTV_FCN(6)
+
+#endif
 
 DESCRIPTION_FCN(muxes, N_("\
 Assign predefined muxes to networks.\