From d9f08c99c79f1a96ed9a690f43bdd3da58664ea2 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 12 May 2015 21:07:07 +0200 Subject: [PATCH] another ENABLE_V4L removal --- src/main.c | 2 +- src/webui/extjs.c | 6 +----- src/webui/webui.h | 4 ---- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main.c b/src/main.c index 0b07e769b..51cb4b64d 100644 --- 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 index 00072677a..a4cf38c93 100644 --- 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 index 819bb6a6f..8cb200bb8 100644 --- 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 ); -- 2.47.2