another ENABLE_V4L removal

tvheadend · May 12, 2015 · d9f08c9 · d9f08c9
1 parent 812d3ab
commit d9f08c9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/src/main.c b/src/main.c
@@ -142,7 +142,7 @@ const tvh_caps_t tvheadend_capabilities[] = {
 #if ENABLE_CWC || ENABLE_CAPMT || ENABLE_CONSTCW
   { "caclient", NULL },
 #endif
-#if ENABLE_V4L || ENABLE_LINUXDVB || ENABLE_SATIP_CLIENT || ENABLE_HDHOMERUN_CLIENT
+#if ENABLE_LINUXDVB || ENABLE_SATIP_CLIENT || ENABLE_HDHOMERUN_CLIENT
   { "tvadapters", NULL },
 #endif
 #if ENABLE_SATIP_CLIENT

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
@@ -102,7 +102,7 @@ extjs_exec(htsbuf_queue_t *hq, const char *fmt, ...)
 }
 
 /**
- * PVR info, deliver info about the given PVR entry
+ * EXTJS root page
  */
 static int
 extjs_root(http_connection_t *hc, const char *remain, void *opaque)
@@ -799,8 +799,4 @@ extjs_start(void)
   http_path_add("/timeshift",        NULL, extjs_timeshift,        ACCESS_ADMIN);
 #endif
   http_path_add("/tvhlog",           NULL, extjs_tvhlog,           ACCESS_ADMIN);
-
-#if ENABLE_V4L
-  extjs_start_v4l();
-#endif
 }
diff --git a/src/webui/webui.h b/src/webui/webui.h
@@ -39,10 +39,6 @@ int page_static_file(http_connection_t *hc, const char *remain, void *opaque);
 void extjs_start_dvb(void);
 #endif
 
-#if ENABLE_V4L
-void extjs_start_v4l(void);
-#endif
-
 void webui_api_init ( void );