dvb: fix ENABLE_MPEGTS_DVB for dvb/orbitalpos/list, fixes #2683

tvheadend · Feb 17, 2015 · b826a77 · b826a77
1 parent 496e4b1
commit b826a77
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/api/api_mpegts.c b/src/api/api_mpegts.c
@@ -327,6 +327,7 @@ api_mpegts_mux_sched_create
   return err;
 }
 
+#if ENABLE_MPEGTS_DVB
 static int
 api_dvb_orbitalpos_list
   ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
@@ -361,7 +362,7 @@ api_dvb_orbitalpos_list
 
   return 0;
 }
-
+#endif
 
 #if ENABLE_MPEGTS_DVB
 static int
@@ -439,8 +440,8 @@ api_mpegts_init ( void )
     { "mpegts/mux_sched/class",    ACCESS_ADMIN, api_idnode_class, (void*)&mpegts_mux_sched_class },
     { "mpegts/mux_sched/grid",     ACCESS_ADMIN, api_idnode_grid, api_mpegts_mux_sched_grid },
     { "mpegts/mux_sched/create",   ACCESS_ADMIN, api_mpegts_mux_sched_create, NULL },
-    { "dvb/orbitalpos/list",       ACCESS_ADMIN, api_dvb_orbitalpos_list, NULL },
 #if ENABLE_MPEGTS_DVB
+    { "dvb/orbitalpos/list",       ACCESS_ADMIN, api_dvb_orbitalpos_list, NULL },
     { "dvb/scanfile/list",         ACCESS_ADMIN, api_dvb_scanfile_list, NULL },
 #endif
     { NULL },

diff --git a/src/input/mpegts/dvb_support.c b/src/input/mpegts/dvb_support.c
@@ -441,6 +441,7 @@ dvb_convert_date(const uint8_t *dvb_buf, int local)
  */
 #if ENABLE_MPEGTS_DVB
 
+htsmsg_t *satellites;
 
 #define dvb_str2val(p)\
 const char *dvb_##p##2str (int p)         { return val2str(p, p##tab); }\
@@ -923,17 +924,19 @@ dvb_sat_position_from_str( const char *buf )
 /**
  *
  */
-htsmsg_t *satellites;
-
 void dvb_init( void )
 {
+#if ENABLE_MPEGTS_DVB
   satellites = hts_settings_load("satellites");
+#endif
 }
 
 void dvb_done( void )
 {
   extern SKEL_DECLARE(mpegts_table_state_skel, struct mpegts_table_state);
 
   SKEL_FREE(mpegts_table_state_skel);
+#if ENABLE_MPEGTS_DVB
   htsmsg_destroy(satellites);
+#endif
 }