http: add interpretation of "X-Forwarded-For" header

This allows to use the builtin ACL when serving TVH behind a SSL reverse
proxy.

.doozer.json

@@ -0,0 +1,90 @@
+{
+  "targets": {
+
+    "precise-amd64": {
+      "buildenv": "precise-amd64",
+      "builddeps": [
+        "git",
+        "build-essential",
+        "pkg-config",
+        "libavahi-client-dev",
+        "libssl-dev",
+        "zlib1g-dev",
+        "wget",
+        "bzip2",
+        "git-core",
+        "liburiparser-dev"
+      ],
+
+      "buildcmd": [
+        "./configure --disable-dvbscan --enable-libffmpeg_static --enable-hdhomerun_static",
+        "make -j ${PARALLEL}"
+      ]
+    },
+
+    "precise-i386": {
+      "buildenv": "precise-i386",
+      "builddeps": [
+        "git",
+        "build-essential",
+        "pkg-config",
+        "libavahi-client-dev",
+        "libssl-dev",
+        "zlib1g-dev",
+        "wget",
+        "bzip2",
+        "git-core",
+        "liburiparser-dev",
+	"libx264-dev"
+      ],
+
+      "buildcmd": [
+        "./configure --disable-dvbscan --enable-libffmpeg_static --disable-libffmpeg_static_x264 --enable-hdhomerun_static",
+        "make -j ${PARALLEL}"
+      ]
+    },
+
+    "trusty-amd64": {
+      "buildenv": "trusty-amd64",
+      "builddeps": [
+        "git",
+        "build-essential",
+        "pkg-config",
+        "libavahi-client-dev",
+        "libssl-dev",
+        "zlib1g-dev",
+        "wget",
+        "bzip2",
+        "git-core",
+        "liburiparser-dev"
+      ],
+
+      "buildcmd": [
+        "./configure --disable-dvbscan --enable-libffmpeg_static --enable-hdhomerun_static",
+        "make -j ${PARALLEL}"
+      ]
+    },
+
+    "trusty-i386": {
+      "buildenv": "trusty-i386",
+      "builddeps": [
+        "git",
+        "build-essential",
+        "pkg-config",
+        "libavahi-client-dev",
+        "libssl-dev",
+        "zlib1g-dev",
+        "wget",
+        "bzip2",
+        "git-core",
+        "liburiparser-dev",
+	"libx264-dev"
+      ],
+
+      "buildcmd": [
+        "./configure --disable-dvbscan --enable-libffmpeg_static --disable-libffmpeg_static_x264 --enable-hdhomerun_static",
+        "make -j ${PARALLEL}"
+      ]
+    }
+  }
+}

.gitignore

@@ -5,8 +5,11 @@ src/version.c
 
 data/dvb-scan
 
+libav_static
+
 .cproject
 .project
+nbproject
 .settings
 
 *.pyc
@@ -19,3 +22,15 @@ debian/tvheadend
 debian/tvheadend-dbg
 debian/tvheadend*substvars
 debian/tvheadend*.debhelper*
+
+rpm/tvheadend.spec
+rpm/test.patch
+
+#############
+###Windows###
+#############
+
+#windows image file cache
+Thumbs.db
+#Folder config file
+Desktop.ini

Makefile

@@ -27,21 +27,27 @@ PROG    := $(BUILDDIR)/tvheadend
 # Common compiler flags
 #
 
-CFLAGS  += -g -O2
+CFLAGS  += -g -O2 -Wunused-result
 CFLAGS  += -Wall -Werror -Wwrite-strings -Wno-deprecated-declarations
 CFLAGS  += -Wmissing-prototypes
 CFLAGS  += -fms-extensions -funsigned-char -fno-strict-aliasing
 CFLAGS  += -D_FILE_OFFSET_BITS=64
 CFLAGS  += -I${BUILDDIR} -I${ROOTDIR}/src -I${ROOTDIR}
+ifeq ($(CONFIG_ANDROID),yes)
+LDFLAGS += -ldl -lm
+else
 LDFLAGS += -ldl -lpthread -lm
+endif
 ifeq ($(CONFIG_LIBICONV),yes)
 LDFLAGS += -liconv
 endif
 ifeq ($(PLATFORM), darwin)
 LDFLAGS += -framework CoreServices
 else
+ifeq ($(CONFIG_ANDROID),no)
 LDFLAGS += -lrt
 endif
+endif
 
 ifeq ($(COMPILER), clang)
 CFLAGS  += -Wno-microsoft -Qunused-arguments -Wno-unused-function
@@ -49,6 +55,20 @@ CFLAGS  += -Wno-unused-value -Wno-tautological-constant-out-of-range-compare
 CFLAGS  += -Wno-parentheses-equality -Wno-incompatible-pointer-types
 endif
 
+ifeq ($(CONFIG_LIBFFMPEG_STATIC),yes)
+CFLAGS  += -I${ROOTDIR}/libav_static/build/ffmpeg/include
+LDFLAGS += -L${ROOTDIR}/libav_static/build/ffmpeg/lib -Wl,-Bstatic \
+           -lavresample -lswresample -lswscale \
+           -lavutil -lavformat -lavcodec -lavutil \
+           -lvorbisenc -lvorbis -logg -lx264 -lvpx \
+           -Wl,-Bdynamic -ldl
+endif
+ifeq ($(CONFIG_HDHOMERUN_STATIC),yes)
+CFLAGS  += -I${ROOTDIR}/libhdhomerun_static
+LDFLAGS += -L${ROOTDIR}/libhdhomerun_static/libhdhomerun \
+           -Wl,-Bstatic -lhdhomerun -Wl,-Bdynamic
+endif
+
 vpath %.c $(ROOTDIR)
 vpath %.h $(ROOTDIR)
 
@@ -89,7 +109,6 @@ SRCS =  src/version.c \
 	src/utils.c \
 	src/wrappers.c \
 	src/access.c \
-	src/dtable.c \
 	src/tcp.c \
 	src/udp.c \
 	src/url.c \
@@ -117,7 +136,7 @@ SRCS =  src/version.c \
 	src/trap.c \
 	src/avg.c \
 	src/htsstr.c \
-  src/tvhpoll.c \
+        src/tvhpoll.c \
 	src/huffman.c \
 	src/filebundle.c \
 	src/config.c \
@@ -132,11 +151,20 @@ SRCS =  src/version.c \
 	src/fsmonitor.c \
 	src/cron.c \
 	src/esfilter.c \
-	src/intlconv.c
+	src/intlconv.c \
+	src/profile.c \
+	src/bouquet.c \
+	src/lock.c
 
 SRCS-${CONFIG_UPNP} += \
 	src/upnp.c
 
+# SATIP Server
+SRCS-${CONFIG_SATIP_SERVER} += \
+	src/satip/server.c \
+	src/satip/rtsp.c \
+	src/satip/rtp.c
+
 SRCS += \
 	src/api.c \
 	src/api/api_status.c \
@@ -149,7 +177,12 @@ SRCS += \
 	src/api/api_epggrab.c \
 	src/api/api_imagecache.c \
 	src/api/api_esfilter.c \
-	src/api/api_intlconv.c
+	src/api/api_intlconv.c \
+	src/api/api_access.c \
+	src/api/api_dvr.c \
+	src/api/api_caclient.c \
+	src/api/api_profile.c \
+	src/api/api_bouquet.c
 
 SRCS += \
 	src/parsers/parsers.c \
@@ -170,6 +203,8 @@ SRCS += src/plumbing/tsfix.c \
 SRCS += src/dvr/dvr_db.c \
 	src/dvr/dvr_rec.c \
 	src/dvr/dvr_autorec.c \
+	src/dvr/dvr_timerec.c \
+	src/dvr/dvr_config.c \
 	src/dvr/dvr_cutpoints.c \
 
 SRCS += src/webui/webui.c \
@@ -190,11 +225,15 @@ SRCS += src/muxer.c \
 # Optional code
 #
 
-# MPEGTS core
+# MPEGTS core, order by usage (psi lib, tsdemux)
 SRCS-$(CONFIG_MPEGTS) += \
 	src/descrambler/descrambler.c \
+	src/descrambler/caclient.c \
 	src/input/mpegts.c \
+	src/input/mpegts/mpegts_pid.c \
 	src/input/mpegts/mpegts_input.c \
+	src/input/mpegts/tsdemux.c \
+	src/input/mpegts/dvb_psi_lib.c \
 	src/input/mpegts/mpegts_network.c \
 	src/input/mpegts/mpegts_mux.c \
 	src/input/mpegts/mpegts_service.c \
@@ -202,9 +241,9 @@ SRCS-$(CONFIG_MPEGTS) += \
 	src/input/mpegts/dvb_support.c \
 	src/input/mpegts/dvb_charset.c \
 	src/input/mpegts/dvb_psi.c \
-	src/input/mpegts/tsdemux.c \
+	src/input/mpegts/fastscan.c \
 	src/input/mpegts/mpegts_mux_sched.c \
-  src/input/mpegts/mpegts_network_scan.c \
+        src/input/mpegts/mpegts_network_scan.c
 
 # MPEGTS DVB
 SRCS-${CONFIG_MPEGTS_DVB} += \
@@ -230,13 +269,19 @@ SRCS-${CONFIG_LINUXDVB} += \
         src/input/mpegts/linuxdvb/linuxdvb_rotor.c \
         src/input/mpegts/linuxdvb/linuxdvb_en50494.c
 
-# SATIP
+# SATIP Client
 SRCS-${CONFIG_SATIP_CLIENT} += \
 	src/input/mpegts/satip/satip.c \
 	src/input/mpegts/satip/satip_frontend.c \
 	src/input/mpegts/satip/satip_satconf.c \
 	src/input/mpegts/satip/satip_rtsp.c
 
+# HDHOMERUN
+SRCS_HDHOMERUN = \
+        src/input/mpegts/tvhdhomerun/tvhdhomerun.c \
+        src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
+SRCS-${CONFIG_HDHOMERUN_CLIENT} += $(SRCS_HDHOMERUN)
+
 # IPTV
 SRCS-${CONFIG_IPTV} += \
 	src/input/mpegts/iptv/iptv.c \
@@ -244,6 +289,8 @@ SRCS-${CONFIG_IPTV} += \
         src/input/mpegts/iptv/iptv_service.c \
         src/input/mpegts/iptv/iptv_http.c \
         src/input/mpegts/iptv/iptv_udp.c \
+        src/input/mpegts/iptv/iptv_rtsp.c \
+        src/input/mpegts/iptv/iptv_pipe.c
 
 # TSfile
 SRCS-$(CONFIG_TSFILE) += \
@@ -269,9 +316,11 @@ SRCS-$(CONFIG_AVAHI) += src/avahi.c
 SRCS-$(CONFIG_BONJOUR) += src/bonjour.c
 
 # libav
-SRCS-$(CONFIG_LIBAV) += src/libav.c \
+SRCS_LIBAV = \
+	src/libav.c \
 	src/muxer/muxer_libav.c \
-	src/plumbing/transcoding.c \
+	src/plumbing/transcoding.c
+SRCS-$(CONFIG_LIBAV) += $(SRCS_LIBAV)
 
 # Tvhcsa
 SRCS-${CONFIG_TVHCSA} += \
@@ -285,10 +334,24 @@ SRCS-${CONFIG_CWC} += \
 SRCS-${CONFIG_CAPMT} += \
 	src/descrambler/capmt.c
 
+# CONSTCW
+SRCS-${CONFIG_CONSTCW} += \
+	src/descrambler/constcw.c
+
+# DVB CAM
+SRCS-${CONFIG_LINUXDVB_CA} += \
+	src/input/mpegts/linuxdvb/linuxdvb_ca.c \
+	src/descrambler/dvbcam.c
+
+# TSDEBUGCW
+SRCS-${CONFIG_TSDEBUG} += \
+	src/descrambler/tsdebugcw.c
+
 # FFdecsa
 ifneq ($(CONFIG_DVBCSA),yes)
-FFDECSA-$(CONFIG_CAPMT) = yes
-FFDECSA-$(CONFIG_CWC)   = yes
+FFDECSA-$(CONFIG_CAPMT)   = yes
+FFDECSA-$(CONFIG_CWC)     = yes
+FFDECSA-$(CONFIG_CONSTCW) = yes
 endif
 
 ifeq ($(FFDECSA-yes),yes)
@@ -300,6 +363,12 @@ ${BUILDDIR}/src/descrambler/ffdecsa/ffdecsa_mmx.o  : CFLAGS += -mmmx
 ${BUILDDIR}/src/descrambler/ffdecsa/ffdecsa_sse2.o : CFLAGS += -msse2
 endif
 
+# libaesdec
+SRCS-${CONFIG_SSL} += src/descrambler/libaesdec/libaesdec.c
+
+# DBUS
+SRCS-${CONFIG_DBUS_1}  += src/dbus.c
+
 # File bundles
 SRCS-${CONFIG_BUNDLE}     += bundle.c
 BUNDLES-yes               += docs/html docs/docresources src/webui/static
@@ -323,6 +392,13 @@ OBJS       = $(SRCS:%.c=$(BUILDDIR)/%.o)
 OBJS_EXTRA = $(SRCS_EXTRA:%.c=$(BUILDDIR)/%.so)
 DEPS       = ${OBJS:%.o=%.d}
 
+ifeq ($(CONFIG_LIBFFMPEG_STATIC),yes)
+DEPS      += ${BUILDDIR}/libffmpeg_stamp
+endif
+ifeq ($(CONFIG_HDHOMERUN_STATIC),yes)
+DEPS      += ${BUILDDIR}/libhdhomerun_stamp
+endif
+
 #
 # Build Rules
 #
@@ -363,6 +439,8 @@ clean:
 	find . -name "*~" | xargs rm -f
 
 distclean: clean
+	rm -rf ${ROOTDIR}/libav_static
+	rm -rf ${ROOTDIR}/libhdhomerun_static
 	rm -rf ${ROOTDIR}/build.*
 	rm -f ${ROOTDIR}/.config.mk
 
@@ -383,16 +461,43 @@ $(BUILDDIR)/bundle.o: $(BUILDDIR)/bundle.c
 	@mkdir -p $(dir $@)
 	$(CC) -I${ROOTDIR}/src -c -o $@ $<
 
-$(BUILDDIR)/bundle.c:
+$(BUILDDIR)/bundle.c: check_dvb_scan
 	@mkdir -p $(dir $@)
 	$(MKBUNDLE) -o $@ -d ${BUILDDIR}/bundle.d $(BUNDLE_FLAGS) $(BUNDLES:%=$(ROOTDIR)/%)
 
+# Static FFMPEG
+
+ifeq ($(CONFIG_LIBFFMPEG_STATIC),yes)
+${ROOTDIR}/src/libav.h: ${BUILDDIR}/libffmpeg_stamp
+${SRCS_LIBAV}: ${BUILDDIR}/libffmpeg_stamp
+endif
+
+${BUILDDIR}/libffmpeg_stamp: ${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a
+	@touch $@
+
+${ROOTDIR}/libav_static/build/ffmpeg/lib/libavcodec.a:
+	CONFIG_LIBFFMPEG_STATIC_X264=$(CONFIG_LIBFFMPEG_STATIC_X264) \
+	  $(MAKE) -f Makefile.ffmpeg build
+
+# Static HDHOMERUN library
+
+ifeq ($(CONFIG_LIBHDHOMERUN_STATIC),yes)
+${ROOTDIR}/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h: ${BUILDDIR}/libhdhomerun_stamp
+${SRCS_HDHOMERUN}: ${BUILDDIR}/libhdhomerun_stamp
+endif
+
+${BUILDDIR}/libhdhomerun_stamp: ${ROOTDIR}/libhdhomerun_static/libhdhomerun/libhdhomerun.a
+	@touch $@
+
+${ROOTDIR}/libhdhomerun_static/libhdhomerun/libhdhomerun.a:
+	$(MAKE) -f Makefile.hdhomerun build
+
 # linuxdvb git tree
 $(ROOTDIR)/data/dvb-scan/.stamp:
 	@echo "Receiving data/dvb-scan/dvb-t from http://linuxtv.org/git/dtv-scan-tables.git"
 	@rm -rf $(ROOTDIR)/data/dvb-scan/*
 	@$(ROOTDIR)/support/getmuxlist $(ROOTDIR)/data/dvb-scan
-	@touch $(ROOTDIR)/data/dvb-scan/.stamp
+	@touch $@
 
 .PHONY: check_dvb_scan
 check_dvb_scan: $(ROOTDIR)/data/dvb-scan/.stamp

Makefile.ffmpeg

@@ -0,0 +1,248 @@
+#
+#  Static Audio/Video libs (ffmpeg version) build
+#  Copyright (C) 2014 Jaroslav Kysela
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+include $(dir $(lastword $(MAKEFILE_LIST))).config.mk
+
+unexport CFLAGS
+unexport LDFLAGS
+
+define DOWNLOAD
+	@mkdir -p $(LIBAVDIR)/build
+	if test -z "$${TVHEADEND_FILE_CACHE}"; then \
+          wget --no-verbose -O $(2) $(1); \
+        else \
+          file=$$(basename $(2)); \
+          cp "$$TVHEADEND_FILE_CACHE/$$(file)" $(2); \
+        fi
+	@{ \
+	  sum=$$(sha1sum $(2) | cut -d ' ' -f 1); \
+	  printf "SHA1SUM test '$${sum}' == '$(3)': "; \
+	  test "y$${sum}" = "y$(3)"; \
+	}
+	@echo "OK"
+endef
+
+define UNTAR
+	tar x -C $(LIBAVDIR) -$(2)f $(LIBAVDIR)/$(1)
+endef
+
+LIBAVDIR = $(ROOTDIR)/libav_static
+
+export PATH := $(LIBAVDIR)/build/ffmpeg/bin:$(PATH)
+
+ECFLAGS         = -I$(LIBAVDIR)/build/ffmpeg/include
+ELIBS           = -L$(LIBAVDIR)/build/ffmpeg/lib -ldl
+
+CONFIGURE        = PKG_CONFIG=/tmp/nobin/pkg-config ./configure
+
+FFMPEG          = ffmpeg-2.6.2
+FFMPEG_TB       = $(FFMPEG).tar.bz2
+FFMPEG_URL      = http://ffmpeg.org/releases/$(FFMPEG_TB)
+FFMPEG_SHA1     = 65470c9b967485f72f81758a7bad44cf7a1763db
+
+EXTLIBS         = libx264 libvorbis libvpx
+COMPONENTS      = avutil avformat avcodec swresample swscale avresample
+DECODERS        = mpeg2video mp2 ac3 eac3 h264 h264_vdpau aac aac_latm vorbis libvorbis
+ENCODERS        = mpeg2video mp2 libx264 libvpx_vp8 libvpx_vp9 aac libaacplus vorbis libvorbis
+MUXERS          = mpegts mpeg2dvd matroska webm
+BSFS            = h264_mp4toannexb
+
+LIBOGG          = libogg-1.3.2
+LIBOGG_TB       = $(LIBOGG).tar.gz
+LIBOGG_URL      = http://downloads.xiph.org/releases/ogg/$(LIBOGG_TB)
+LIBOGG_SHA1     = df7f3977bbeda67306bc2a427257dd7375319d7d
+
+LIBVORBIS       = libvorbis-1.3.4
+LIBVORBIS_TB    = $(LIBVORBIS).tar.gz
+LIBVORBIS_URL   = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS_TB)
+LIBVORBIS_SHA1  = 1602716c187593ffe4302124535240cec2079df3
+
+LIBX264         = x264-snapshot-20141218-2245
+LIBX264_TB      = $(LIBX264).tar.bz2
+LIBX264_URL     = http://ftp.via.ecp.fr/pub/videolan/x264/snapshots/$(LIBX264_TB)
+LIBX264_SHA1    = 24a3b20e2c49a112e40df9f64885cbd81250298a
+
+LIBVPX          = libvpx-v1.3.0
+LIBVPX_TB       = $(LIBVPX).tar.bz2
+LIBVPX_URL      = https://webm.googlecode.com/files/$(LIBVPX_TB)
+LIBVPX_SHA1     = 191b95817aede8c136cc3f3745fb1b8c50e6d5dc
+
+YASM            = yasm-1.3.0
+YASM_TB         = $(YASM).tar.gz
+YASM_URL        = http://www.tortall.net/projects/yasm/releases/$(YASM_TB)
+YASM_SHA1       = b7574e9f0826bedef975d64d3825f75fbaeef55e
+
+.PHONY: build
+build: $(LIBAVDIR)/$(FFMPEG)/.tvh_build
+
+#
+# YASM
+#
+
+$(LIBAVDIR)/$(YASM)/.tvh_download:
+	$(call DOWNLOAD,$(YASM_URL),$(LIBAVDIR)/$(YASM_TB),$(YASM_SHA1))
+	$(call UNTAR,$(YASM_TB),z)
+	@touch $@
+
+$(LIBAVDIR)/$(YASM)/.tvh_build: \
+		$(LIBAVDIR)/$(YASM)/.tvh_download
+	cd $(LIBAVDIR)/$(YASM) && $(CONFIGURE) \
+                --prefix=/ffmpeg
+	DESTDIR=$(LIBAVDIR)/build \
+		$(MAKE) -C $(LIBAVDIR)/$(YASM) install
+	@touch $@
+
+#
+# libogg & libvorbis
+#
+
+$(LIBAVDIR)/$(LIBOGG)/.tvh_download:
+	$(call DOWNLOAD,$(LIBOGG_URL),$(LIBAVDIR)/$(LIBOGG_TB),$(LIBOGG_SHA1))
+	$(call UNTAR,$(LIBOGG_TB),z)
+	@touch $@
+
+$(LIBAVDIR)/$(LIBOGG)/.tvh_build: \
+		$(LIBAVDIR)/$(YASM)/.tvh_build \
+		$(LIBAVDIR)/$(LIBOGG)/.tvh_download
+	cd $(LIBAVDIR)/$(LIBOGG) && $(CONFIGURE) \
+                --prefix=/ffmpeg \
+		--enable-static \
+		--disable-shared
+	DESTDIR=$(LIBAVDIR)/build \
+		$(MAKE) -C $(LIBAVDIR)/$(LIBOGG) install
+	@touch $@
+
+$(LIBAVDIR)/$(LIBVORBIS)/.tvh_download: \
+		$(LIBAVDIR)/$(LIBOGG)/.tvh_download
+	$(call DOWNLOAD,$(LIBVORBIS_URL),$(LIBAVDIR)/$(LIBVORBIS_TB),$(LIBVORBIS_SHA1))
+	$(call UNTAR,$(LIBVORBIS_TB),z)
+	@touch $@
+
+$(LIBAVDIR)/$(LIBVORBIS)/.tvh_build: \
+		$(LIBAVDIR)/$(LIBVORBIS)/.tvh_download \
+		$(LIBAVDIR)/$(YASM)/.tvh_build \
+		$(LIBAVDIR)/$(LIBOGG)/.tvh_build
+	cd $(LIBAVDIR)/$(LIBVORBIS) && $(CONFIGURE) \
+		--prefix=/ffmpeg \
+		--enable-static \
+		--disable-shared \
+		--with-ogg=$(LIBAVDIR)/build/ffmpeg
+	DESTDIR=$(LIBAVDIR)/build \
+		$(MAKE) -C $(LIBAVDIR)/$(LIBVORBIS) install
+	@touch $@
+
+#
+# libx264
+#
+
+ifneq (yes,$(CONFIG_LIBFFMPEG_STATIC_X264))
+
+$(LIBAVDIR)/$(LIBX264)/.tvh_download:
+	@echo "***** LIBX264 STATIC BUILD IS DISABLED, USING INSTALLED PACKAGE *****"
+	@mkdir -p $(LIBAVDIR)/$(LIBX264)
+	@touch $@
+
+$(LIBAVDIR)/$(LIBX264)/.tvh_build: $(LIBAVDIR)/$(LIBX264)/.tvh_download
+	@touch $@
+
+else
+
+$(LIBAVDIR)/$(LIBX264)/.tvh_download:
+	$(call DOWNLOAD,$(LIBX264_URL),$(LIBAVDIR)/$(LIBX264_TB),$(LIBX264_SHA1))
+	#rm -rf $(LIBAVDIR)/x264-snapshot-*
+	$(call UNTAR,$(LIBX264_TB),j)
+	#{ ln -sf $$(basename $(LIBAVDIR)/x264-snapshot-*) $(LIBAVDIR)/$(LIBX264); }
+	@touch $@
+
+$(LIBAVDIR)/$(LIBX264)/.tvh_build: \
+		$(LIBAVDIR)/$(LIBX264)/.tvh_download \
+		$(LIBAVDIR)/$(YASM)/.tvh_build
+	cd $(LIBAVDIR)/$(LIBX264) && $(CONFIGURE) \
+		--prefix=/ffmpeg \
+		--enable-static \
+		--disable-shared \
+		--disable-avs \
+		--disable-swscale \
+		--disable-lavf \
+		--disable-ffms \
+		--disable-gpac \
+		--disable-lsmash
+	DESTDIR=$(LIBAVDIR)/build \
+		$(MAKE) -C $(LIBAVDIR)/$(LIBX264) install
+	@touch $@
+
+endif
+
+#
+# libvpx (VP8)
+#
+
+$(LIBAVDIR)/$(LIBVPX)/.tvh_download:
+	@mkdir -p $(LIBAVDIR)
+	$(call DOWNLOAD,$(LIBVPX_URL),$(LIBAVDIR)/$(LIBVPX_TB),$(LIBVPX_SHA1))
+	$(call UNTAR,$(LIBVPX_TB),j)
+	@touch $@
+
+$(LIBAVDIR)/$(LIBVPX)/.tvh_build: \
+		$(LIBAVDIR)/$(LIBVPX)/.tvh_download \
+		$(LIBAVDIR)/$(YASM)/.tvh_build
+	cd $(LIBAVDIR)/$(LIBVPX) && $(CONFIGURE) \
+		--prefix=/ffmpeg \
+		--enable-static \
+		--disable-shared
+	DIST_DIR=$(LIBAVDIR)/build/ffmpeg \
+		$(MAKE) -C $(LIBAVDIR)/$(LIBVPX) install
+	@touch $@
+
+#
+# FFMPEG
+#
+
+$(LIBAVDIR)/$(FFMPEG)/.tvh_download:
+	@mkdir -p $(LIBAVDIR)/build
+	$(call DOWNLOAD,$(FFMPEG_URL),$(LIBAVDIR)/$(FFMPEG_TB),$(FFMPEG_SHA1))
+	$(call UNTAR,$(FFMPEG_TB),j)
+	@touch $@
+
+$(LIBAVDIR)/$(FFMPEG)/.tvh_build: \
+		$(LIBAVDIR)/$(YASM)/.tvh_build \
+		$(LIBAVDIR)/$(LIBVORBIS)/.tvh_build \
+		$(LIBAVDIR)/$(LIBX264)/.tvh_build \
+		$(LIBAVDIR)/$(LIBVPX)/.tvh_build \
+		$(LIBAVDIR)/$(FFMPEG)/.tvh_download
+	cd $(LIBAVDIR)/$(FFMPEG) && $(CONFIGURE) \
+                --prefix=/ffmpeg \
+		--disable-all \
+		--enable-static \
+		--disable-shared \
+		--enable-gpl \
+		--extra-cflags="$(ECFLAGS)" \
+		--extra-libs="$(ELIBS)" \
+		$(foreach extlib,$(EXTLIBS),--enable-$(extlib)) \
+		$(foreach component,$(COMPONENTS),--enable-$(component)) \
+		$(foreach decoder,$(DECODERS),--enable-decoder=$(decoder)) \
+		$(foreach encoder,$(ENCODERS),--enable-encoder=$(encoder)) \
+		$(foreach muxer,$(MUXERS),--enable-muxer=$(muxer)) \
+		$(foreach bsf,$(BSFS),--enable-bsf=$(bsf))
+	DESTDIR=$(LIBAVDIR)/build \
+		$(MAKE) -C $(LIBAVDIR)/$(FFMPEG) install
+	@touch $@
+
+.PHONY: static_libav_clean
+static_libav_clean:
+	@rm -rf $(LIBAVDIR)

Makefile.hdhomerun

@@ -0,0 +1,83 @@
+#
+#  HDhomerun library build
+#  Copyright (C) 2014 Jaroslav Kysela
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+include $(dir $(lastword $(MAKEFILE_LIST))).config.mk
+
+unexport CFLAGS
+unexport LDFLAGS
+
+define DOWNLOAD
+	@mkdir -p $(LIBHDHRDIR)/build
+	if test -z "$${TVHEADEND_FILE_CACHE}"; then \
+          wget --no-verbose -O $(2) $(1); \
+        else \
+          file=$$(basename $(2)); \
+          cp "$$TVHEADEND_FILE_CACHE/$$(file)" $(2); \
+        fi
+        @{ \
+	  sum=$$(sha1sum $(2) | cut -d ' ' -f 1); \
+          printf "SHA1SUM test '$${sum}' == '$(3)': "; \
+          test "y$${sum}" = "y$(3)"; \
+        }
+	@echo "OK"
+endef
+
+define UNTAR
+	tar x -C $(LIBHDHRDIR) -$(2)f $(LIBHDHRDIR)/$(1)
+endef
+
+LIBHDHRDIR = $(ROOTDIR)/libhdhomerun_static
+
+export PATH := $(LIBHDHRDIR)/build/bin:$(PATH)
+
+LIBHDHR         = libhdhomerun_20150406
+LIBHDHR_TB      = $(LIBHDHR).tgz
+LIBHDHR_URL     = http://download.silicondust.com/hdhomerun/$(LIBHDHR_TB)
+LIBHDHR_SHA1    = f0d5da744d981a80becea6cc862b5e2519e1c3c6
+
+.PHONY: build
+build: $(LIBHDHRDIR)/$(LIBHDHR)/.tvh_build
+
+#
+# libhdhomerun
+#
+
+-include $(LIBHDHRDIR)/$(LIBHDHR)/Makefile
+
+OBJS = $(foreach file,$(LIBSRCS),$(LIBHDHRDIR)/$(LIBHDHR)/$(basename $(file)).o)
+
+$(LIBHDHRDIR)/$(LIBHDHR)/%.o: $(LIBHDHRDIR)/$(LIBHDHR)/%.c
+	$(CC) -MD -MP $(CFLAGS) -c -o $@ $<
+
+$(LIBHDHRDIR)/$(LIBHDHR)/libhdhomerun.a: $(OBJS)
+	$(AR) rcs $@ $^
+
+$(LIBHDHRDIR)/$(LIBHDHR)/.tvh_download:
+	$(call DOWNLOAD,$(LIBHDHR_URL),$(LIBHDHRDIR)/$(LIBHDHR_TB),$(LIBHDHR_SHA1))
+	$(call UNTAR,$(LIBHDHR_TB),z)
+	ln -sf libhdhomerun $(LIBHDHRDIR)/$(LIBHDHR)
+	@touch $@
+
+$(LIBHDHRDIR)/$(LIBHDHR)/.tvh_build: \
+		$(LIBHDHRDIR)/$(LIBHDHR)/.tvh_download
+	$(MAKE) -f Makefile.hdhomerun $(LIBHDHRDIR)/$(LIBHDHR)/libhdhomerun.a
+	@touch $@
+
+.PHONY: static_libhdhr_clean
+static_libhdhr_clean:
+	@rm -rf $(LIBHDHRDIR)

README.md

@@ -1,6 +1,6 @@
 Tvheadend
-====================================
-(c) 2006 - 2014 Tvheadend Foundation CIC
+========================================
+(c) 2006 - 2015 Tvheadend Foundation CIC
 
 
 What it is
@@ -10,14 +10,22 @@ Tvheadend is a TV streaming server and digital video recorder.
 
 It supports the following inputs:
 
-  * DVB-C
+  * DVB-C(2)
   * DVB-T(2)
   * DVB-S(2)
   * ATSC
+  * SAT>IP
+  * HDHomeRun
   * IPTV
     * UDP
     * HTTP
 
+It support the following outputs:
+
+  * HTTP
+  * HTSP (own protocol)
+  * SAT>IP
+
 How to build for Linux
 ----------------------
 

configure

@@ -10,6 +10,7 @@
 # ###########################################################################
 
 ROOTDIR=$(cd "$(dirname "$0")"; pwd)
+test -z "$PKG_CONFIG" && PKG_CONFIG=pkg-config
 
 #
 # Options
@@ -18,9 +19,12 @@ ROOTDIR=$(cd "$(dirname "$0")"; pwd)
 OPTIONS=(
   "cwc:yes"
   "capmt:yes"
-  "v4l:no"
+  "constcw:yes"
   "linuxdvb:yes"
+  "satip_server:yes"
   "satip_client:yes"
+  "hdhomerun_client:auto"
+  "hdhomerun_static:no"
   "iptv:yes"
   "tsfile:yes"
   "dvbscan:yes"
@@ -30,6 +34,8 @@ OPTIONS=(
   "avahi:auto"
   "zlib:auto"
   "libav:auto"
+  "libffmpeg_static:no"
+  "libffmpeg_static_x264:yes"
   "inotify:auto"
   "epoll:auto"
   "uriparser:auto"
@@ -37,7 +43,12 @@ OPTIONS=(
   "tvhcsa:auto"
   "bundle:no"
   "dvbcsa:no"
+  "dvben50221:auto"
   "kqueue:no"
+  "dbus_1:auto"
+  "android:no"
+  "tsdebug:no"
+  "gtimer_check:no"
 )
 
 #
@@ -45,7 +56,36 @@ OPTIONS=(
 #
 
 . "$ROOTDIR/support/configure.inc"
-parse_args $*
+
+# ###########################################################################
+# Parse arguments
+# ###########################################################################
+opt=
+val=
+for opt do
+  val=${opt#*=}
+  opt=${opt%=*}
+  opt=${opt#*--}
+  case "$opt" in
+    help)
+      show_help
+      ;;
+    *dir|prefix)
+      eval "$opt=$val"
+      ;;
+    cc|cflags|ldflags|arch|cpu|platform|python)
+      eval "$(toupper $opt)=\"$val\""
+      ;;
+    enable-*)
+      opt=${opt#*-}
+      enable $opt 1
+      ;;
+    disable-*)
+      opt=${opt#*-}
+      disable $opt 1
+      ;;
+  esac
+done
 
 # ###########################################################################
 # Checks
@@ -125,6 +165,17 @@ int test(void)
 }
 '
 
+check_cc_snippet stime '
+#include <time.h>
+#define TEST test
+int test(void)
+{
+  time_t t = 1;
+  stime(&t);
+  return 0;
+}
+'
+
 check_cc_snippet recvmmsg '
 #define _GNU_SOURCE
 #include <stdlib.h>
@@ -137,6 +188,18 @@ int test(void)
 }
 '
 
+check_cc_snippet sendmmsg '
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <sys/socket.h>
+#define TEST test
+int test(void)
+{
+  sendmmsg(0, NULL, 0, 0);
+  return 0;
+}
+'
+
 check_cc_snippet libiconv '
 #include <iconv.h>
 int test(void)
@@ -146,6 +209,23 @@ int test(void)
 }
 ' -liconv
 
+if enabled_or_auto dvben50221; then
+  check_cc_snippet libdvben50221 '
+  #include <libdvben50221/en50221_session.h>
+  #define TEST test
+  int test(void)
+  {
+    struct en50221_transport_layer *tl = en50221_tl_create(5, 32);
+    return 0;
+  }
+  ' '-ldvben50221 -ldvbapi -lucsi'
+  if enabled libdvben50221; then
+    enable dvben50221
+  else
+    disable dvben50221
+  fi
+fi
+
 #
 # Python
 #
@@ -165,6 +245,8 @@ if [ ${PLATFORM} = "freebsd" ]; then
   enable ssl
 elif check_pkg openssl || check_pkg libssl; then
   enable ssl
+elif check_cc_header 'openssl/ssl' ssl; then
+  enable ssl
 else
   die "SSL development support not found"
 fi
@@ -190,6 +272,24 @@ if enabled_or_auto linuxdvb; then
   fi
 fi
 
+#
+# HDHomeRun - libhdhomerun
+#
+if enabled hdhomerun_static; then
+
+  enable hdhomerun_client
+
+else
+
+  if enabled_or_auto hdhomerun_client; then
+    if check_cc_header 'libhdhomerun/hdhomerun' libhdhomerun; then
+      enable  hdhomerun_client
+      LDFLAGS="$LDFLAGS -lhdhomerun"
+    fi
+  fi
+
+fi
+
 #
 # Gzip
 #
@@ -201,6 +301,13 @@ if enabled_or_auto zlib; then
   fi
 fi
 
+#
+# SAT>IP server
+#
+if enabled_or_auto satip_server; then
+  enable upnp
+fi
+
 #
 # SAT>IP client
 #
@@ -242,38 +349,93 @@ fi
 #
 # libav
 #
-if enabled_or_auto libav; then
+if enabled libffmpeg_static; then
+
+  enable libav
   has_libav=true
 
-  if $has_libav && ! check_pkg libavcodec "<=55.0.0"; then
-    has_libav=false
+else
+
+  if enabled_or_auto libav; then
+    has_libav=true
+
+    ffmpeg=$(${PKG_CONFIG} --modversion libavcodec | cut -d '.' -f 3)
+    test -z "$ffmpeg" && ffmpeg=0
+    printf "$TAB" "checking for ffmpeg libraries ..."
+    if test $ffmpeg -lt 100; then
+      ffmpeg=
+      echo "fail"
+    else
+      ffmpeg=yes
+      echo "ok"
+    fi
+
+    if test "$ffmpeg" == "yes"; then
+
+      #
+      # check for version n1.2+
+      #
+      if $has_libav && ! check_pkg libavcodec ">=55.18.102"; then
+        has_libav=false
+      fi
+
+      if $has_libav && ! check_pkg libavutil ">=52.38.100"; then
+        has_libav=false
+      fi
+
+      if $has_libav && ! check_pkg libavformat ">=55.12.100"; then
+        has_libav=false
+      fi
+
+      if $has_libav && ! check_pkg libswscale ">=2.3.100"; then
+        has_libav=false
+      fi
+
+      if $has_libav && ! check_pkg libavresample ">=1.1.0"; then
+        has_libav=false
+      fi
+
+    else
+
+      #
+      # check for version v10+
+      #
+
+      if $has_libav && ! check_pkg libavcodec ">=55.34.1"; then
+        has_libav=false
+      fi
+
+      if $has_libav && ! check_pkg libavutil ">=53.3.0"; then
+        has_libav=false
+      fi
+
+      if $has_libav && ! check_pkg libavformat ">=55.12.0"; then
+        has_libav=false
+      fi
+
+      if $has_libav && ! check_pkg libswscale ">=2.1.2"; then
+        has_libav=false
+      fi
+
+      if $has_libav && ! check_pkg libavresample ">=1.1.0"; then
+        has_libav=false
+      fi
+
+    fi
+
+    if $has_libav; then
+      enable libav
+    else
+      echo "WARNING: none or old libav or libffmpeg libraries were detected"
+      echo "         * use --disable-libav or --enable-libffmpeg_static"
+      echo "         ** supported ffmpeg libs n1.2+"
+      echo "         ** supported libav  libs v10+"
+      if enabled libav; then
+        die "libav development support not found"
+      fi
+    fi
   fi
 
-  if $has_libav && ! check_pkg libavcodec ">=52.96.0"; then
-    has_libav=false
-  fi
-
-  if $has_libav && ! check_pkg libavutil ">=50.43.0"; then
-    has_libav=false
-  fi
-
-  if $has_libav && ! check_pkg libavformat "<=55.0.0"; then
-    has_libav=false
-  fi
-
-  if $has_libav && ! check_pkg libavformat ">=53.10.0"; then
-    has_libav=false
-  fi
-
-  if $has_libav && ! check_pkg libswscale ">=0.13.0"; then
-    has_libav=false
-  fi
-
-  if $has_libav; then
-    enable libav
-  elif enabled libav; then
-    die "libav development support not found (use --disable-libav)"
-  fi
 fi
 
 #
@@ -290,7 +452,7 @@ fi
 #
 # libdvbcsa, tvhcsa
 #
-if enabled cwc || enabled capmt; then
+if enabled cwc || enabled capmt || enabled constcw; then
   enable tvhcsa
   if enabled dvbcsa; then
     (check_cc_header "dvbcsa/dvbcsa" dvbcsa_h &&\
@@ -300,6 +462,14 @@ if enabled cwc || enabled capmt; then
   fi
 fi
 
+#
+# libdvben50221
+#
+if enabled libdvben50221; then
+  LDFLAGS="$LDFLAGS -ldvben50221 -ldvbapi -lucsi"
+  enable linuxdvb_ca
+fi
+
 #
 # Icon caching
 #
@@ -335,23 +505,38 @@ if [ ${PLATFORM} = "freebsd" ] || [ ${PLATFORM} = "darwin" ]; then
 fi
 
 #
-# MPEGTS/PS support
+# MPEGTS support
 #
 disable mpegts
-disable mpegps
 disable mpegts_dvb
-if enabled linuxdvb || enabled iptv || enabled tsfile || enabled satip_client;
+if enabled linuxdvb || enabled iptv || enabled tsfile || enabled satip_client || \
+   enabled hdhomerun_client || enabled satip_server;
 then
   enable mpegts
 fi
-if enabled linuxdvb || enabled satip_client; then
+if enabled linuxdvb || enabled satip_client || enabled hdhomerun_client || enabled satip_server; then
   enable mpegts_dvb
 fi
 
-if enabled v4l; then
-  enable mpegps
+#
+# DBus
+#
+if enabled_or_auto dbus_1; then
+  if check_pkg dbus-1; then
+    enable dbus_1
+  elif enabled dbus-1; then
+    die "DBus-1 development support not found (use --disable-dbus-1)"
+  fi
 fi
 
+#
+# TSDebug
+#
+if enabled_or_auto tsdebug; then
+  enable mpegts_dvb
+fi
+
+
 # ###########################################################################
 # Write config
 # ###########################################################################

data/conf/charset

@@ -1,968 +0,0 @@
-[
-	{
-		"tsid": 1050,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 10729.00 V"
-	},
-	{
-		"tsid": 1028,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 10758.50 V"
-	},
-	{
-		"tsid": 1054,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 10788.00 V"
-	},
-	{
-		"tsid": 1056,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 10817.50 V"
-	},
-	{
-		"tsid": 1058,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 10847.00 V"
-	},
-	{
-		"tsid": 1060,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 10876.50 V"
-	},
-	{
-		"tsid": 1064,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 10935.50 V"
-	},
-	{
-		"tsid": 1034,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 10979.00 V"
-	},
-	{
-		"tsid": 1038,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 11038.00 V"
-	},
-	{
-		"tsid": 1040,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 11068.00 V"
-	},
-	{
-		"tsid": 1042,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 11097.00 V"
-	},
-	{
-		"tsid": 1044,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 11126.50 V"
-	},
-	{
-		"tsid": 1046,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 11156.00 V"
-	},
-	{
-		"tsid": 1048,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 11185.50 V xx"
-	},
-	{
-		"tsid": 1004,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 11258.50 V"
-	},
-	{
-		"tsid": 1008,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 11317.50 V"
-	},
-	{
-		"tsid": 1016,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 11435.50 V"
-	},
-	{
-		"tsid": 1032,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 11685.50 V"
-	},
-	{
-		"tsid": 1066,
-		"onid": 1,
-		"charset": "ISO8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Canal + Spain 11739.00 V"
-	},
-	{
-		"tsid": 1,
-		"onid": 133,
-		"charset": "ISO-8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Sky Germany 12070.50 H"
-	},
-	{
-		"tsid": 2,
-		"onid": 133,
-		"charset": "ISO-8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Sky Germany 11797.50 H"
-	},
-	{
-		"tsid": 3,
-		"onid": 133,
-		"charset": "ISO-8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Sky Germany 11719.50 H"
-	},
-	{
-		"tsid": 4,
-		"onid": 133,
-		"charset": "ISO-8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Sky Germany 12031.50 H"
-	},
-	{
-		"tsid": 6,
-		"onid": 133,
-		"charset": "ISO-8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Sky Germany 11914.50 H"
-	},
-	{
-		"tsid": 10,
-		"onid": 133,
-		"charset": "ISO-8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Sky Germany 11332.25 H"
-	},
-	{
-		"tsid": 11,
-		"onid": 133,
-		"charset": "ISO-8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Sky Germany 12382.50 H"
-	},
-	{
-		"tsid": 12,
-		"onid": 133,
-		"charset": "ISO-8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Sky Germany 12304.50 H"
-	},
-	{
-		"tsid": 13,
-		"onid": 133,
-		"charset": "ISO-8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Sky Germany 11992.50 H"
-	},
-	{
-		"tsid": 14,
-		"onid": 133,
-		"charset": "ISO-8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Sky Germany 11875.50 H"
-	},
-	{
-		"tsid": 15,
-		"onid": 133,
-		"charset": "ISO-8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Sky Germany 10920.75 H"
-	},
-	{
-		"tsid": 17,
-		"onid": 133,
-		"charset": "ISO-8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Sky Germany 11758.50 H"
-	},
-	{
-		"tsid": 33,
-		"onid": 133,
-		"charset": "ISO-8859-15",
-		"sid": 0,
-		"description": "Astra 19.2E Sky Germany 12480.00 V"
-	},
-	{
-		"tsid": 1048,
-		"onid": 1,
-		"charset": "PL_AUTO",
-		"sid": 4310,
-		"description": "Astra 19.2E TV Trwam"
-	},
-	{
-		"tsid": 1059,
-		"onid": 1,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Astra 19.2E TVP"
-	},
-	{
-		"tsid": 3218,
-		"onid": 3,
-		"charset": "ISO-8859-5",
-		"sid": 0,
-		"description": "Astra 23.5E Satellite BG 12051.00 V"
-	},
-	{
-		"tsid": 3226,
-		"onid": 3,
-		"charset": "ISO-8859-5",
-		"sid": 0,
-		"description": "Astra 23.5E Satellite BG 12207.00 V"
-	},
-	{
-		"tsid": 8100,
-		"onid": 156,
-		"charset": "PL_AUTO",
-		"sid": 1500,
-		"description": "Eurobird 9.0E TV Polonia"
-	},
-	{
-		"tsid": 8300,
-		"onid": 156,
-		"charset": "PL_AUTO",
-		"sid": 620,
-		"description": "Eurobird 9.0E TVN International"
-	},
-	{
-		"tsid": 200,
-		"onid": 318,
-		"charset": "ISO-8859-7",
-		"sid": 13805,
-		"description": "Hotbird 13.0 Eutelsat Eurosport GR"
-	},
-	{
-		"tsid": 200,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13834,
-		"description": "Hotbird 13.0 Eutelsat Eurosport PL"
-	},
-	{
-		"tsid": 200,
-		"onid": 318,
-		"charset": "ISO-8859-7",
-		"sid": 13840,
-		"description": "Hotbird 13.0 Eutelsat Eurosport GR"
-	},
-	{
-		"tsid": 200,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13864,
-		"description": "Hotbird 13.0 Eutelsat Eurosport 2 PL"
-	},
-	{
-		"tsid": 200,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13865,
-		"description": "Hotbird 13.0 Eutelsat Eurosport PL"
-	},
-	{
-		"tsid": 200,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13878,
-		"description": "Hotbird 13.0 Eutelsat Eurosport 2 NE PL"
-	},
-	{
-		"tsid": 300,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 NC+ HD PL"
-	},
-	{
-		"tsid": 400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13020,
-		"description": "Hotbird 13.0 NC+ Canal+ HD PL"
-	},
-	{
-		"tsid": 400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13022,
-		"description": "Hotbird 13.0 NC+ Canal+ Sport HD Polska"
-	},
-	{
-		"tsid": 400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13023,
-		"description": "Hotbird 13.0 NC+ Nat Geographic HD Polska"
-	},
-	{
-		"tsid": 400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13025,
-		"description": "Hotbird 13.0 NC+ Filmbox HD"
-	},
-	{
-		"tsid": 400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13026,
-		"description": "Hotbird 13.0 NC+ AXN Spin HD"
-	},
-	{
-		"tsid": 400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13027,
-		"description": "Hotbird 13.0 NC+ TVN 7 HD"
-	},
-	{
-		"tsid": 400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13070,
-		"description": "Hotbird 13.0 NC+ Eurosport HD PL"
-	},
-	{
-		"tsid": 400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13080,
-		"description": "Hotbird 13.0 NC+ Eurosport HD PL"
-	},
-	{
-		"tsid": 400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13081,
-		"description": "Hotbird 13.0 NC+ Eurosport HD PL"
-	},
-	{
-		"tsid": 400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13082,
-		"description": "Hotbird 13.0 NC+ Eurosport HD PL"
-	},
-	{
-		"tsid": 1000,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 NC+ TVN"
-	},
-	{
-		"tsid": 1100,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 NC+"
-	},
-	{
-		"tsid": 1300,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 NC+"
-	},
-	{
-		"tsid": 1400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 30,
-		"description": "Hotbird 13.0 Nick Junior"
-	},
-	{
-		"tsid": 1400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 31,
-		"description": "Hotbird 13.0 Nickelodeon HD"
-	},
-	{
-		"tsid": 1500,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 NC+"
-	},
-	{
-		"tsid": 1600,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 NC+"
-	},
-	{
-		"tsid": 1800,
-		"onid": 200,
-		"charset": "PL_AUTO",
-		"sid": 3623,
-		"description": "Hotbird 13.0 Polo TV"
-	},
-	{
-		"tsid": 5500,
-		"onid": 318,
-		"charset": "ISO-8859-7",
-		"sid": 0,
-		"description": "Hotbird 13.0 Nova GR"
-	},
-	{
-		"tsid": 6100,
-		"onid": 318,
-		"charset": "ISO-8859-7",
-		"sid": 0,
-		"description": "Hotbird 13.0 Nova GR"
-	},
-	{
-		"tsid": 7100,
-		"onid": 318,
-		"charset": "ISO-8859-7",
-		"sid": 0,
-		"description": "Hotbird 13.0 Nova GR"
-	},
-	{
-		"tsid": 7300,
-		"onid": 318,
-		"charset": "ISO-8859-7",
-		"sid": 0,
-		"description": "Hotbird 13.0 Nova GR"
-	},
-	{
-		"tsid": 7400,
-		"onid": 113,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 Cyfrowy Polsat"
-	},
-	{
-		"tsid": 7700,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 117,
-		"description": "Hotbird 13.0 Hot TV PL"
-	},
-	{
-		"tsid": 7800,
-		"onid": 113,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 Cyfrowy Polsat"
-	},
-	{
-		"tsid": 7900,
-		"onid": 113,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 Cyfrowy Polsat"
-	},
-	{
-		"tsid": 8100,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14900,
-		"description": "Hotbird 13.0 Eutelsat Sport Klub PL"
-	},
-	{
-		"tsid": 8100,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14901,
-		"description": "Hotbird 13.0 Eutelsat Universal CE"
-	},
-	{
-		"tsid": 8100,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14902,
-		"description": "Hotbird 13.0 Eutelsat Sci-Fi CE"
-	},
-	{
-		"tsid": 8100,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14910,
-		"description": "Hotbird 13.0 Eutelsat Sport Klub PL"
-	},
-	{
-		"tsid": 8100,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14911,
-		"description": "Hotbird 13.0 Eutelsat Universal CE"
-	},
-	{
-		"tsid": 8100,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14912,
-		"description": "Hotbird 13.0 Eutelsat Sci-Fi CE"
-	},
-	{
-		"tsid": 11000,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 NC+"
-	},
-	{
-		"tsid": 11100,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 4680,
-		"description": "Hotbird 13.0 Eutelsat 13th Street PL"
-	},
-	{
-		"tsid": 11200,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 Polsat Cyfrowy"
-	},
-	{
-		"tsid": 11400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 NC+"
-	},
-	{
-		"tsid": 11500,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 17309,
-		"description": "Hotbird 13.0 Baby TV PL"
-	},
-	{
-		"tsid": 11600,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 NC+"
-	},
-	{
-		"tsid": 11900,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 NC+"
-	},
-	{
-		"tsid": 12000,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 Polsat Cyfrowy"
-	},
-	{
-		"tsid": 12100,
-		"onid": 318,
-		"charset": "ISO-8859-7",
-		"sid": 0,
-		"description": "Hotbird 13.0 Nova GR"
-	},
-	{
-		"tsid": 12200,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 7457,
-		"description": "Hotbird 13.0 Globecast Cartoon Network PL / TCM CE"
-	},
-	{
-		"tsid": 12200,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 7466,
-		"description": "Hotbird 13.0 Globecast Disney Channel PL"
-	},
-	{
-		"tsid": 12200,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 7467,
-		"description": "Hotbird 13.0 Globecast Cartoon Network CE"
-	},
-	{
-		"tsid": 12200,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 7468,
-		"description": "Hotbird 13.0 Globecast TCM CE"
-	},
-	{
-		"tsid": 12800,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 MTV Networks"
-	},
-	{
-		"tsid": 13000,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14602,
-		"description": "Hotbird 13.0 Globecast BBC Entertainment"
-	},
-	{
-		"tsid": 13000,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14603,
-		"description": "Hotbird 13.0 Globecast BBC Knowledge"
-	},
-	{
-		"tsid": 13000,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14604,
-		"description": "Hotbird 13.0 Globecast BBC Lifestyle"
-	},
-	{
-		"tsid": 13000,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14605,
-		"description": "Hotbird 13.0 Globecast BBC Cbeebies"
-	},
-	{
-		"tsid": 13000,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14612,
-		"description": "Hotbird 13.0 Globecast IDiscovery"
-	},
-	{
-		"tsid": 13000,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14613,
-		"description": "Hotbird 13.0 Globecast TLC Polska"
-	},
-	{
-		"tsid": 13000,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14619,
-		"description": "Hotbird 13.0 Globecast MTV Dance"
-	},
-	{
-		"tsid": 13000,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14620,
-		"description": "Hotbird 13.0 Globecast Viasat Explorer"
-	},
-	{
-		"tsid": 13000,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 14621,
-		"description": "Hotbird 13.0 Globecast ESPN America"
-	},
-	{
-		"tsid": 13100,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 7324,
-		"description": "Hotbird 13.0 Crime & Investigation"
-	},
-	{
-		"tsid": 13100,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 7325,
-		"description": "Hotbird 13.0 Crime & Investigation"
-	},
-	{
-		"tsid": 13200,
-		"onid": 113,
-		"charset": "PL_AUTO",
-		"sid": 0,
-		"description": "Hotbird 13.0 Cyfrowy Polsat"
-	},
-	{
-		"tsid": 13400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 4754,
-		"description": "Hotbird 13.0 TVR"
-	},
-	{
-		"tsid": 15400,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 13511,
-		"description": "Hotbird 13.0 RBL.TV"
-	},
-	{
-		"tsid": 15700,
-		"onid": 318,
-		"charset": "PL_AUTO",
-		"sid": 10626,
-		"description": "Hotbird 13.0 Disco TV"
-	},
-	{
-		"tsid": 1,
-		"onid": 1,
-		"charset": "ISO-8859-2",
-		"sid": 0,
-		"description": "Intelsat/Thor 1W RCS DigiTV"
-	},
-	{
-		"tsid": 2,
-		"onid": 1,
-		"charset": "ISO-8859-2",
-		"sid": 0,
-		"description": "Intelsat/Thor 1W RCS DigiTV"
-	},
-	{
-		"tsid": 3,
-		"onid": 1,
-		"charset": "ISO-8859-2",
-		"sid": 0,
-		"description": "Intelsat/Thor 1W RCS DigiTV"
-	},
-	{
-		"tsid": 4,
-		"onid": 1,
-		"charset": "ISO-8859-2",
-		"sid": 0,
-		"description": "Intelsat/Thor 1W RCS DigiTV"
-	},
-	{
-		"tsid": 5,
-		"onid": 1,
-		"charset": "ISO-8859-2",
-		"sid": 0,
-		"description": "Intelsat/Thor 1W RCS DigiTV"
-	},
-	{
-		"tsid": 6,
-		"onid": 1,
-		"charset": "ISO-8859-2",
-		"sid": 0,
-		"description": "Intelsat/Thor 1W RCS DigiTV"
-	},
-	{
-		"tsid": 7,
-		"onid": 1,
-		"charset": "ISO-8859-2",
-		"sid": 0,
-		"description": "Intelsat/Thor 1W RCS DigiTV"
-	},
-	{
-		"tsid": 8,
-		"onid": 1,
-		"charset": "ISO-8859-2",
-		"sid": 0,
-		"description": "Intelsat/Thor 1W RCS DigiTV"
-	},
-	{
-		"tsid": 9,
-		"onid": 1,
-		"charset": "ISO-8859-2",
-		"sid": 0,
-		"description": "Intelsat/Thor 1W RCS DigiTV"
-	},
-	{
-		"tsid": 10,
-		"onid": 1,
-		"charset": "ISO-8859-2",
-		"sid": 0,
-		"description": "Intelsat/Thor 1W RCS DigiTV"
-	},
-	{
-		"tsid": 11,
-		"onid": 1,
-		"charset": "ISO-8859-2",
-		"sid": 0,
-		"description": "Intelsat/Thor 1W RCS DigiTV"
-	},
-	{
-		"tsid": 12,
-		"onid": 1,
-		"charset": "ISO-8859-2",
-		"sid": 0,
-		"description": "Intelsat/Thor 1W RCS DigiTV"
-	},
-	{
-		"tsid": 13,
-		"onid": 1,
-		"charset": "ISO-8859-2",
-		"sid": 0,
-		"description": "Intelsat/Thor 1W RCS DigiTV"
-	},
-	{
-		"tsid": 20400,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 10762.00 V"
-	},
-	{
-		"tsid": 20600,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 10803.75 V"
-	},
-	{
-		"tsid": 20700,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 10845.00 H"
-	},
-	{
-		"tsid": 20800,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 10845.25 V"
-	},
-	{
-		"tsid": 20900,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 108877.00 H"
-	},
-	{
-		"tsid": 21000,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 10928.00 H"
-	},
-	{
-		"tsid": 21100,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 10887.00 V"
-	},
-	{
-		"tsid": 21200,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 10928.00 V"
-	},
-	{
-		"tsid": 41200,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 11455.50 V"
-	},
-	{
-		"tsid": 50100,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 11471.00 H"
-	},
-	{
-		"tsid": 50200,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 11492.00 V"
-	},
-	{
-		"tsid": 50300,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 11673.00 H"
-	},
-	{
-		"tsid": 50400,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 11534.00 V"
-	},
-	{
-		"tsid": 50500,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 11554.00 H"
-	},
-	{
-		"tsid": 50600,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 11575.00 V"
-	},
-	{
-		"tsid": 50700,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 11596.00 H"
-	},
-	{
-		"tsid": 50800,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 11679.00 H"
-	},
-	{
-		"tsid": 50900,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 11513.00 H"
-	},
-	{
-		"tsid": 51000,
-		"onid": 126,
-		"charset": "ISO-8859-9",
-		"sid": 0,
-		"description": "Turksat 7E Digitürk 11617.00 V"
-	}
-]

data/conf/epggrab/opentv/genre/ausat

@@ -0,0 +1,258 @@
+[
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  32,
+  32,
+  32,
+  32,
+  32,
+  32,
+  32,
+  32,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  81,
+  48,
+  48,
+  80,
+  51,
+  48,
+  80,
+  48,
+  0,
+  48,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  18,
+  18,
+  22,
+  19,
+  20,
+  17,
+  16,
+  16,
+  96,
+  0,
+  96,
+  0,
+  96,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  64,
+  64,
+  64,
+  67,
+  64,
+  64,
+  64,
+  64,
+  64,
+  73,
+  64,
+  64,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0
+]

data/conf/epggrab/opentv/genre/skyit

@@ -0,0 +1,258 @@
+[
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  48,
+  48,
+  48,
+  48,
+  48,
+  21,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  49,
+  51,
+  48,
+  48,
+  48,
+  48,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  64,
+  64,
+  68,
+  71,
+  64,
+  64,
+  64,
+  64,
+  64,
+  64,
+  70,
+  64,
+  64,
+  64,
+  74,
+  64,
+  64,
+  64,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  16,
+  23,
+  20,
+  22,
+  18,
+  16,
+  18,
+  20,
+  19,
+  18,
+  16,
+  18,
+  18,
+  16,
+  17,
+  16,
+  16,
+  16,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  48,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  96,
+  96,
+  96,
+  96,
+  96,
+  96,
+  96,
+  96,
+  96,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  96,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  48,
+  48,
+  48,
+  48,
+  0,
+  48,
+  48,
+  24,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0,
+  0
+]

data/conf/epggrab/opentv/genre/skynz

@@ -0,0 +1,257 @@
+[ 0, 0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0,
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0,
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0,
+  0, 
+  16, 
+  17, 
+  18, 
+  19,
+  20, 
+  16, 
+  22, 
+  23, 
+  23,
+  16, 
+  19, 
+  23, 
+  23, 
+  23, 
+  18, 
+  16, 
+  0, 
+  0, 
+  0,
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0,
+  0, 
+  0, 
+  0, 
+  32,
+  33, 
+  34, 
+  35, 
+  36, 
+  144, 
+  35,
+  144, 
+  32, 
+  145, 
+  115, 
+  146, 
+  118, 
+  148, 
+  144, 
+  32, 
+  0,
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0,
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  48,
+  49, 
+  51, 
+  51, 
+  48,
+  48, 
+  48, 
+  48, 
+  48, 
+  48, 
+  48, 
+  48, 
+  49, 
+  48, 
+  51,
+  50, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0,
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  64, 
+  65, 
+  66,
+  67, 
+  68, 
+  69, 
+  70, 
+  71, 
+  72, 
+  73, 
+  74, 
+  75, 
+  69,
+  64, 
+  64, 
+  64, 
+  0,
+  0, 
+  0, 
+  0, 
+  0, 
+  0,
+  0,
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  80, 
+  81, 
+  82, 
+  83, 
+  84, 
+  85, 
+  80, 
+  80, 
+  84, 
+  85, 
+  80, 
+  80, 
+  80, 
+  80, 
+  80, 
+  80, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  96, 
+  97, 
+  98, 
+  99, 
+  100, 
+  101, 
+  102, 
+  96, 
+  96, 
+  96, 
+  96, 
+  96, 
+  96, 
+  96, 
+  96, 
+  96, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  112, 
+  113, 
+  114, 
+  115, 
+  116, 
+  117, 
+  118,
+  119, 
+  120, 
+  121, 
+  122, 
+  123, 
+  0, 
+  0, 
+  0, 
+  112, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0, 
+  0
+]
+

data/conf/epggrab/opentv/prov/ausat

@@ -1,9 +1,11 @@
 {
   "name": "Ausat",
   "dict": "skyeng",
+  "genre": "ausat",
   "nid": 4096,
   "tsid": 17,
   "sid": 17008,
+  "bouquetid": 0,
   "channel" : [
     17
   ],
@@ -12,5 +14,11 @@
   ],
   "summary": [
     64, 65, 66, 67, 68, 69, 70, 71
+  ],
+  "season_num": [
+    " *\\(S ?([0-9]+),? Ep? ?[0-9]+\\)"
+  ],
+  "episode_num": [
+    " *\\(S ?[0-9]+,? Ep? ?([0-9]+)\\)"
   ]
 }

data/conf/epggrab/opentv/prov/skyit

@@ -1,9 +1,11 @@
 {
   "name": "Sky Italia",
   "dict": "skyit",
+  "genre": "skyit",
   "nid": 64511,
   "tsid": 5800,
   "sid": 3635,
+  "bouquetid": 0,
   "channel" : [
     17
   ],
@@ -12,5 +14,35 @@
   ],
   "summary": [
     64, 65, 66, 67, 68, 69, 70, 71
+  ],
+  "season_num": [
+    "([0-9]+)'?a? Stagione +Ep\\. ?[0-9]+[a-z]?",
+    "([0-9]+)'?a? Stagione -? ?Puntata ?[0-9]+",
+    "([0-9]+)'?a? Stagione"
+  ],
+  "episode_num": [
+    "[0-9]+'?a? Stagione +Ep\\. ?([0-9]+)[a-z]?",
+    "[0-9]+'?a? Stagione -? ?Puntata ?([0-9]+)",
+    "^ *Ep\\. ?([0-9]+)[a-z]?",
+    "^ *Puntata ?([0-9]+)"
+  ],
+  "part_num": [
+    "[0-9]+'?a? Stagione +Ep\\. ?[0-9]+([a-z]?)",
+    "^ *Ep\\. ?[0-9]+([a-z]?)"
+  ],
+  "subtitle": [
+    "[0-9]+'?a? Stagione +Ep\\. ?[0-9]+[A-Za-z]? -? ?'(([^']*(' [^A-Z0-9-])?('[^ '])?)+)'",
+    "Ep\\. ?[0-9]+[A-Za-z]? -? ?'(([^']*(' [^A-Z0-9-])?('[^ '])?)+)'",
+    "[0-9]+'?a? Stagione -? ?'(([^']*(' [^A-Z0-9-])?('[^ '])?)+)'",
+    "[0-9]+'?a? Stagione -? ?Puntata ?[0-9]+[A-Za-z]? \"\" *([^\"]+) *\"\""
+  ],
+  "__reference": [
+    "4' Stagione Ep.9B - 'L'Hub' Gli agenti ...: sara' Ward ...",
+    "3a Stagione - Puntata 1 ...",
+    "4' Stagione - 'Title' ...",
+    "Ep.9A ...",
+    "Puntata 5 ...",
+    "Ep.4 - 'Title' ...",
+    "7 Stagione Puntata 8 \"\" Title \"\" ..."
   ]
 }

data/conf/epggrab/opentv/prov/skynz

@@ -0,0 +1,24 @@
+{
+  "name": "Sky NZ",
+  "dict": "skynz",
+  "genre": "skynz",
+  "nid": 169,
+  "tsid": 3,
+  "sid": 9003,
+  "bouquetid": 0,
+  "channel" : [
+    17
+  ],
+  "title": [
+    48, 49, 50, 51, 52, 53, 54, 55
+  ],
+  "summary": [
+    64, 65, 66, 67, 68, 69, 70, 71
+  ],
+  "season_num": [
+    " *\\(S ?([0-9]+),? Ep? ?[0-9]+\\)" 
+  ],
+  "episode_num": [
+    " *\\(S ?[0-9]+,? Ep? ?([0-9]+)\\)" 
+  ]
+}

data/conf/epggrab/opentv/prov/skyuk

@@ -5,6 +5,7 @@
   "nid": 2,
   "tsid": 2004,
   "sid": 4152,
+  "bouquetid": 4101,
   "channel" : [
     17
   ],
@@ -13,5 +14,11 @@
   ],
   "summary": [
     64, 65, 66, 67, 68, 69, 70, 71
+  ],
+  "season_num": [
+    " *\\(S ?([0-9]+),? Ep? ?[0-9]+\\)"
+  ],
+  "episode_num": [
+    " *\\(S ?[0-9]+,? Ep? ?([0-9]+)\\)"
   ]
 }

data/conf/fastscan

@@ -0,0 +1,155 @@
+[
+  {
+    "name": "Canal Digitaal SD",
+    "position": 192,
+    "frequency": 12515000,
+    "symbolrate" : 22000000,
+    "polarisation" : "H",
+    "delsys" : "dvbs",
+    "pid": 900
+  },
+  {
+    "name": "Canal Digitaal HD",
+    "position": 192,
+    "frequency": 12515000,
+    "symbolrate" : 22000000,
+    "polarisation" : "H",
+    "delsys" : "dvbs",
+    "pid": 901
+  },
+  {
+    "name": "TV Vlaanderen SD",
+    "position": 192,
+    "frequency": 12515000,
+    "symbolrate" : 22000000,
+    "polarisation" : "H",
+    "delsys" : "dvbs",
+    "pid": 910
+  },
+  {
+    "name": "TV Vlaanderen HD",
+    "position": 192,
+    "frequency": 12515000,
+    "symbolrate" : 22000000,
+    "polarisation" : "H",
+    "delsys" : "dvbs",
+    "pid": 911
+  },
+  {
+    "name": "TéléSAT SD",
+    "position": 192,
+    "frequency": 12515000,
+    "symbolrate" : 22000000,
+    "polarisation" : "H",
+    "delsys" : "dvbs",
+    "pid": 920
+  },
+  {
+    "name": "TéléSAT HD",
+    "position": 192,
+    "frequency": 12515000,
+    "symbolrate" : 22000000,
+    "polarisation" : "H",
+    "delsys" : "dvbs",
+    "pid": 921
+  },
+  {
+    "name": "Mobistar NL Astra1",
+    "position": 192,
+    "frequency": 12515000,
+    "symbolrate" : 22000000,
+    "polarisation" : "H",
+    "delsys" : "dvbs",
+    "pid": 930
+  },
+  {
+    "name": "Mobistar FR Astra1",
+    "position": 192,
+    "frequency": 12515000,
+    "symbolrate" : 22000000,
+    "polarisation" : "H",
+    "delsys" : "dvbs",
+    "pid": 940
+  },
+  {
+    "name": "AustriaSat Astra1",
+    "position": 192,
+    "frequency": 12515000,
+    "symbolrate" : 22000000,
+    "polarisation" : "H",
+    "delsys" : "dvbs",
+    "pid": 950
+  },
+  {
+    "name": "Canal Digitaal HD",
+    "position": 235,
+    "frequency": 12187000,
+    "symbolrate" : 27500000,
+    "polarisation" : "H",
+    "delsys" : "dvbs2",
+    "pid": 901
+  },
+  {
+    "name": "TV Vlaanderen HD",
+    "position": 235,
+    "frequency": 12187000,
+    "symbolrate" : 27500000,
+    "polarisation" : "H",
+    "delsys" : "dvbs2",
+    "pid": 911
+  },
+    {
+    "name": "TéléSAT HD",
+    "position": 235,
+    "frequency": 12187000,
+    "symbolrate" : 27500000,
+    "polarisation" : "H",
+    "delsys" : "dvbs2",
+    "pid": 921
+  },
+  {
+    "name": "Mobistar NL Astra3",
+    "position": 235,
+    "frequency": 12187000,
+    "symbolrate" : 27500000,
+    "polarisation" : "H",
+    "delsys" : "dvbs2",
+    "pid": 930
+  },
+  {
+    "name": "Mobistar FR Astra3",
+    "position": 235,
+    "frequency": 12187000,
+    "symbolrate" : 27500000,
+    "polarisation" : "H",
+    "delsys" : "dvbs2",
+    "pid": 940
+  },
+  {
+    "name": "AustriaSat Astra3",
+    "position": 235,
+    "frequency": 12187000,
+    "symbolrate" : 27500000,
+    "polarisation" : "H",
+    "delsys" : "dvbs2",
+    "pid": 950
+  },
+  {
+    "name": "Skylink: Czech Republic",
+    "position": 235,
+    "frequency": 12070000,
+    "symbolrate" : 27500000,
+    "polarisation" : "H",
+    "delsys" : "dvbs",
+    "pid": 30
+  },
+  {
+    "name": "Skylink: Slovak Republic",
+    "position": 235,
+    "frequency": 12070000,
+    "symbolrate" : 27500000,
+    "polarisation" : "H",
+    "delsys" : "dvbs",
+    "pid": 31
+  }
+]

data/conf/satellites

@@ -0,0 +1,638 @@
+[
+  {
+    "name": "NSS 9",
+    "pos": -1770
+  },
+  {
+    "name": "AMC 8",
+    "pos": -1390
+  },
+  {
+    "name": "AMC 7",
+    "pos": -1370
+  },
+  {
+    "name": "AMC 10",
+    "pos": -1350
+  },
+  {
+    "name": "Galaxy 15",
+    "pos": -1330
+  },
+  {
+    "name": "AMC 11",
+    "pos": -1310
+  },
+  {
+    "name": "Ciel 2/Galaxy 12",
+    "pos": -1290
+  },
+  {
+    "name": "Galaxy 13/Horizons 1",
+    "pos": -1270
+  },
+  {
+    "name": "AMC 21/Galaxy 14",
+    "pos": -1250
+  },
+  {
+    "name": "Galaxy 18",
+    "pos": -1230
+  },
+  {
+    "name": "EchoStar 9/Galaxy 23",
+    "pos": -1210
+  },
+  {
+    "name": "Anik F3/DirecTV 7S/EchoStar 14",
+    "pos": -1190
+  },
+  {
+    "name": "Eutelsat 117 West A",
+    "pos": -1168
+  },
+  {
+    "name": "Eutelsat 115 West A",
+    "pos": -1149
+  },
+  {
+    "name": "Eutelsat 113 West A",
+    "pos": -1130
+  },
+  {
+    "name": "Anik F2",
+    "pos": -1111
+  },
+  {
+    "name": "DirecTV 5/EchoStar 10/11",
+    "pos": -1100
+  },
+  {
+    "name": "Anik F1R/G1",
+    "pos": -1073
+  },
+  {
+    "name": "AMC 15/18",
+    "pos": -1050
+  },
+  {
+    "name": "AMC 1/SES 3/Spaceway 1 & DirecTV 10/12",
+    "pos": -1030
+  },
+  {
+    "name": "DirecTV 4S/8/SES 1",
+    "pos": -1010
+  },
+  {
+    "name": "DirecTV 14/Galaxy 16/Spaceway 2 & DirecTV 11",
+    "pos": -992
+  },
+  {
+    "name": "Galaxy 19",
+    "pos": -970
+  },
+  {
+    "name": "Galaxy 3C/Spaceway 3",
+    "pos": -950
+  },
+  {
+    "name": "Galaxy 25",
+    "pos": -931
+  },
+  {
+    "name": "Galaxy 17/Nimiq 6",
+    "pos": -910
+  },
+  {
+    "name": "Galaxy 28",
+    "pos": -890
+  },
+  {
+    "name": "TKSat 1",
+    "pos": -872
+  },
+  {
+    "name": "SES 2",
+    "pos": -870
+  },
+  {
+    "name": "AMC 16",
+    "pos": -850
+  },
+  {
+    "name": "Brasilsat B4",
+    "pos": -840
+  },
+  {
+    "name": "AMC 9",
+    "pos": -830
+  },
+  {
+    "name": "Nimiq 4",
+    "pos": -820
+  },
+  {
+    "name": "Simon Bolivar",
+    "pos": -780
+  },
+  {
+    "name": "EchoStar 8/QuetzSat 1",
+    "pos": -770
+  },
+  {
+    "name": "Star One C3",
+    "pos": -750
+  },
+  {
+    "name": "Nimiq 5",
+    "pos": -727
+  },
+  {
+    "name": "AMC 6",
+    "pos": -720
+  },
+  {
+    "name": "Star One C2",
+    "pos": -700
+  },
+  {
+    "name": "AMC 4",
+    "pos": -670
+  },
+  {
+    "name": "Star One C1",
+    "pos": -650
+  },
+  {
+    "name": "Telstar 14R",
+    "pos": -630
+  },
+  {
+    "name": "EchoStar 12/16",
+    "pos": -615
+  },
+  {
+    "name": "Amazonas 2/3/4A",
+    "pos": -610
+  },
+  {
+    "name": "Intelsat 21",
+    "pos": -580
+  },
+  {
+    "name": "Amazonas 1/Galaxy 11/Intelsat 805",
+    "pos": -555
+  },
+  {
+    "name": "Intelsat 23",
+    "pos": -530
+  },
+  {
+    "name": "Intelsat 1R",
+    "pos": -500
+  },
+  {
+    "name": "NSS 806",
+    "pos": -475
+  },
+  {
+    "name": "Intelsat 14",
+    "pos": -450
+  },
+  {
+    "name": "Intelsat 9/11",
+    "pos": -431
+  },
+  {
+    "name": "SES 6",
+    "pos": -405
+  },
+  {
+    "name": "NSS 10/Telstar 11N",
+    "pos": -375
+  },
+  {
+    "name": "Intelsat 903",
+    "pos": -345
+  },
+  {
+    "name": "Hylas 1",
+    "pos": -335
+  },
+  {
+    "name": "Intelsat 25",
+    "pos": -315
+  },
+  {
+    "name": "Hispasat 1D/1E",
+    "pos": -300
+  },
+  {
+    "name": "Intelsat 907",
+    "pos": -275
+  },
+  {
+    "name": "Intelsat 905",
+    "pos": -245
+  },
+  {
+    "name": "SES 4",
+    "pos": -220
+  },
+  {
+    "name": "NSS 7",
+    "pos": -200
+  },
+  {
+    "name": "Intelsat 901",
+    "pos": -180
+  },
+  {
+    "name": "Telstar 12",
+    "pos": -150
+  },
+  {
+    "name": "Express A4",
+    "pos": -140
+  },
+  {
+    "name": "Eutelsat 12 West A",
+    "pos": -125
+  },
+  {
+    "name": "Express AM44",
+    "pos": -110
+  },
+  {
+    "name": "Eutelsat 8 West A",
+    "pos": -80
+  },
+  {
+    "name": "Eutelsat 7 West A/Eutelsat 8 West C/Nilesat 102/201",
+    "pos": -73
+  },
+  {
+    "name": "Eutelsat 5 West A",
+    "pos": -50
+  },
+  {
+    "name": "Amos 2/3",
+    "pos": -40
+  },
+  {
+    "name": "Thor 5/6/Intelsat 10-02",
+    "pos": -8
+  },
+  {
+    "name": "Eutelsat 3B/Rascom QAF 1R",
+    "pos": 31
+  },
+  {
+    "name": "Astra 4A/SES 5",
+    "pos": 49
+  },
+  {
+    "name": "Eutelsat 7A/7B",
+    "pos": 70
+  },
+  {
+    "name": "Eutelsat 9A/Ka-Sat 9A",
+    "pos": 90
+  },
+  {
+    "name": "Eutelsat 10A",
+    "pos": 100
+  },
+  {
+    "name": "Eutelsat Hot Bird 13B/13C/13D",
+    "pos": 130
+  },
+  {
+    "name": "Eutelsat 16A",
+    "pos": 160
+  },
+  {
+    "name": "Amos 5",
+    "pos": 170
+  },
+  {
+    "name": "Astra 1KR/1L/1M/1N",
+    "pos": 192
+  },
+  {
+    "name": "Arabsat 5C",
+    "pos": 200
+  },
+  {
+    "name": "Eutelsat 21B",
+    "pos": 215
+  },
+  {
+    "name": "Astra 3B",
+    "pos": 235
+  },
+  {
+    "name": "Eutelsat 25B/Es'hail 1",
+    "pos": 255
+  },
+  {
+    "name": "Badr 4/5/6",
+    "pos": 260
+  },
+  {
+    "name": "Astra 2A/2C/2E/2F/Eutelsat 28A",
+    "pos": 282
+  },
+  {
+    "name": "Arabsat 5A",
+    "pos": 305
+  },
+  {
+    "name": "Eutelsat 31A",
+    "pos": 308
+  },
+  {
+    "name": "Astra 5B",
+    "pos": 315
+  },
+  {
+    "name": "Eutelsat 33B/Intelsat 28",
+    "pos": 330
+  },
+  {
+    "name": "Eutelsat 36A/36B",
+    "pos": 360
+  },
+  {
+    "name": "Paksat 1R",
+    "pos": 380
+  },
+  {
+    "name": "Hellas Sat 2",
+    "pos": 390
+  },
+  {
+    "name": "Türksat 2A/3A/4A",
+    "pos": 420
+  },
+  {
+    "name": "Intelsat 12",
+    "pos": 450
+  },
+  {
+    "name": "AzerSpace 1/Africasat 1a",
+    "pos": 460
+  },
+  {
+    "name": "Intelsat 10",
+    "pos": 475
+  },
+  {
+    "name": "Afghansat 1",
+    "pos": 480
+  },
+  {
+    "name": "Yamal 202",
+    "pos": 490
+  },
+  {
+    "name": "NSS 5",
+    "pos": 505
+  },
+  {
+    "name": "Y1A",
+    "pos": 525
+  },
+  {
+    "name": "Express AM22",
+    "pos": 530
+  },
+  {
+    "name": "G-Sat 8/Yamal 402",
+    "pos": 549
+  },
+  {
+    "name": "Express AT1",
+    "pos": 560
+  },
+  {
+    "name": "NSS 12",
+    "pos": 570
+  },
+  {
+    "name": "Intelsat 904",
+    "pos": 600
+  },
+  {
+    "name": "Intelsat 902",
+    "pos": 620
+  },
+  {
+    "name": "Intelsat 906",
+    "pos": 642
+  },
+  {
+    "name": "Intelsat 17",
+    "pos": 660
+  },
+  {
+    "name": "Intelsat 20",
+    "pos": 685
+  },
+  {
+    "name": "Eutelsat 70B",
+    "pos": 705
+  },
+  {
+    "name": "Intelsat 22",
+    "pos": 721
+  },
+  {
+    "name": "Insat 3C/4CR",
+    "pos": 740
+  },
+  {
+    "name": "ABS 2",
+    "pos": 750
+  },
+  {
+    "name": "Apstar 7",
+    "pos": 765
+  },
+  {
+    "name": "Thaicom 5/6",
+    "pos": 785
+  },
+  {
+    "name": "G-Sat 10/Insat 4A",
+    "pos": 830
+  },
+  {
+    "name": "Horizons 2/Intelsat 15",
+    "pos": 851
+  },
+  {
+    "name": "KazSat 2",
+    "pos": 865
+  },
+  {
+    "name": "ChinaSat 12",
+    "pos": 875
+  },
+  {
+    "name": "ST 2",
+    "pos": 880
+  },
+  {
+    "name": "Yamal 300K/401",
+    "pos": 900
+  },
+  {
+    "name": "Measat 3/3a/3b",
+    "pos": 915
+  },
+  {
+    "name": "ChinaSat 9",
+    "pos": 922
+  },
+  {
+    "name": "Insat 3A/4B",
+    "pos": 935
+  },
+  {
+    "name": "NSS 6/SES 8",
+    "pos": 950
+  },
+  {
+    "name": "Express AM33",
+    "pos": 965
+  },
+  {
+    "name": "AsiaSat 5",
+    "pos": 1005
+  },
+  {
+    "name": "Express AM3",
+    "pos": 1030
+  },
+  {
+    "name": "AsiaSat 7/8",
+    "pos": 1055
+  },
+  {
+    "name": "NSS 11/SES 7/Telkom 1",
+    "pos": 1082
+  },
+  {
+    "name": "BSAT 3A/3C/JCSAT 110R/N-Sat 110",
+    "pos": 1100
+  },
+  {
+    "name": "ChinaSat 10",
+    "pos": 1105
+  },
+  {
+    "name": "Koreasat 5/Palapa D",
+    "pos": 1130
+  },
+  {
+    "name": "ChinaSat 6B",
+    "pos": 1155
+  },
+  {
+    "name": "ABS 7/Koreasat 6",
+    "pos": 1160
+  },
+  {
+    "name": "AsiaSat 3S/Telkom 2",
+    "pos": 1180
+  },
+  {
+    "name": "Thaicom 4",
+    "pos": 1195
+  },
+  {
+    "name": "AsiaSat 4",
+    "pos": 1222
+  },
+  {
+    "name": "JCSAT 4B",
+    "pos": 1240
+  },
+  {
+    "name": "ChinaSat 6A",
+    "pos": 1250
+  },
+  {
+    "name": "JCSAT 3A",
+    "pos": 1280
+  },
+  {
+    "name": "JCSAT 5A/Vinasat 1/2",
+    "pos": 1320
+  },
+  {
+    "name": "Apstar 6",
+    "pos": 1340
+  },
+  {
+    "name": "Telstar 18",
+    "pos": 1380
+  },
+  {
+    "name": "Express AM5/AT2",
+    "pos": 1400
+  },
+  {
+    "name": "Superbird C2",
+    "pos": 1440
+  },
+  {
+    "name": "JCSAT 1B",
+    "pos": 1500
+  },
+  {
+    "name": "Optus D2",
+    "pos": 1520
+  },
+  {
+    "name": "JCSAT 2A",
+    "pos": 1540
+  },
+  {
+    "name": "Optus C1/D3",
+    "pos": 1560
+  },
+  {
+    "name": "ABS 6",
+    "pos": 1590
+  },
+  {
+    "name": "Optus D1",
+    "pos": 1600
+  },
+  {
+    "name": "Superbird B2",
+    "pos": 1620
+  },
+  {
+    "name": "Optus 10/B3",
+    "pos": 1640
+  },
+  {
+    "name": "Intelsat 19",
+    "pos": 1660
+  },
+  {
+    "name": "Intelsat 8",
+    "pos": 1690
+  },
+  {
+    "name": "Eutelsat 172A",
+    "pos": 1720
+  },
+  {
+    "name": "Intelsat 18",
+    "pos": 1800
+  }
+]

docs/html/autorec.html

@@ -1,5 +1,5 @@
 <div class="hts-doc-text">
-The 'Automatic Recorder' is used to create rules that will trig
+The 'Automatic Recorder' is used to create rules that will trigger
 automatic recording of events. You can use this to record you favorite
 TV show(s), record all movies on a specific channel, etc.
 <p>
@@ -62,6 +62,10 @@ The columns have the following functions:
   <dd>
   Only match events belonging to the given content group.
 
+  <dt>Duration
+  <dd>
+  Only match events that fall within the specified duration range.
+
   <dt>Weekdays
   <dd>
   Only record events if they occur on one of these days. By default all days

docs/html/config_access.html

@@ -7,9 +7,9 @@ wide open.
 
 <p>
 When Tvheadend verifies access is scan through all the enabled access control entries.
-The permission flags are combined for all matching access entries.
-An access entry is said to match if the username / password matches and the IP source
-address of the requesting peer is within the prefix.
+The permission flags, streaming profiles, DVR config profiles, channel tags are combined
+for all matching access entries. An access entry is said to match if the username / password
+matches and the IP source address of the requesting peer is within the prefix.
 <p>
 
 The access rules are listed / edited  in a grid. 
@@ -32,70 +32,113 @@ The access rules are listed / edited  in a grid.
 </ul>
 
 <p>
+<br>
+<hr>
+<b>Columns</b>
+<hr>
 The columns have the following functions:
+<br><br>
 
 <dl>
- <dt>Enabled
- <dd>Make the entry participate in access control. If disabled, the entry
-     is inactive.
+ <dt><b>Enabled</b>
+ <dd>Enable this access control rule. Uncheck the box to disable.
 
-  <dt>Username
+  <dt><b>Username</b>
   <dd>
-  Name of user, if no username is needed for match it should contain a
-  single asterisk (*).
+  Login name to be used. If no username is required, this entry should contain a single asterisk (*).
 
-  <dt>Password
+  <dt><b>Password</b>
   <dd>
-  Password to combine with user, if username is '*' (unused), the password
-  should be the same.
+  Login password to be used. If username is '*' (unused), the password should be the same (i.e. match any username/password combination, or no username/password required).
 
-  <dt>Prefix
+  <dt><b>Network prefix</b>
   <dd>
   IPv4 prefix for matching based on source IP address.
   If set to 0.0.0.0/0 it will match everything.
+  The multiple networks can be delimited using comma or semicolon.
 
-  <dt>Streaming
-  <dd>
-  Enables access to streaming function. The 'streaming' access is enough to
-  make Showtime (over HTSP) work.
-
-  <dt>Video Recorder
-  <dd>
-  Enables access to all video recording functions. This also include administration of the auto recordings.
-
-  <dt>All Configs (VR)
-  <dd>
-  Allow use of and configuration of DVR configuration profiles.
-
-  <dt>Web interface
+  <dt><b>Web interface</b>
   <dd>
   Required for web user interface access. Also gives access to the EPG.
 
-  <dt>Admin
+  <dt><b>Admin</b>
   <dd>
   Enables access to the Configuration tab.
-  
-  <dt>Channel Tag Only
+
+  <dt><b>Streaming</b>
   <dd>
-  If enabled, the user will only be able to access channels with a tag the
-  same name as the username.
+  Enables access to streaming functionality for HTTP (web).
 
-  This provides a very rudimentary way of limiting access to certain channels.
+  <dt><b>Advanced Streaming</b>
+  <dd>
+  Enables access to advanced streaming function for HTTP (web) - like direct
+  service or whole MPEG-TS stream (mux)..
+  
+  <dt><b>HTSP Streaming</b>
+  <dd>
+  Enables access to streaming for the HTSP protocol (Movian, Kodi etc.).
 
-  <dt>Comment
+  <dt><b>Streaming Profile</b>
+  <dd>
+  Specify a streaming profile to be used when this user logs in; use the (default) stream if not specified.
+  
+  <dt><b>Limit Connections</b>
+  <dd>
+  If set, this will limit the number of concurrent streaming connections a user is permitted to have. 0=disabled
+
+  <dt><b>Video Recorder</b>
+  <dd>
+  Enables access to all video recording functions. This also include administration of the auto recordings.
+
+  <dt><b>HTSP DVR</b>
+  <dd>
+  Enables access to video recording functions for the HTSP protocol (Movian, Kodi etc.).
+
+  <dt><b>All DVR</b>
+  <dd>
+  Enable to access to DVR entries created by other users (read-only).
+
+  <dt><b>All DVR (rw)</b>
+  <dd>
+  Enable to access to DVR entries created by other users with the ability to
+  remove the DVR entries.
+
+  <dt><b>DVR Config Profile</b>
+  <dd>
+  If set, the user will only be able to use the DVR config profile
+  equal to this value.
+  Note that this field is unset when the DVR Config Profile is removed.
+
+  <dt><b>Min Channel Num</b>
+  <dd>
+  If non-zero, this sets the lower limit of the channels accessible by a user, i.e. the user will only be able to access channels where the channel number is equal to or greater than this value.
+
+  <dt><b>Max Channel Num</b>
+  <dd>
+  If non-zero, this sets the upper limit of the channels accessible by a user, i.e. the user will only be able to access channels where the channel number is equal to or less than this value.
+
+  <dt><b>Channel Tag</b>
+  <dd>
+  If set, the user will only be able to access channels containing
+  this channel tag.
+  Note that this field is unset when the channel tag is removed.
+
+  <dt><b>Comment</b>
   <dd>
   Allows the administrator to set a comment only visible in this editor.
   It does not serve any active purpose.
  </dl>
 
 <p>
+<br>
+<hr>
 Let's also take a look at an example:
 <p>
 <img src="docresources/accessconfigexample.png">
 <p>
 First line gives clients originating from 192.168.0.0 - 192.168.0.255 network
 access to streaming functions. Typically you would use this for your
-local media players at home (All though Showtime can prompt for username & password
+local media players at home (All though Movian can prompt for username & password
 in its HTSP client)
 <p>
 The second line adds a user with world wide access who might want to modify

docs/html/config_bouquet.html

@@ -0,0 +1,43 @@
+<div class="hts-doc-text">
+
+<p>
+To use bouquets, ensure to add and scan all available muxes using
+the predefined muxes or manual configuration.
+</p>
+
+<p>
+The bouquets are obtained automatically from the DVB source during
+the mux scan period. Note that bouquets may use more muxes and only
+services from scanned muxes are added. The mux with bouquets might
+require another scan when all muxes are discovered (manually using
+the rescan checkbox).
+</p>
+
+<p>
+The fastscan bouquets are pre-defined in the configuration tree. These
+bouquets must be manually enabled to let tvheadend to subscribe and listen
+to the specific MPEG-TS PIDs.
+</p>
+
+<p>
+The bouquets are listed / edited  in a grid. 
+
+<ul>
+ <li>To edit a cell, double click on it. After a cell is changed it
+     will flags one of its corner to red to indicated that it has been
+     changed. To commit these changes back to Tvheadend press the 
+     'Save changes' button. In order to change a Checkbox cell you only
+     have to click once in it.
+
+ <li>To add a new entry, press the 'Add entry' button. The new (empty) entry
+     will be created on the server but will not be in its enabled state.
+     You can now change all the cells to the desired values, check the
+     'enable' box and then press 'Save changes' to activate the new entry.
+
+ <li>To delete one or more entries, select the lines (by clicking once on 
+     them), and press the 'Delete selected' button. A popup
+     will ask you to confirm your request.
+</ul>
+</p>
+
+</div>

docs/html/config_caclient.html

@@ -1,7 +1,64 @@
 <div class="hts-doc-text">
 
-  Tvheadend support connecting to card clients via the capmt protocol for so called softcam
-  descrambling.
+  Tvheadend support connecting to card clients via the cwc (newcamd) or capmt
+  (dvbapi) protocol for so called softcam descrambling.
+
+ <p>
+ <img src="docresources/configcwc.png">
+
+ <p>
+ The servers are listed / edited  in a grid. 
+
+ <ul>
+  <li>To edit a cell, double click on it. After a cell is changed it
+      will flags one of its corner to red to indicated that it has been
+      changed. To commit these changes back to Tvheadend press the 
+      'Save changes' button. In order to change a Checkbox cell you only
+      have to click once in it.
+
+  <li>To add a new entry, press the 'Add entry' button. The new (empty) entry
+      will be created on the server but will not be in its enabled state.
+      You can now change all the cells to the desired values, check the
+      'enable' box and then press 'Save changes' to activate the new entry.
+
+  <li>To delete one or more entries, select the lines (by clicking once on 
+      them), and press the 'Delete selected' button. A pop up
+      will ask you to confirm your request.
+ </ul>
+
+ <p>
+ The columns have the following functions:
+
+ <dl>
+  <dt>Enabled
+  <dd>If selected, connection will be tried to be established and retained up.
+      If unselected, Tvheadend will disconnect (if connected) and not try to reconnect.
+
+  <dt>Hostname
+  <dd>Server hostname. DNS lookup is performed upon every connection attempt.
+
+  <dt>Port
+  <dd>Server TCP port
+
+  <dt>Username
+  <dd>Username to use.
+
+  <dt>Password
+  <dd>Password to use.
+
+  <dt>DES Key
+  <dd>Initial DES key.
+
+  <dt>Update Card
+  <dd>Forward Entitlement Management Messages (EMMs) to the server.
+
+  <dt>Update One
+  <dd>Forward EMMs only from one channel at a time.
+
+  <dt>Comment
+  <dd>Allows the administrator to set a comment only visible in this editor.
+      It does not serve any active purpose.
+ </dl>
 
  <p>
  <img src="docresources/configcapmt.png">
@@ -98,6 +155,18 @@
                 pmt_mode = 4
           </dl>
 
+      <dt>mode 5 (new OSCam since revision 10087)
+      <dd>Similar to mode 3 (TCP), but uses a new network protocol which also added
+          client/server greeting messages and protocol version information (to be able
+          to smoothly detect enhancements in the future).<br><br>
+          <b>This is currently the preferred mode (the other may be removed in future)!</b><br><br>
+          The following lines are required in <b>[dvbapi]</b> section of oscam.conf file:
+          <dl>
+            <dt>boxtype = pc<br>
+                pmt_mode = 4<br>
+                listen_port = 9000 # or your preferred port<br>
+          </dl>
+
   <dt>Comment
   <dd>Allows the administrator to set a comment only visible in this editor.
       It does not serve any active purpose.

docs/html/config_channels.html

@@ -21,6 +21,23 @@
  The columns have the following functions:
 
  <dl>
+  <dt>Play
+  <dd>Direct play link using the HTTP streaming.
+
+   <dl>
+    <dt>URL to the stream using a channel name
+    <dd>http://<i>host:port</i>/play/stream/channelname/<i>channel_name</i>
+    <dt>URL to the stream using a channel number
+    <dd>http://<i>host:port</i>/play/stream/channelnumber/<i>channel_number</i>
+   </dl>
+
+  <dt>Enabled
+  <dd>Whether or not the mux is enabled and thus available.
+
+  <dd>Channel number. This is not used by Tvheadend internally, but rather
+      intended to be used by HTSP clients for mapping to remote control
+      buttons, presentation order, etc
+
   <dt>Number
   <dd>Channel number. This is not used by Tvheadend internally, but rather
       intended to be used by HTSP clients for mapping to remote control
@@ -36,6 +53,12 @@
       display a direct link that can be used to open in preferred media
       player.
 
+  <dt>Auto EPG Channel
+  <dd>Auto-link EPG channels from XMLTV and OpenTV EPG grabbers using
+      the channel name for matching. If you turn this option off, only
+      OTA EPG grabber will be used for this channel unless the EPG Grab
+      Source option (bellow) is not set manually.
+
   <dt>EPG Grab Source
   <dd>Name of the Internet-based EPG provider (typically XMLTV) channel
       that should be used to update this channels EPG info.
@@ -54,10 +77,13 @@
       in the EPG if you have many channels. The tags are also presented
       in a Media player.
 
-  <dt>Icon
+  <dt>User Icon
   <dd>An URL pointing to an image representing the channel.
       The icon URL will be set automatically when importing data from
-      XMLTV. This field allows the user to edit it manually.
+      XMLTV, when picon path is set or when channel icon path is set
+      in the general config. This field allows the user to edit it manually. The
+      reset icon action allows to re-set the automatic URL for
+      selected channel (e.g. after configuration change).
 
   <dt>DVR Pre-Start
   <dd>Allows the user to specify an amount of extra time that should

docs/html/config_cwc.html

@@ -1,61 +0,0 @@
-<div class="hts-doc-text">
-
- Tvheadend support connecting to card servers for so called softcam descrambling.
-
- <p>
- <img src="docresources/configcwc.png">
-
- <p>
- The servers are listed / edited  in a grid. 
-
- <ul>
-  <li>To edit a cell, double click on it. After a cell is changed it
-      will flags one of its corner to red to indicated that it has been
-      changed. To commit these changes back to Tvheadend press the 
-      'Save changes' button. In order to change a Checkbox cell you only
-      have to click once in it.
-
-  <li>To add a new entry, press the 'Add entry' button. The new (empty) entry
-      will be created on the server but will not be in its enabled state.
-      You can now change all the cells to the desired values, check the
-      'enable' box and then press 'Save changes' to activate the new entry.
-
-  <li>To delete one or more entries, select the lines (by clicking once on 
-      them), and press the 'Delete selected' button. A pop up
-      will ask you to confirm your request.
- </ul>
-
- <p>
- The columns have the following functions:
-
- <dl>
-  <dt>Enabled
-  <dd>If selected, connection will be tried to be established and retained up.
-      If unselected, Tvheadend will disconnect (if connected) and not try to reconnect.
-
-  <dt>Hostname
-  <dd>Server hostname. DNS lookup is performed upon every connection attempt.
-
-  <dt>Port
-  <dd>Server TCP port
-
-  <dt>Username
-  <dd>Username to use.
-
-  <dt>Password
-  <dd>Password to use.
-
-  <dt>DES Key
-  <dd>Initial DES key.
-
-  <dt>Update Card
-  <dd>Forward Entitlement Management Messages (EMMs) to the server.
-
-  <dt>Update One
-  <dd>Forward EMMs only from one channel at a time.
-
-  <dt>Comment
-  <dd>Allows the administrator to set a comment only visible in this editor.
-      It does not serve any active purpose.
- </dl>
-</div>

docs/html/config_dvr.html

@@ -1,6 +1,10 @@
 <div class="hts-doc-text">
 
- <img src="docresources/configdvrtab.png">
+ <img src="docresources/configdvrtab1.png">
+ <br>
+ <img src="docresources/configdvrtab2.png">
+ <br>
+ <img src="docresources/configdvrtab3.png">
 
  <p>
  This tab is used to configure operation of the Digital Video Recorder.
@@ -56,8 +60,13 @@
   <dd>If checked, broadcasts with matching title and matching non-zero episode number 
       are considered duplicates.
 
+  <dt>EPG update window
+  <dd>Maximum difference between event start times when the EPG event is changed.
+      TVHeadend uses a fuzzy match logic (using title, start times,
+      duration, episode) to check when the event was changed.
+
   <dt>Post-processor command
-  <dd>Command to run after finishing a recording. The command will be run in background and is executed even if a recording is aborted or an error occurred. Use the %e error formatting string to check for errors, the error string is empty if recording finished successfully.
+  <dd>Command to run after finishing a recording. The command will be run in background and is executed even if a recording is aborted or an error occurred. Use the %e error formatting string to check for errors, the error string is "OK" if recording finished successfully.
       <br><br>
       Support format strings:<br>
       <table class="hts-doc-text" border="0">
@@ -167,10 +176,19 @@
   <dd>If checked, insert the episode number before the data and time rather than after (assumes <i>Include date</i>, <i>Include time</i> and <i>Include episode</i> options are set).
 	  
   <dt>Remove all unsafe characters from filename
-  <dd>If checked, all characters that could possibly cause problems for filenaming will be removed.
+  <dd>If checked, all characters that could possibly cause problems for filenaming will be replaced with '_'.<br>
+  	  Applies to characters:<br>
+      * not supported by Windows characters: <i>/ : \ < > | * ? ' "</i><br>
+      * control characters (ASCII code below 32)<br>
+      * control and national characters (ASCII code above 122)<br> 
   
   <dt>Replace whitespace in title with '-'
-  <dd>If checked, all whitespace characters will be replaced with '-'.
+  <dd>If checked, whitespace characters (spaces and tabs) will be replaced with '-'.
+  
+  <dt>Use Windows-compatible filenames
+  <dd>If checked:<br>
+      * special characters not supported by Windows like: <i>/ : \ < > | * ? ' "</i> will be replaced with '_'<br>
+      * trailing spaces ' ' and dots '.' will be removed
   
  </dl>
  Changes to any of these settings must be confirmed by pressing the 'Save configuration' button before taking effect.

docs/html/config_epggrab.html

@@ -48,6 +48,51 @@
   <a href='http://github.com/adamsutton/PyEPG'>http://github.com/adamsutton/PyEPG</a>.</li>
  </ul>
 
+ <h2>Cron multi-line config text areas</h2>
+ <ul>
+
+ <li><p>The cron lines looks like:</p>
+ <pre>
+   # * * * * *  command to execute
+   # ┬ ┬ ┬ ┬ ┬
+   # │ │ │ │ │
+   # │ │ │ │ │
+   # │ │ │ │ └───── day of week (0 - 6) (0 to 6 are Sunday to Saturday, or use names; 7 is Sunday, the same as 0)
+   # │ │ │ └────────── month (1 - 12)
+   # │ │ └─────────────── day of month (1 - 31)
+   # │ └──────────────────── hour (0 - 23)
+   # └───────────────────────── min (0 - 59)</pre>
+
+ <li><b>Cron special characters</b>
+ <dl>
+ <dt>Asterisk ( * )
+ <dd>The asterisk indicates that the cron expression matches for all values
+     of the field. E.g., using an asterisk in the 4th field (month)
+     indicates every month.
+
+ <dt>Slash ( / )
+ <dd>Slashes describe increments of ranges. For example 3-59/15 in the
+     1st field (minutes) indicate the third minute of the hour and every
+     15 minutes thereafter. The form "*/..." is equivalent to the form
+     "first-last/...", that is, an increment over the largest possible
+     range of the field.
+
+ <dt>Comma ( , )
+ <dd>Commas are used to separate items of a list. For example, using
+     "MON,WED,FRI" in the 5th field (day of week) means Mondays,
+     Wednesdays and Fridays.
+
+ <dt>Hyphen ( - )
+ <dd>Hyphens define ranges. For example, 2000-2010 indicates every year
+     between 2000 and 2010 AD, inclusive.
+
+ <dt>Number-sign ( # )
+ <dd>Number-sign defines a start of a comment. The rest of line is
+     ignored behind this character.
+ </dl>
+
+ </ul>
+
  <h2>Configuration options</h2>
  
  <h3>General Config</h3>
@@ -74,14 +119,26 @@
   <dt>Module:
   <dd>Select which internal grabber to use.
 
-  <dt>Grab interval
-  <dd>Time period between grabs. Value and unit are independently set.
+  <dt>Cron multi-line
+  <dd>Multiple lines of the cron time specification.
  </dl>
  
  <h3>Over-the-air Grabbers</h3>
- <p>
- Checkbox list to enable/disable available modules. 
- By default all grabbers should be enabled.
+ <dl>
+  <dt>Force initial EPG scan at startup
+  <dd>... no comment
+
+  <dt>Cron multi-line
+  <dd>Multiple lines of the cron time specification.
+
+  <dt>EPG scan timeout in seconds
+  <dd>The multiplex (mux) is tuned for this amount of time at maximum. If EPG data
+      are completed before this limit, the mux is released sooner.
+
+  <dt>Checkbox list
+  <dd>Checkbox list to enable/disable available modules.
+      By default all grabbers should be enabled.
+ </dl>
  
  <h3>External interfaces</h3>
  <p>

docs/html/config_esfilter.html

@@ -1,7 +1,7 @@
 <div class="hts-doc-text">
 
 This table defines rules to filter and order the elementary streams
-like video or audio from the input feed.
+(PIDs) like video or audio from the input feed.
 
 <p>
 The execution order of commands is granted. It means that first rule
@@ -67,9 +67,17 @@ The columns have the following functions:
   <dt>CA Provider
   <dd>The CA provider to compare. Empty field means any.
 
+  <dt>Stream Index
+  <dd>The logical stream index to compare. Note that this index is computed
+      using all filters. Example: If filter is set to AC3 audio type and
+      the language to 'eng' and there are two AC3 'eng' streams in
+      the service, the first stream could be identified using number 1
+      and the second using number 2.
+
   <dt>PID
   <dd>Program identification (PID) number to compare. Zero means any.
-      This comparison is processed only when service comparison is active.
+      This comparison is processed only when service comparison is active
+      and for the Conditional Access filter.
 
   <dt>Action
   <dd>The rule action defines the operation when all comparisons succeeds.
@@ -82,10 +90,20 @@ The columns have the following functions:
       <dt>USE
       <dd>Use this elementary stream.
 
-      <dt>ONCE
-      <dd>Use this elementary stream only once per service type.
-          The language is distinguished, too.
-          The first successfully compared rule wins.
+      <dt>ONE_TIME
+      <dd>Use this elementary stream only one time per service type (like
+          video, audio, subtitles) and language. The first sucessfully
+          compared rule wins. For example, when one AC3 elementary stream
+          is marked to be used with 'eng' language and another rule with
+          the ONE_TIME action was matched, the new AC3 elementary stream
+          will not be added if the language for new AC3 elementary stream
+          is 'eng'. Note that the second rule might not have the language
+          filter (column) set.
+          <p>
+          For the CA filter, this rule means that the new CA elementary stream
+          is added only if another CA is not already used.
+          </p>
+          
 
       <dt>EXCLUSIVE
       <dd>Use only this elementary stream. No other elementary streams

docs/html/config_misc.html

@@ -1,6 +1,8 @@
 <div class="hts-doc-text">
 
- <img src="docresources/configgeneraltab.png">
+ <img src="docresources/configgeneraltab1.png">
+ <br>
+  <img src="docresources/configgeneraltab2.png">
  
  <p>
  This tabs allow configuration of several general parameters that affect the
@@ -58,16 +60,44 @@
     <dt>Update tolerance (milliseconds)</dt>
     <dd>Only update the system clock (doesn't affect NTP driver) if the delta
     between the system clock and DVB time is greater than this. This can help
-    stop horrible oscillations on the system clock.</dd>
+    stop excessive oscillations on the system clock.</dd>
 
+   <br><br>
+   <hr>
+   <b>Picon</b>
+   <hr>
+
+   <dd>Picons (from p ersonal icons) are collections of similar icons that can be automatically
+   matched against your channels based on a number of technical parameters that will uniquely 
+   define a channel. The use of these parameters (e.g. mux, frequency, orbital position) 
+   removes the ambiguity of using names - it's not case sensitive, it doesn't care if there 
+   are spaces or not, and so on.
+
+   You can generate picons yourself from existing images, or you can usually find sets 
+   pre-made on the Internet if you search for them. They're a good way to get large numbers 
+   of icons matched quickly, and usually in a similar style (such as square, x * y pixels, with 
+   a consistent highlight/reflection effect).</dd>
+
+   <dl>
+    <dt>Prefer picons over channel name:</dt>
+    <dd>If both a picon and a channel-specific (e.g. channelname.jpg) icon are defined, use the picon.</dd>
+ 
+    <dt>Channel icon path</dt>
+    <dd>Path to an icon for this channel. This can be named however you wish, as a local (file://) or remote (http://) image. 
+        The following placeholders are available:<br>
+	<ul>
+		<li>%C - the transliterated channel name in ASCII (safe characters, no spaces etc.)</li>
+		<li>%c - the channel name (URL encoded ASCII)</li>
+	</ul>
+	Example: file:///tmp/icons/%C.png or http://example.com/%c.png</dd>
+  
+    <dt>Picon path</dt>
+    <dd>Path to a directory (folder) containing your picon collection. This can be named however 
+    you wish, as a local (file://) or remote (http://) location - however, remember that it's pointing 
+    to a directory as the picon names are automatically generated from the service parameters 
+    frequency, orbital position, etc.).<br>
+    Example: file:///home/hts/picons</dd>
   </dl>
-
-  <br><br>
-  <hr>
-  <b>Transcoding</b>
-  <hr>
-
-  <dd>If enabled at build time (src/plumbing/transcoding.c), this allows you to switch transcoding support on and off.</dd>
   
   <br><br>
   <hr>
@@ -101,5 +131,72 @@
 
   </dl>
 
+  <br><br>
+  <hr>
+  <b>SAT&gt;IP Server</b>
+  <hr>
+
+  <dd>SAT&gt;IP Server is something like DVB network tuner. TVHeadend can
+  forward mpegts input streams including on-the-fly descramling to SAT&gt;IP
+  clients.</dd>
+
+  <dd>Only networks with the "SAT>IP Source" field set are exported
+  through the SAT&gt;IP protocol. This field is matched through the "src"
+  parameter asked from the SAT>IP client. Usually (and by default) this value is 1.
+  For satellite tuners, this value determines the satellite source (dish).
+  By specification position 1 = DiseqC AA, 2 = DiseqC AB, 3 = DiseqC BA,
+  4 = DiseqC BB, but any numbers may be used - depends on the SAT&gt;IP client.
+  Note that if you use a similar number for multiple networks, the first matched
+  network containing the mux with requested parameters will win
+  (also for unknown mux).</dd>
+
+  <dl>
+
+  <dt>RTSP Port
+  <dd>
+  Select RTSP port (TCP) for realtime commands from SAT&gt;IP clients. Usually
+  (as defined in the specification) this port is 554. But as extension,
+  TVHeadend can use any TCP port value (which is default 9983 for non-root
+  users). But the SAT&gt;IP client must allow to set this value (TVHeadend
+  client will obtain the RTSP port number automatically using the XML
+  description). If the RTSP port value is zero, the SAT&gt;IP server
+  functionality is not enabled.
+
+  <dt>Subscription Weight
+  <dd>
+  Subscription weight value. Default value is 100 (standard streaming). Note
+  that the default value for DVR is 300 (normal priority).
+
+  <dt>Descramble Services
+  <dd>
+  The maximum limit of services descrambled per a mux. If zero, the
+  descrambling functionality is disabled.
+
+  <dt>Muxes Handling
+  <dd>
+  When SAT&gt;IP client requests new mux configuration, tvheadend can handle it
+  in three ways. The auto (0) configuration means that if the mux does not exists,
+  a temporary mux is created and removed when the client closes the
+  connection. The keep (1) configuration will remember all successfuly scanned muxes.
+  The reject (2) configuration will reject unknown muxes.
+
+  <dt>Exported DVB-T/T2 Tuners
+  <dd>
+  Exported DVB-T/T2 tuners - streaming instances.
+
+  <dt>Exported DVB-S/S2 Tuners
+  <dd>
+  Exported DVB-S/S2 tuners - streaming instances.
+
+  <dt>Exported DVB-C/C2 Tuners
+  <dd>
+  Exported DVB-C/C2 tuners - streaming instances.
+
+  <dt>Exported ATSC/DVB-C(AnnexB) Tuners
+  <dd>
+  Exported ATSC/DVB-C(AnnexB) - streaming instances.
+
+  </dl>
+
  </dl>  
 </div>

docs/html/config_muxes.html

@@ -0,0 +1,136 @@
+<div class="hts-doc-text">
+	<p>
+		Muxes are locations at which services can be found. On traditional networks (DVB-C, -T and -S), these are carrier signals on which the individual channels are multiplexed, hence the name. However, Tvheadend also uses the term 'mux' to describe a source for multiple IP streams - so an IP address, in effect.
+	</p>
+ 	<p>
+ 		<img src="docresources/configdvbmux.png">
+	</p>
+ 	
+ 	The columns have the following functions:
+
+ 	<dl>
+
+		<dt>Play
+		<dd>Downloads a playlist file (M3U or XSPF, depending on your startup options) so you can tune to the mux from an external application.
+
+  		<dt>Enabled
+		<dd>Whether or not the mux is enabled and thus available.
+
+		<dt>EPG
+		<dd>EPG scan setup
+
+			<dl>
+				<dt>Disable
+				<dd>Disable the EPG scan
+
+				<dt>Enable (auto)
+				<dd>Enable the EPG scan (when some services from this mux are assigned to channels)
+
+				<dt>Force (auto)
+				<dd>Force the EPG scan (everytime when the EPG scan is triggered)
+
+				<dt>Only EIT
+				<dd>Do only EIT EPG scan (when some services from this mux are assigned to channels)
+
+				<dt>Only UK Freesat
+				<dd>Do only UK Freesat EPG scan (when some services from this mux are assigned to channels)
+
+				<dt>Only UK Freeview
+				<dd>Do only UK Freeview EPG scan (when some services from this mux are assigned to channels)
+
+				<dt>Only Viasat Baltic
+				<dd>Do only Viasat Baltic EPG scan (when some services from this mux are assigned to channels)
+
+				<dt>Only OpenTV Sky UK
+				<dd>Do only OpenTV Sky UK EPG scan (the TSID must match in the skyuk configuration file)
+
+				<dt>Only OpenTV Sky Italia
+				<dd>Do only OpenTV Sky Italia EPG scan (the TSID must match in the skyit configuration file)
+
+				<dt>Only OpenTV Sky Ausat
+				<dd>Do only OpenTV Sky Ausat EPG scan (the TSID must match in the ausat configuration file)
+
+			</dl>
+
+		<dt>Network
+		<dd>The name of the network to which the mux belongs. Networks are defined in Configuration -> DVB Inputs -> Networks - DVB-S or ATSC, for example.
+
+		<dt>Original Network ID
+		<dd>The ONID is a code which uniquely identifies a network.
+
+		<dt>Transport Stream ID
+		<dd>The TSID is a code which identifies the network origination source or transmitter.
+
+		<dt>CRID Authority
+		<dd>The group responsible for the Content Reference Identifier for this mux. This is effectively a URL/URI to an authoritative source for programme data (e.g. series link).				
+
+		<dt>Scan Status
+		<dd>Whether the mux is being scanned (ACTIVE), is planned to be scanned (PEND) or has reverted to idle scan (IDLE).
+
+		<dt>Scan Result
+		<dd>Whether there were any problems with the last scan of this mux.	
+
+		<dt>URL
+		<dd>Mux URL.
+
+			<dl>
+				<dt>udp://
+				<dd>Raw MPEG-TS UDP packets
+
+				<dt>rtp://
+				<dd>MPEG-TS UDP packets with RTP header
+
+				<dt>http://
+				<dd>HTTP stream (MPEG-TS)
+
+				<dt>https://
+				<dd>Secure HTTP stream (MPEG-TS)
+
+				<dt>pipe://
+				<dd>Read standard output from an external program.
+				    If the program name does not have the first
+				    character '/', the PATH environment variable
+				    is used to find the program name in all
+				    directories specified by PATH.
+				    Additional arguments may be separated
+				    using spaces. A raw MPEG-TS stream is
+				    expected. The string ${service_name}
+				    is substituted with the service name
+				    field contents. The \ (backslash) character means
+				    "take the next character asis" (usually
+				    space or the backslash itself.
+
+			</dl>
+                
+		<dt># Services
+		<dd>The number of services found on this mux.
+
+		<dt>Character Set
+		<dd>The character encoding for this mux (e.g. UTF-8).
+		
+		<dt>PMT Descriptor 0x06 = AC-3
+		<dd>Whether or not the empty PMT descriptor 0x06 defaults to
+		    the AC-3 stream. Some Chinese cable providers are using
+		    this. If unsure, keep this off.
+
+		<dt>Interface
+		<dd>IPTV : the network interface/card on which the IPTV source can be found.
+
+		<dt>ATSC
+		<dd>whether or not this is an ATSC IPTV source.
+
+                <dt>Priority
+                <dd>IPTV : The mux priority value (higher value = higher priority to use services from this mux). Value 0 means use the IPTV network priority value.
+
+                <dt>Streaming Priority
+                <dd>IPTV : The mux priority value for streamed channels through HTTP or HTSP (higher value = higher priority to use services from this mux). Value 0 means use the standard streaming network priority value.
+
+                <dt>Environment (pipe)
+                <dd>IPTV : List of environment variables for pipe (like PATH=/bin:/sbin)
+                    separated by spaces. The backslash character is handled like
+                    in URL.
+                    
+                <dt>Respawn (pipe)
+                <dd>IPTV : Respawn the executed process when it dies.
+ 	</dl>
+</div>

docs/html/config_muxsched.html

@@ -0,0 +1,28 @@
+<div class="hts-doc-text">
+	<p>
+		Mux Schedulers enable Tvheadend to automatically play channels.
+		This is useful to get EPG, services or access rights updates.
+	</p>
+ 	<p>
+ 		<img src="docresources/configdvbmuxsched.png">
+	</p>
+ 	
+ 	The columns have the following functions:
+
+ 	<dl>
+  		<dt>Enabled
+		<dd>If selected, schedule will be triggered.
+			If unselected, schedule will be ignored.
+
+		<dt>Mux
+		<dd>Select mux to be played from the available muxes.
+
+		<dt>Cron
+		<dd>Schedule frequency, using cron syntax. 
+		<dd>Example : every day at 2am is : 0 2 * * *
+
+		<dt>Timeout
+		<dd>Time in seconds the selected mux will be played.
+		<dd>Example : 1 hour would be 3600.
+ 	</dl>
+</div>

docs/html/config_networks.html

@@ -0,0 +1,115 @@
+<div class="hts-doc-text">
+	<p>
+		A network is the type of carrier for your television signals. Tvheadend supports several different types of network, notably:
+		<dl>
+		<li><b>DVB-C</b> : Cable TV, delivered via a cable to your house
+		<li><b>DVB-S</b> : Satellite (includes S2), so any signal coming in via a dish
+		<li><b>DVB-T</b> : Terrestrial, so over-the-air broadcasts received through a traditional television aerial
+		<li><b>ATSC</b> : Over-the-air terrestrial, common in north and central America and parts of south Asia
+		<li><b>IPTV</b> : IP, so over the Internet
+		</dl>
+	</p>
+ 	<p>
+ 		<img src="docresources/configdvbnetwork.png">
+	</p>
+<br>
+<hr>
+<b>Buttons</b>
+<hr>
+Buttons have the following functions:
+<br><br>
+<dl>
+  <dt><b>Add</b>
+  <dd>
+  Add a new network. You can choose from any of the types described above.
+  <p>
+  <dt><b>Delete</b>
+  <dd>
+  Delete an existing network. This will also remove any association with an adapter.
+  <p>
+  <dt><b>Edit</b>
+  <dd>
+  Edit an existing network. This allows you to change any of the parameters you'd otherwise set when adding a new network, e.g. network discovery, idle scan, etc. - similar to using the check boxes to enable/disable functions.
+  <p>
+  <dt><b>Save</b>
+  <dd>
+  Saves any changes.
+  <p>
+  <dt><b>Undo</b>
+  <dd>
+  Undoes any changes.
+  <p>
+  </dl>
+<p>
+	<br>
+	<hr>
+	<b>Columns</b>
+	<hr>
+ 	The columns have the following functions:
+
+ 	<dl>
+  		<dt><b>Network Name</b>
+		<dd>The name of the network. This can be set automatically or you can give it a name that means something to you (e.g. if you have multiple OTA networks).
+		<p>	
+		<dt><b>Network Discovery</b>
+		<dd>Whether automatic discovery is enabled for this network, i.e. whether Tvheadend looks for muxes or simply stays with the list of muxes as defined initially.
+<p>
+		<dt><b>Skip initial Scan</b>
+		<dd>Don't scan all muxes in this network at Tvheadend start.
+		The initial scan procedure is not a blind scan. Only known muxes
+		registered to this network are scanned. If Network Discovery
+		is enabled and new muxes are discovered using DVB
+		descriptors, these muxes will be scanned too.
+<p>
+		<dt><b>Idle Scan Muxes</b>
+		<dd>When nothing else happens Tvheadend will continuously rotate among all muxes and tune to them to verify that they are still working
+		    when the inputs are not used for streaming. If your adapter have problems with lots of (endless) tuning, try to disable this.
+		    Note that this option should be OFF for the normal operation. This type of mux probing is not required and
+		    it may cause issues for SAT>IP (limited number of PID filters).
+<p>
+		<dt><b>Ignore Provider's Channel Numbers</b>
+		<dd>Some providers will try to set a channel number so that every receiver is consistent - "tune to Channel x on 150". This option allows you to ignore this and let tvhheadend allocate a channel number itself.
+<p>
+		<dt><b>Max Input Streams</b>
+		<dd>IPTV : maximum simultaneous streams that can be played.
+<p>
+		<dt><b>Max Bandwidth</b>
+		<dd>IPTV : maximum bandwidth allowed for streams. 
+<p>
+		<dt><b>Max timeout</b>
+		<dd>IPTV : maximum timeout trying to play stream.
+<p>
+		<dt><b>Network ID</b>
+		<dd>If you experience problems caused by overlaps between multiple network
+  providers this option can be used to filter which network ID is received
+  by a given adapter.
+<p>
+		<dt><b>Ignore Provider's Channel Numbers</b>
+		<dd>Do not use the local channel numbers defined by provider.
+<p>
+		<dt><b>SAT&gt;IP Source Number</b>
+		<dd>This field is matched through the "src" parameter asked from the
+		    SAT&gt;IP client. Usually (and by default) this value is 1.
+                    For satellite tuners, this value determines the satellite source (dish).
+                    By specification position 1 = DiseqC AA, 2 = DiseqC AB, 3 = DiseqC BA,
+                    4 = DiseqC BB, but any numbers may be used - depends on the SAT&gt;IP
+                    client. Note that if you use same number for multiple networks,
+                    the first matched network containing the mux with requested parameters
+                    will win (also for unknown mux). If this field is set to zero,
+                    the network cannot be used by the SAT&gt;IP server.</dd>
+<p>
+		<dt><b>EIT Local Time</b>
+		<dd>EPG (EIT) events uses local time instead UTC.
+<p>
+		<dt><b>Character Set</b>
+		<dd>The character encoding for this network (e.g. UTF-8).
+<p>
+		<dt><b>Priority</b>
+		<dd>IPTV : The network priority value (higher value = higher priority to use muxes/services from this network).
+<p>
+		<dt><b>Streaming Priority</b>
+		<dd>IPTV : The network priority value for streamed channels through HTTP or HTSP (higher value = higher priority to use muxes/services from this
+                    network). If not set, the standard network priority value is used.
+
+ 	</dl>
+</div>

docs/html/config_services.html

@@ -0,0 +1,83 @@
+<div class="hts-doc-text">
+	<p>
+		Services are automatically pulled from muxes and can be mapped to Channels.
+	</p>
+ 	<p>
+ 		<img src="docresources/configdvbservices.png">
+	</p>
+ 	
+ 	The columns have the following functions:
+
+ 	<dl>
+		<dt>Play
+		<dd>Opens a playlist (M3U of XSPF, depending on your startup options) to allow you to stream this service to another application, e.g. to watch a channel in VLC.
+
+		<dt>Details
+		<dd>Display details on this service, e.g. PID, streams, audio/video CODECs, languages, etc.			
+
+  		<dt>Enabled
+		<dd>Whether or not this service is available for use
+
+  		<dt>Automatic Checking
+		<dd>Check for the service presence. If service is no longer broadcasted,
+                    this field will become as "Missing In PAT/SDT". The
+                    check can be also disabled for given service using this
+                    column.
+
+		<dt>Priority
+		<dd>Define priority (range 0-10) for this service. The higher value means more preferred.
+		    Note that this value is _added_ to the input (tuner) priority.
+		    Take this in account when you set the input priorities.
+
+		<dt>Channel
+		<dd>The channel to which the service is mapped
+
+		<dt>Service Name
+		<dd>The name of the service, detected when the service was discovered
+
+		<dt>Encrypted
+		<dd>Whether or not the service is scrambled
+
+		<dt>Network
+		<dd>The network on which this service resides (i.e. whether it's a cable channel or a terrestrial one)
+
+		<dt>Mux
+		<dd>The mux which carries this service. This is typically the frequency of the carrier signal in kHz, with polarisation (H or V) as applicable.
+
+		<dt>Service ID
+		<dd>A unique identifier for this service within this mux/transport stream.
+
+		<dt>Local Channel Number 
+		<dd>Channel number as assigned by the broadcaster.
+
+		<dt>Provider
+		<dd>Any supplied provider string, e.g. where multiple broadcasters share a platform, such as for free-to-air and pay TV.
+
+		<dt>CRID Authority
+		<dd>The group responsible for the Content Reference Identifier for this service. This is effectively a URL/URI to an authoritative source for programme data (e.g. series link).
+
+		<dt>Service Type
+		<dd>The service type flag as defined by the DVB specifications (e.g. 0x02 = radio, 0x11 = MPEG2 HD TV, 0x19 = H.264 HD TV)
+
+		<dt>Pref. CA PID
+		<dd>The Preferred Conditional Access Packet Identifier. Used for decrypting scrambled streams.
+
+		<dt>Lock Pref. CA PID
+		<dd>The locking mechanism selection for The Preferred Conditional Access Packet Identifier.
+		<dl>
+		   <dt>Off
+		   <dd>Automatic Preferred Conditional Access Packet Identifier selection.
+		   <dt>On
+		   <dd>Keep Preferred Conditional Access Packet Identifier selection (no automatic modifications allowed).
+		   <dt>Only Pref. CA PID
+		   <dd>Filter mode - use only Preferred Conditional Access Packet Identifier for the streams decryption.
+		</dl>
+
+		<dt>Character Set
+		<dd>The character encoding for this service (e.g. UTF-8).
+
+
+
+		
+ 	</dl>
+</div>

docs/html/config_streamprofile.html

@@ -0,0 +1,41 @@
+<div class="hts-doc-text">
+
+<p>
+<br>
+<hr>
+<b>Buttons</b>
+<hr>
+Buttons have the following functions:
+<br><br>
+<dl>
+  <dt><b>Add</b>
+  <dd>
+  Add a new profile. You can choose from any of the types from the list.
+  <p>
+  <dt><b>Delete</b>
+  <dd>
+  Delete an existing profile.
+  <p>
+  <dt><b>Save</b>
+  <dd>
+  Saves any changes.
+  <p>
+  <dt><b>Undo</b>
+  <dd>
+  Undoes any changes.
+  <p>
+  </dl>
+
+<p>
+<br>
+<hr>
+<b>Columns</b>
+<hr>
+The columns have the following functions:
+
+<dl>
+  <dt><b>Stream Profile Name</b>
+  <dd>This column contains the name of Stream Profile.
+
+ </dl>
+</div>

docs/html/config_tags.html

@@ -7,12 +7,12 @@
  Tags are used to define a set of channels.
  Notice that nothing prohibits a channel to be a member of multiple tags.
  Also, there is no requirement to configure tags for running Tvheadend 
- itself. It is, however, required if you run Tvheadend together with Showtime.
+ itself. It is, however, required if you run Tvheadend together with Movian.
  <p>
  The tag-sets are used for:
  <ul>
   <li>Searches in the EPG.
-  <li>Display of channel groups in the Showtime Media player.
+  <li>Display of channel groups in the Movian Media player.
  </ul>
 
  <p>
@@ -48,9 +48,16 @@
       automatic recordings, groups, etc.
 
   <dt>Internal
-  <dd>Tags are exported via HTSP (to the Showtime Media player) and used
-      there for grouping of TV channels. If you do not wish to export a
-      tag you can flag it as internal only.
+  <dd>Tags are exported via HTSP/HTTP and used there for grouping of
+      TV channels. If you do not wish to export a tag you can flag
+      it as internal only.
+
+  <dt>Private
+  <dd>Tags are exported via HTSP/HTTP and used there for grouping of TV
+      channels. If you do not wish to export a tag to other users you can
+      flag it as private only. Only users with this tag configured
+      in the access configuration (or users with not set tags) can
+      use it.
 
   <dt>Icon
   <dd>Full path to an icon used to depict the tag. This can be a TV network

docs/html/config_timeshift.html

@@ -36,6 +36,11 @@
       specify an unlimited period its highly recommended you specifying a value
       here.
 
+  <dt>Max. RAM Size (MegaBytes)
+  <dd>Specifies the maximum RAM (system memory) size for timeshift buffers.
+      When free RAM buffers are available, they are used instead storage to
+      save the timeshift data.
+
   <dt>Unlimited:
   <dd>If checked, this allows the combined size of all timeshift buffers to
       potentially grow unbounded until your storage media runs out of space

docs/html/config_tvadapters.html

@@ -8,68 +8,167 @@
       you only have to click once in it.
 </ul>
 </p>
-
-<h4>The rows have the following functions</h4>
-
+<p>
+ 		<img src="docresources/configtvadapters.png">
+	</p>
+<br>
+<hr>
+<b>Rows</b>
+<hr>
+The rows have the following functions
+<br><br>
+<dt><u><i><b>Basic Settings</b></i></u></dt>
 <dl>
-  <dt>Enabled</dt>
-  <dd>If selected, the IPTV service will be enabled an use for channel
-      subscriptions.</dd>
-
-  <dt>Name</dt>
+  <dt><b>Enabled</b></dt>
+  <dd>If selected, this tuner/adapter will be enabled and will become available to receive broadcasts or programmes.</dd>
+<p>
+  <dt><b>Name</b></dt>
   <dd>The name of this tuner.</dd>
-
-  <dt>Priority</dt>
+<p>
+  <dt><b>Over-the-Air EPG</b></dt>
+  <dd>Enable over-the-air programme guide (EPG) scanning on this input device.</dd>
+<p>
+  <dt><b>Networks</b></dt>
+  <dd>Associate this device with one or more networks.</dd>
+ <p>
+ </dl>
+ <dt><u><i><b>Advanced Settings</b></i></u></dt>
+ <dl>
+  <dt><b>Priority</b></dt>
   <dd>The tuner priority value (higher value = higher priority to use this
       tuner).</dd>
-
+<p>
+  <dt><b>Streaming Priority</b></dt>
+  <dd>The tuner priority value for streamed channels through HTTP or HTSP
+      (higher value = higher priority to use this tuner). If not set (zero),
+      the standard priority value is used.</dd>
+<p>
+  <dt><b>Init Scan</b></dt>
+  <dd>Allow the initial scan tuning on this device. See to
+  Skip initial Scan in the network settings for the further description.</dd>
+<p>
+  <dt><b>Idle Scan</b></dt>
+  <dd>Allow the idle scan tuning on this device.</dd>
+<p>
+  <dt><b>Linked Input</b></dt>
+  <dd>Always make alive also the linked input. The subscriptions are named as "keep".</dd>
 </dl>
-</p>
+</p>     
 
-<h4>LinuxDVB specific rows</h4>
+<br>
+<hr>
+<b>LinuxDVB Specific Rows</b>
+<hr>
 
 <dl>
-  <dt>Keep FE open</dt>
-  <dd>Enable to not close the LinuxDVB frontend device in the idle state.</dd>
-</dl>      
+ <dt><b>Power Save</b></dt>
+  <dd>If enabled, allows the tuner to go to sleep when idle.</dd>
+<p>
+ <dt><b>Tune Before DiseqC</b></dt>
+  <dd>If set, one tune request (setup) is proceed before the DiseqC
+      sequence (voltage, tone settings). Some linux drivers require this
+      procedure.</dd>
+<p>
+ <dt><b>Tune Repeats</b></dt>
+  <dd>If set, the tune requests are repeated using this number. Zero means
+      one tune requests, one two tune requests etc.</dd>
+<p>
+ <dt><b>Skip Initial Bytes</b></dt>
+  <dd>If set, first bytes from the MPEG-TS stream are discarded. It may be
+      required for some drivers / hardware which does not flush completely
+      the MPEG-TS buffers after a frequency/parameters change.</dd>
+<p>
+ <dt><b>Input Buffer (Bytes)</b></dt>
+  <dd>By default, linuxdvb input buffer is 18800 bytes long. The accepted
+      range is 18800-1880000 bytes.</dd>
+<p>
+ <dt><b>Status Period</b></dt>
+  <dd>By default, linuxdvb status read period is 1000ms (one second). The
+      accepted range is 250ms to 8000ms. Note that for some hardware /
+      drivers (like USB), the status operations takes too much time and CPU.
+      In this case, increase the default value. For fast hardware, this value
+      might be descreased to make the decision of the re-tune algorithm
+      based on the signal status faster.</dd>
+<p>
+ <dt><b>Force old status</b></dt>
+  <dd>Always use the old ioctls to read the linuxdvb status (signal strenght,
+      SNR, error counters). Some drivers are not matured enough to provide
+      the correct values using the new v5 linuxdvb API.</dd>
+</dl>
 
-<h4>SAT>IP specific rows</h4>
+<br>
+<hr>
+<b>LinuxDVB Satellite Config Rows</b>
+<hr>
 
 <dl>
-  <dt>Full Mux Rx mode supported</dt>
-  <dd>Enable, if the SAT>IP box supports the full mux rx mode (pids=all)
-      parameter.</dd>
-      
-  <dt>Signal scale (240 or 100)</dt>
-  <dd>Some SAT>IP boxes has only 0-100 scale. If your signal is too low, try
-      value 100 here.</dd>
-      
-  <dt>Maximum PIDs<dt>
+ <dt><b>DiseqC repeats</b></dt>
+  <dd>Number of repeats for the DiseqC commands (default is zero - no DiseqC repeats).</dd>
+<p>
+ <dt><b>Full DiseqC</b></dt>
+  <dd>Always sent the whole DiseqC sequence including LNB setup (voltage, tone).
+      If this is not checked, only changed settings is set. It may cause
+      issues with some drivers. If the tuning is not reliable, try to
+      activate this option.</dd>
+<p>
+ <dt><b>Turn off LNB when idle</b></dt>
+  <dd>Turn off LNB when it is not used. It may save some power.</dd>
+<p>
+ <dt><b>Switch Then Rotor</b></dt>
+  <dd>If the DiseqC switch is before rotor (tuner - switch - rotor), enable this.</dd>
+<p>
+ <dt><b>Init Rotor Time (seconds)</b></dt>
+  <dd>Upon new start, tvheadend does not know the last rotor position. This
+      value defined the initial rotor movement. TVHeadend waits the
+      specified seconds when the first movement is requested.</dd>
+ <dt><b>Min Rotor Time (seconds)</b></dt>
+  <dd>The minimum delay after the rotor movement command is send.</dd>
+</dl>
+
+<p>
+<br>
+<hr>
+<b>SAT>IP Specific Rows</b>
+<hr>
+
+<dl>
+  <dt><b>Full Mux Rx mode supported</b></dt>
+  <dd>Enable if the SAT>IP box supports the full mux rx mode (pids=all)<br>
+	note: no comma after 'Enable'</dd>
+      <p>
+  <dt><b>Signal scale (240 or 100)</b></dt>
+  <dd>Some SAT>IP boxes only report a 0-100 (percentage) signal strength. If your signal strength reports as too low, try
+setting this to 100.</dd>
+     <p> 
+  <dt><b>Maximum PIDs</b><dt>
   <dd>Maximum supported PIDs in the filter of the SAT>IP box.</dd>
-  
-  <dt>Maximum length of PIDs<dt>
+  <p>
+  <dt><b>Maximum length of PIDs</b><dt>
   <dd>Maximum length in characters for the command setting PIDs to the
       SAT>IP box.</dd>
-
-  <dt>addpids/delpids supported</dt>
-  <dd>Enable, if the SAT>IP box supports the addpids/delpids command.
-
-  <dt>PIDs in setup</dt>
+<p>
+  <dt><b>Addpids/delpids supported</b></dt>
+  <dd>Enable if the SAT>IP box supports the addpids/delpids command.
+<p>
+  <dt><b>PIDs in setup</b></dt>
   <dd>Enable, if the SAT>IP box requires pids=0 parameter in the SETUP RTSP command.</dd>
-
-  <dt>Force pilot for DVB-S2</dt>
+<p>
+  <dt><b>Double RTSP Shutdown</b></dt>
+  <dd>Enable, if the SAT>IP box might require to send twice the RTSP SHUTDOWN command.</dd>
+<p>
+  <dt><b>Force pilot for DVB-S2</b></dt>
   <dd>Enable, if the SAT>IP box requiest plts=on parameter in the SETUP RTSP
       command for DVB-S2 muxes.</dd>
-
-  <dt>UDP RTP Port Number (2 ports)</dt>
+<p>
+  <dt><b>UDP RTP Port Number (2 ports)</b></dt>
   <dd>Force the local UDP Port number here. The number should be even (RTP port).
       The next odd number (+1) will be used as the RTCP port.</dd>
-
-  <dt>Satellite Positions</dt>
+<p>
+  <dt><b>Satellite Positions</b></dt>
   <dd>Select the number of satellite positions supported by the SAT>IP
       hardware and your coaxial cable wiring.</dd>
-
-  <dt>Master Tuner</dt>
+<p>
+  <dt><b>Master Tuner</b></dt>
   <dd>Select the master tuner.
      <p>The signal from the standard universal LNB can be split using
         a simple coaxial splitter (no multiswitch) to several outputs.
@@ -79,21 +178,22 @@
         a slave one and tvheadend will assure that this tuner will not
         use incompatible parameters (position, polarization, lo-hi).</p>
   </dd>
-
-  <dt>Next tune delay in ms (0-2000)</dt>
+<P>
+  <dt><b>Next tune delay in ms (0-2000)</b></dt>
   <dd>The delay before tuning in milliseconds after tuner stop. If the time
       after previous start and next start is greater than this value -
       the delay is not applied.</dt>
-
-  <dt>Send full PLAY cmd</dt>
+<p>
+  <dt><b>Send full PLAY cmd</b></dt>
   <dd>Send the full RTSP PLAY command after full RTSP SETUP command. Some
       device firmwares requires this to get MPEG-TS stream.</dd>
-
-  <dt>Force teardown delay<dt>
+<p>
+  <dt><b>Force teardown delay</b><dt>
   <dd>Force the delay between RTSP TEARDOWN and RTSP SETUP command (value
       from 'Next tune delay in ms' is used). Some devices are not able to handle
       quick continuous tuning.</dd>
 
 </dl>
+</p>
 
 </div>

docs/html/config_tvhlog.html

@@ -24,5 +24,15 @@
   <dd></dd>
 
  </dl>
- Changes to any of these settings must be confirmed by pressing the 'Save configuration' button before taking effect.
+ <p>
+ Changes to any of these settings must be confirmed by pressing
+ the 'Save configuration' button before taking effect.
+ </p>
+ <p>
+ Note that the settings is not saved to a storage. It is available
+ only until the actual tvheadend process is running. If you like to change the
+ default behaviour permanently, use the command line options like -l,
+ --debug, --trace. This configuration is stored usually in the /etc/sysconfig
+ tree (depending on the distribution) or an init script.
+ <p>
 </div>

docs/html/dvr_autorec.html

@@ -1,5 +1,118 @@
-<div class="hts-doc-section">Automatic recordings</div>
 <div class="hts-doc-text">
-is niiice.
-
+This tab is used to create and maintain Digital Video Recorder rules. These can be EPG-driven (such as those created from the initial EPG tab) through the DVR AutoRec Entries tab , or can be timer-based through the Time Schedules tab.
+<br>
+<br>
+This tab controls EPG-driven recording rules.
+<p>
+<img src="docresources/dvrautorecentries.png">
+</p>
+<p>
+<br>
+<hr>
+<b>Buttons</b>
+<hr>
+Buttons have the following functions:
+<br><br>
+<dl>
+<dt><b>Add</b>
+<dd>
+Add and configure a recording rule - define the channel, schedule, DVR configuration, priority, etc.
+<p>
+<dt><b>Delete</b>
+<dd>
+Delete an existing recording rule.
+<p>
+<dt><b>Edit</b>
+<dd>
+Manually edit an existing recording rule. This uses the same fields as <b>Add</b>, but they're pre-populated with their current values.
+<p>
+<dt><b>Save</b>
+<dd>
+Saves any changes made to the recording rule list.
+<p>
+<dt><b>Undo</b>
+<dd>
+Undoes any changes made to the recording rules list (any changed fields will be marked with a small red triangle).
+<p>
+</dl>
+<p>
+<br>
+<hr>
+<b>Columns</b>
+<hr>
+The columns have the following functions:
+<br><br>
+<dl>
+<dt><b>Enabled</b>
+<dd>
+Check or clear this box to enable or disable this rule.
+<p>
+<dt><b>Name</b>
+<dd>
+The name you've given to the rule, e.g. 'Stuff involving Jeremy Clarkson'.
+<p>
+<dt><b>Directory</b>
+<dd>
+When specified, this setting overrides the subdirectory rules (except the base directory) specified by the DVR configuration
+and puts all recordings done by this entry into the specified subdirectory. Useful for e.g. recording multiple different news
+broadcasts into one common subdirectory called "News". The backshlash and other special characters are escaped, so it is possible
+to create only one sublevel subdirectories (the base path for the target directory is always taken from the DVR configuration).
+<p>
+<dt><b>Title (Regexp)</b>
+<dd>
+The title of the programme to look for. Note that this accepts case-insensitive regular expressions, so you can use pattern matching as Tvheadend scans the EPG for programmes to record.
+<p>
+<dt><b>Fulltext</b>
+<dd>
+When the fulltext is checked, the title pattern is matched against title,
+subtitle, summary and description.
+<p>
+<dt><b>Channel</b>
+<dd>
+The channel on which this rule applies, i.e. the channel you're aiming to record.
+<p>
+<dt><b>Channel Tag</b>
+<dd>
+A channel tag (e.g. a group of channels) on which this rule applies.
+<p>
+<dt><b>Content Type</b>
+<dd>
+The content type (Movie/Drama, Sports...) to be used to filter matching events/programmes.
+<p>
+<dt><b>Minimal Duration</b>
+<dd>
+The minimal duration of a matching event - in other words, only match programmes that are no shorter than this duration.
+<p>
+<dt><b>Maximal Duration</b>
+<dd>
+The maximal duration of a matching event - in other words, only match programmes that are no longer than this duration.
+<p>
+<dt><b>Week Days</b>
+<dd>
+On which specific days of the week to find matching programmes.
+<p>
+<dt><b>Start After</b>
+<dd>
+An event which starts between this "start after" and "start before" will be matched (including boundary values).
+<p>
+<dt><b>Start Before</b>
+<dd>
+An event which starts between this "start after" and "start before" will be matched (including boundary values).
+<p>
+<dt><b>Priority</b>
+<dd>
+The priority of any recordings set because of this rule: important, high, normal, low, unimportant.
+<p>
+<dt><b>DVR Configuration</b>
+<dd>
+The DVR configuration (e.g. extra start/stop time, post-processing rules) to be used for any recordings set because of this rule.
+<p>
+<dt><b>Creator</b>
+<dd>
+The creator of the rule. Automatically set.
+<p>
+<dt><b>Comment</b>
+<dd>
+A free-text comment. Not used otherwise.
+<p>
 </div>

docs/html/dvr_failed.html

@@ -0,0 +1,82 @@
+<div class="hts-doc-text">
+This tab show your all failed recordings.
+
+<p>
+<img src="docresources/failedrecordings1.png">
+</p>
+<p>
+<br>
+<hr>
+<b>Buttons</b>
+<hr>
+Buttons have the following functions:
+<br><br>
+<dl>
+  <dt><b>Delete</b>
+  <dd>
+  If clicked delete selected failed recordings you delete recordings. Before deleted show message: Do you really want to delete the selection ? Answer Yes or No.
+<p>
+  <dt><b>Download</b>
+  <dd>
+  Click this button to download the selected failed recordings to a local disk. You will be prompted to select the path for the saved file(s).
+</dl>
+<p>
+<br>
+<hr>
+<b>Columns</b>
+<hr>
+The columns have the following functions:
+<br><br>
+ <dl>
+  <dt><b>Details</b>
+  <dd>
+  Show red status and blue icon "i". After click on icon "i" you see info about select failed recordings.
+ <p>
+ <img src="docresources/failedrecordings2.png">
+  <p>
+  <dt><b>Play</b>
+  <dd>
+  Can play selected record in web browser by VLC Plugin or other external player.
+  <p>
+  <dt><b>Title</b>
+  <dd>
+  Showing title of record.
+ <p>
+ <dt><b>Episod</b>
+  <dd>
+  Showing number episod of record.
+ <p>
+ <dt><b>Scheduled Start Time</b>
+  <dd>
+  Showing date and time when the recording was started.
+ <p>
+ <dt><b>Scheduled Stop Time</b>
+  <dd>
+  Showing date and time when the recording was stoped.
+ <p>
+ <dt><b>Duration</b>
+  <dd>
+  Showing how long it took the recording.
+ <p>
+ <dt><b>File Size</b>
+  <dd>
+  <p>
+  Showing size of file recording.
+  <dt><b>Channel Name</b>
+  <dd>
+  Showing the name of the channel from which the recording was made.
+ <p>
+ <dt><b>Creator</b>
+  <dd>
+  Showing the name of the user who created the recording.
+ <p>
+ <dt><b>Schedule Status</b>
+  <dd>
+  Showing the status info of record.
+ <p>
+ <dt><b>URL</b>
+  <dd>
+  Showing the URL of record.
+ <p>
+
+</div>

docs/html/dvr_finished.html

@@ -0,0 +1,82 @@
+<div class="hts-doc-text">
+This tab show your all finished recordings.
+
+<p>
+<img src="docresources/finishedrecordings1.png">
+</p>
+<p>
+<br>
+<hr>
+<b>Buttons</b>
+<hr>
+Buttons have the following functions:
+<br><br>
+<dl>
+  <dt><b>Delete</b>
+  <dd>
+  If clicked delete selected finished recordings you delete recordings. Before deleted show message: Do you really want to delete the selection ? Answer Yes or No.
+<p>
+  <dt><b>Download</b>
+  <dd>
+  Click this button to download the selected finished recordings to a local disk. You will be prompted to select the path for the saved file(s).
+</dl>
+<p>
+<br>
+<hr>
+<b>Columns</b>
+<hr>
+The columns have the following functions:
+<br><br>
+ <dl>
+  <dt><b>Details</b>
+  <dd>
+  Show green status and blue icon "i". After click on icon "i" you see info about select finished recordings.
+ <p>
+ <img src="docresources/finishedrecordings2.png">
+  <p>
+  <dt><b>Play</b>
+  <dd>
+  Can play selected record in web browser by VLC Plugin or other external player.
+  <p>
+  <dt><b>Title</b>
+  <dd>
+  Showing title of record.
+ <p>
+ <dt><b>Episod</b>
+  <dd>
+  Showing number episod of record.
+ <p>
+ <dt><b>Scheduled Start Time</b>
+  <dd>
+  Showing date and time when the recording was started.
+ <p>
+ <dt><b>Scheduled Stop Time</b>
+  <dd>
+  Showing date and time when the recording was stoped.
+ <p>
+ <dt><b>Duration</b>
+  <dd>
+  Showing how long it took the recording.
+ <p>
+ <dt><b>File Size</b>
+  <dd>
+  <p>
+  Showing size of file recording.
+  <dt><b>Channel Name</b>
+  <dd>
+  Showing the name of the channel from which the recording was made.
+ <p>
+ <dt><b>Creator</b>
+  <dd>
+  Showing the name of the user who created the recording.
+ <p>
+ <dt><b>Schedule Status</b>
+  <dd>
+  Showing the status info of record.
+ <p>
+ <dt><b>URL</b>
+  <dd>
+  Showing the URL of record.
+ <p>
+
+</div>

docs/html/dvr_timerec.html

@@ -0,0 +1,101 @@
+<div class="hts-doc-text">
+This tab is used to create and maintain Digital Video Recorder rules. These can be EPG-driven (such as those created from the initial EPG tab) through the DVR AutoRec Entries tab , or can be timer-based through the Time Schedules tab.
+<br>
+<br>
+This tab controls timer-driven recording rules.
+<p>
+<img src="docresources/timeschedules.png">
+<p>
+<br>
+<hr>
+<b>Buttons</b>
+<hr>
+Buttons have the following functions:
+<br><br>
+<dl>
+<dt><b>Add</b>
+<dd>
+Add and configure a recording rule - define the channel, schedule, DVR configuration, priority, etc.
+<p>
+<dt><b>Delete</b>
+<dd>
+Delete an existing recording rule.
+<p>
+<dt><b>Edit</b>
+<dd>
+Manually edit an existing recording rule. This uses the same fields as Add, but they're pre-populated with their current values.
+<p>
+<dt><b>Save</b>
+<dd>
+Saves any changes made to the recording rule list.
+<p>
+<dt><b>Undo</b>
+<dd>
+Undoes any changes made to the recording rules list (any changed fields will be marked with a small red triangle).
+<p>
+</dl>
+<p>
+<br>
+<hr>
+<b>Columns</b>
+<hr>
+The columns have the following functions:
+<br><br>
+<dl>
+<dt><b>Enabled</b>
+<dd>
+Check or clear this box to enable or disable this rule.
+<p>
+<dt><b>Name</b>
+<dd>
+The name you've given to the rule, e.g. 'Evening cartoons for the children'.
+<p>
+<dt><b>Directory</b>
+<dd>
+When specified, this setting overrides the subdirectory rules specified by the DVR configuration and puts all recordings done by this entry into the specified subdirectory. Useful for e.g. recording multiple different news broadcasts into one common subdirectory called "News".
+<p>
+<dt><b>Title</b>
+<dd>
+The title is used in the filename that is created for the recording
+<br>
+<br>
+The default format string suggests Time-[date]_[time]:
+<br>
+<br>
+The escape-codes use <a href="http://man7.org/linux/man-pages/man3/strftime.3.html">strftime</a> format. Examples:
+<br>
+%F The date in ISO-format (e.g. 2015-02-28)
+<br>
+%R The time in 24h HH:MM format (e.g. 19:45)
+<br>
+%x The date, formatted according to your locale settings
+<p>
+<dt><b>Channel</b>
+<dd>
+The channel on which this rule applies, i.e. the channel you're aiming to record.
+<p>
+<dt><b>Week Days</b>
+<dd>
+On which specific days of the week you wish this rule to be active (e.g. only record channel XXX at xx:yy on Saturdays and Sundays).
+<p>
+<dt><b>Start</b>
+<dd>
+Start recording at this time.
+<p>
+<dt><b>Stop</b>
+<dd>
+Stop recording at this time.
+<p>
+<dt><b>Priority</b>
+<dd>
+The priority of any recordings set because of this rule: important, high, normal, low, unimportant.
+<p>
+<dt><b>DVR Configuration</b>
+<dd>
+The DVR configuration (e.g. extra start/stop time, post-processing rules) to be used for any recordings set because of this rule.
+<p>
+<dt><b>Comment</b>
+<dd>
+A free-text comment. Not used otherwise.
+<p>
+</div>

docs/html/dvr_upcoming.html

@@ -0,0 +1,103 @@
+<div class="hts-doc-text">
+This tab show your all upcoming/current recordings.
+
+<p>
+<img src="docresources/upcomingrecordings1.png">
+</p>
+<p>
+<br>
+<hr>
+<b>Buttons</b>
+<hr>
+Buttons have the following functions:
+<br><br>
+<dl>
+  <dt><b>Add</b>
+  <dd>
+  Add and configure a recording event by hand as opposed to choosing something from the EPG. This is useful if you wish to record something that isn't yet in the EPG, or record at a particular time that perhaps spans several EPG events.
+  <p>
+  <dt><b>Delete</b>
+  <dd>
+  If clicked delete selected upcoming/current recordings you delete recordings. Before deleted show message: Do you really want to delete the selection ? Answer Yes or No.
+  <p>
+  <dt><b>Abort</b>
+  <dd>
+  Abort an already-underway recording. Note that this does not remove the (partial) recording file from disk.
+  <p>
+  <dt><b>Edit</b>
+  <dd>
+  Manually edit an already-scheduled recording event. This uses the same fields as <b>Add</b>, but they're obviously pre-populated with their current values.
+  <p>
+  <dt><b>Save</b>
+  <dd>
+  Saves any changes made to the recording list.
+  <p>
+  <dt><b>Undo</b>
+  <dd>
+  Undoes any changes made to the recording list.
+  <p>
+  </dl>
+<p>
+<br>
+<hr>
+<b>Columns</b>
+<hr>
+The columns have the following functions:
+<br><br>
+ <dl>
+  <dt><b>Details</b>
+  <dd>
+  Shows the status of the recording event:<br>
+  <br>
+  <b>Clock</b> - the recording is scheduled (upcoming).<br>
+  <br>
+  <b>Record symbol (red circle)</b> - the recording is active and underway (current).<br>
+  <br>
+  <b>InInfo</b> - displays detailed information about the selected recording (upcoming or current).<br>
+ <p>
+ <img src="docresources/upcomingrecordings2.png">
+  <p>
+<dt><b>Title</b>
+  <dd>
+  The title (name) of the recording. While this is copied from the EPG when you create a recording, it's not used to match the event itself and is thus used here as the name of the event (see also: adding an event manually with the <b>Add</b> button).
+ <p>
+ <dt><b>Episode</b>
+  <dd>
+  The episode number of the recording (whether this is available depends on your broadcaster and/or EPG data source).
+ <p>
+ <dt><b>Priority</b>
+  <dd>
+  The priority of the recording: Not set, Important, High, Normal, Low, Unimportant.
+  <br>
+  If there is a clash, more important recordings will take priority over less important ones.
+ <p>
+ <dt><b>Scheduled Start Time</b>
+  <dd>
+  The date and time when the scheduled recording will start. Note that this includes any extra time defined in the recording profile (e.g. "start two minutes earlier than the EPG start time").
+ <p>
+ <dt><b>Scheduled Stop Time</b>
+  <dd>
+  The date and time when the scheduled recording will stop. Note that this includes any extra time defined in the recording profile (e.g. "finish recording five minutes after the EPG stop time").
+ <p>
+ <dt><b>Duration</b>
+  <dd>
+  The total duration of the scheduled recording, including any extra time before or after.
+ <p>
+  <dt><b>Channel Name</b>
+  <dd>
+  The channel to be recorded.
+ <p>
+ <dt><b>Creator</b>
+  <dd>
+  The user who created the recording or the auto-recording source and IP address if scheduled by a matching rule.
+ <p>
+ <dt><b>DVR Configuration</b>
+  <dd>
+  The DVR configuration to be used for this recording.
+ <p>
+ <dt><b>Schedule Status</b>
+  <dd>
+  The status of the recording(scheduled or recording).
+ <p>
+
+</div>

docs/html/dvrlog.html

@@ -1,27 +1,45 @@
 <div class="hts-doc-text">
 The DVR log is split into a series of paged grids:
 
+<p></p>
+
 <ul>
-<li>Upcoming Recordings - stuff scheduled to be recorded in the future
-<li>Finished Recordings - stuff that has succesfully finished recording
-<li>Failed Recordings   - stuff that failed to record
-</ul>
+<li><b>Upcoming Recordings</b> - events that are scheduled to be recorded in the future</li>
+
+<img src="docresources/dvrlog.png">
+
+<li><b>Finished Recordings</b> - events that have succesfully finished recording</li>
+
+<img src="docresources/dvrlog2.png">
 
 <p>
-Use the bottom toolbar (not displayed in this manual) to navigate
-between pages in the grid.
-<img src="docresources/dvrlog.png">
+Once the recording is completed there will be a clickable link to a playlist
+for the recorded file (XSPF or M3U as per your startup options) so you can watch 
+it.</p>
+
+
+<li><b>Failed Recordings</b> - events that failed to record</li>
+
+<img src="docresources/dvrlog3.png">
+</ul>
+
+
+<p>
+Use the bottom toolbar to navigate between pages in the grid.</p>
+
+<img src="docresources/dvrlog4.png">
+
+<p>Note that the columns are sortable, but only the current view will be sorted (by 
+default, this will be the first page of the most recent events). Select more events
+per page if you want to sort a longer selection.</p>
 <p>
 To see more details about a recorded event, just click on it and a pop
-up will appear:
-<p>
+up will appear:</p>
+<p></p>
 <img src="docresources/dvrlogentry.png">
+<p></p>
 <p>
 In this pop up you can cancel a scheduled recording or abort a
 recording in progress.  To close the pop up, just close it with the
-[X] window button.
-<p>
-Once the recording is completed there will be a clickable link to the
-recorded matroska file so you can download it directly from the
-interface.
+[X] window button.</p>
 </div>

docs/html/epg.html

@@ -1,95 +1,131 @@
 <div class="hts-doc-text">
-Tvheadend has a built in Electronic Program Guide. The EPG is an in memory
+<p>Tvheadend has a built-in Electronic Program Guide. The EPG is an in-memory
 database populated with all the information about events received from
-the DVB networks or from XMLTV.
-<p>
-The EPG tab displays a filterable paged grid containing all the events
-sorted based on start time.
+the DVB networks over-the-air or from external grabbers such as XMLTV.</p>
+<p></p>
+<p>The EPG tab displays a filterable grid containing all events,
+sorted based on start time.</p>
 <img src="docresources/epg.png">
-<p>
-<dl>
- <dt>Filtering (or searching)
- <dd>
- In the EPG top tool bar you can access four input fields.
+<p></p>
+<hr>
+<b>Filtering (or searching)</b>
+<hr>
+ <p>In the EPG top tool bar you can access five input fields.
  These are used to filter/search for events. The form uses implicit AND
  between the input fields. This means that all filters must match
- for an event to be displayed.
+ for an event to be displayed.</p>
  <dl>
   <dt>[Search title...]
   <dd>
-  Filter on the event title. The filter uses case insensitive regular
-  expression. If you don't know what a regular expression is this means
-  that you can type just parts of the title and filter on that too.
-  (No need for exact matching).
-  <dt>[Filter channel...]
+  Only display events that match the given title. The filter uses case-insensitive
+  regular expressions. If you don't know what a regular expression is, this simply 
+  means that you can type just parts of the title and filter on that - there's no need 
+  for full, exact matching. If the fulltext checkbox is checked, the title
+  text is matched against title, subtitle, summary and description.</dd>
+  <dt>[Filter channel...]</dt>
   <dd>
   Only display events from the selected channel. Channels in the drop down are 
-  ordered by channel number and can be filtered (by name) by typing in the box.
-  <dt>[Filter tag...]
+  ordered by channel number and can be filtered (by name) by typing in the box.</dd>
+  <dt>[Filter tag...]</dt>
   <dd>
-  Only display events from the channels which are included in the selected tag.
-  Tags are used for grouping channels and is configured by the administrator.
-  <dt>[Filter content type...]
+  Only display events from channels which are included in the selected tag.
+  Tags are used for grouping channels together - such as 'Radio' or 'HDTV' - and are 
+  configured by the administrator. You can start typing a tag name to filter the list.</dd>
+  <dt>[Filter content type...]</dt>
   <dd>
-  Most DVB networks classify their events into content groups. This field
-  allows you to filter based on content type.
+  Only display events that match the given content type tag. Most DVB networks
+  classify their events into content groups. This field allows you to filter based
+  on content type (e.g. "Sports" or "Game Show"). Supported tags are determined by
+  your broadcaster. Again, simply start typing to filter the entries if you have a 
+  long list to choose from.</dd>
+  <dt>[Filter duration...]</dt>
+  <dd>
+  Only display events that fall between the given minimum and maximum durations. 
+  This allows you to filter for or against, say, a daily broadcast and a weekly omnibus
+  edition of a programme, or only look for short news bulletins and not the 24-hour 
+  rolling broadcasts.</dd>
+  <dd>&nbsp;</dd>
+  <dd>Options are:</dd>
+
+  <table class="hts-doc-text" border="0">
+    <tr><td>00:00:01 to 00:15:00 - for very short news bulletins, children's programmes, etc.</td></tr>
+    <tr><td>00:15:01 to 00:30:00 - for short programmes, e.g. daily soap operas</td></tr>
+    <tr><td>00:30:01 to 01:30:00 - for medium-length programmes, e.g. documentaries</td></tr>
+    <tr><td>01:30:01 to 03:00:00 - for longer programmes, e.g. films</td></tr>
+    <tr><td>03:00:00 to no maximum - for very long programmes, e.g. major sporting events</td></tr>
+  </table>
+
  </dl>
- Thus, if you only would like to browse Movies from your HD-channels you
- would select 'HDTV' in the [Filter tag...]-field, and select
- 'Movie / Drama' in the [Only include content...]-field.
- <p>
- Notice that you don't have to press a 'Search' button, the grid immediately
- updates itself as you change the filters.
- <p>
- If you would like to clear all filters, just press the [Reset] button.
 
- <dt>Paging
+ <p>So, if you only want to see Movies from your available HD channels, you
+ would select 'HDTV' in the <i>[Filter tag...]</i> field, and select
+ 'Movie / Drama' in the <i>[Filter content type...]</i> field. If you wish, you
+ could then further limit the search to programmes of between 90 minutes and 3 hours by  
+ selecting '01:30:01 to 03:00:00' in the <i>[Filter duration...]</i> field.</p>
+ <p></p>
+ <p>Note that you don't have to press a 'Search' button: the grid immediately
+ updates itself as you change the filters.</p>
+ <p></p>
+ <p>You can clear an individual filter by simply deleting its contents, or by selecting 
+ <i>'(Clear filter)'</i> as appropriate on all except the title filter. If you want to 
+ clear all filters, just press the <i>[Reset All]</i> button.</p>
+ <br>&nbsp;</br>
 
- <dd>
- In large installations with many channels and full EPG feed there could be 
- tens of thousands of events in the database.
- Therefore the EPG display employs a paging bar at the bottom of the grid.
- Use it to browse backwards and forwards in the EPG. It also displays the
- total amount of events matched by the current query.
+<hr>
+<b>Event details and recording</b>
+<hr>
 
- <dt>Event details and recording
- <dd>
- If you click on a single event, a popup will display detailed information
- about the event. It also allows the user to schedule the event for recording
- by clicking on the [Record program] button.
+ <p>If you click on a single event, a popup will display detailed information
+ about the event. It also allows you to schedule the event for recording
+ by clicking on the <i>[Record program]</i> button.</p>
  <p>
  For EPG providers that supply series link information there will also be a 
- [Record series] button that will record all entries in the series.
+ <i>[Record series]</i> button that will record all entries in the series.</p>
  <p>
- For events without any series link information, a [Autorec] button will be
- provided to create a pseudo series link using the Autorec feature.
- <p>
- <img src="docresources/epg2.png">
- <p>
- To close the popup, just close it with the [X] window button.
- The popup is not modal and you can open as many detailed information popups
- as you want.
+ For events without any series link information, an <i>[Autorec]</i> button will be
+ provided to create a pseudo-series link using the autorec feature.</p>
+ <p></p>
+ <img src="docresources/epg2.png"> <img src="docresources/epg3.png">
+ <p></p>
+ <p>If you schedule any kind of recording from this point, you can choose a specific 
+ DVR profile that will apply to the recording or autorec rule. This will normally show
+ as <i>(default)</i>, but you can define different profiles in the <b>Configuration -> 
+ Recording -> Digital Video Recorder</b> tab. This allows you to set, for example, more post-
+ broadcast padding for a channel that always runs late, or perhaps define a different 
+ post-processing command to strip adverts out on a commercial channel.</p>
+ <p>You will also see a <i>Search IMDB</i> link to look for the programme by name on 
+ imdb.com, and a <i>Play</i> link to watch a programme that's already in progress. This 
+ second link downloads a playlist file (XSPF or M3U depending on your startup options); 
+ if your system is configured for it, this will automatically launch an appropriate 
+ player, otherwise you will need to manually open the playlist to start watching (normally a 
+ double-click on the downloaded file).</p>
+ <p></p>
+ <p>To close the popup, just click on the [X] window button.
+ The popup isn't modal, so you don't have to close it before doing something else,
+ and you can open as many detailed information popups as you want.</p>
+ <br>&nbsp;</br>
 
-
- <dt>Autorecordings
- <dd>
- Should you wish to record all events matching a specific query. (Record
- your favorite TV-show, etc) you can press the [Create Autorec] button
- in the top toolbar.
- <p>
- A popup with details about the to-be-created autorecording rule needs to
- be confirmed before the rule takes effect.
- <p>
+ <hr>
+ <b>Autorecordings</b>
+ <hr>
+ <p>Should you wish to record all events matching a specific query (to record
+ your favourite show every week, for example) you can press the <i>[Create AutoRec]</i>
+ button in the top toolbar.</p>
+ <p></p>
+ <p>A popup with details about the to-be-created autorecording rule needs to
+ be confirmed before the rule takes effect.</p>
+ <p></p>
  <img src="docresources/autorecpopup.png">
- <p>
- The autorecordings can later be changed/deleted in under the
- 'Digital Video Recorder'-tag. Use that editor if you temporary want
- to disable an autorecording or make adjustments, etc.
+ <p></p>
+ <p>You can change or delete the autorec rules in the
+ <b>Digital Video Recorder</b> tab. Use that editor if you temporarily want
+ to disable an autorecording or make adjustments to the channel, tag, or similar.</p>
+ <br>&nbsp;</br>
 
- <dt>Watch TV
- <dd>
- If you want to watch live TV in the web UI, the [Watch TV] button will pop-up
+ <hr>
+ <b>Watch TV</b>
+ <hr>
+ <p>If you want to watch live TV in the web UI, the <i>[Watch TV]</i> button will pop up
  a VLC plugin window (if you don't have the plugin installed a direct URL should be
- provided to load into your preferred media player).
-</dl>
+ provided to load into your preferred media player).</p>
 </div>

docs/html/faq.html

@@ -2,12 +2,12 @@
 
 <dl>
 
- <dt>Why does Tvheadend deliver data over TCP to Showtime? I thought it was
+ <dt>Why does Tvheadend deliver data over TCP to Movian? I thought it was
      bad to use TCP for realtime sensitive traffic?
 
  <dd>
  'HTSP' - the protocol used for streaming TV, sending meta information
- updates and RPC between Tvheadend and Showtime uses a transmission
+ updates and RPC between Tvheadend and Movian uses a transmission
  scheduler with multiple queues on the Tvheadend side. This means that
  Tvheadend can measure the available bandwidth between itself and the
  mediaplayer and when congestion happens it's even capable of dropping
@@ -15,7 +15,7 @@
  links and DSL connections with zero picture/audio artifacts.
  <p>
  It's possible to get view drop statistics and bitrates directly in
- Showtime.  (Open the menu when watching a TV-channel and switch on
+ Movian.  (Open the menu when watching a TV-channel and switch on
  'Detailed Information')
 
 </div>

docs/html/features.html

@@ -7,7 +7,7 @@
 
  <dt>Input sources
   <dl>
-   <dt>DVB-T, DVB-C, DVB-S, DVB-S2 and ATSC.
+   <dt>DVB-T, DVB-C, DVB-S, DVB-S2, ATSC and SAT>IP.
    <dd>
    Multiple adapters are supported.
    Each adapter can receive all programs available on the currently
@@ -20,13 +20,17 @@
    </dd>
    <dt>Analog TV
    <dd>
-   Using the Video4Linux2 API. Currently, only PAL is supported.
+   The IPTV extension URL - pipe:// allow to process any MPEG-TS input.
+   FFMPEG or LIBAV library can be used to produce analog to digital
+   conversion.
    </dd>
   </dl>
 
  <dt>Output targets
   <dl>
-   <dt>HTSP (Home TV Streaming Protocol), supported by Showtime Media player and <a href="http://www.xbmc.org/">XBMC</a>
+   <dt>HTTP (Web Protocol), supported by <a href="http://www.videolan.org/vlc/">VLC</a>, <a href="http://www.mplayerhq.hu">MPlayer</a>
+   <dt>HTSP (Home TV Streaming Protocol), supported by <a href="http://movian.tv">Movian Media player</a> and <a href="http://kodi.tv/">Kodi</a>
+   <dt>SAT>IP Server
    <dt>The Built-in Digital Video Recorder
   </dl>
 
@@ -40,7 +44,7 @@
  All setup and configuration is done from the built in web user interface.
  Even so, all settings are stored in human readable text files.
 
- <dt>Fully integrated with HTS Showtime Media player.
+ <dt>Fully integrated with HTS Movian Media player or Kodi HTS PVR addon.
  <dd>
  All channel data and their grouping, EPG and TV streaming is conducted over a
  single TCP connection.
@@ -79,6 +83,10 @@
  <dd>
  Requires a card server (newcamd and capmt protocol is supported).
 
+ <dt>Hardware based CSA descrambling
+ <dd>
+ Requires the standard dvben50221 linuxdvb library.
+
  <dt>Internationalization
  <dd>
  All text is encoded in UTF-8 to provide full international support. All major

rpm/Makefile

@@ -0,0 +1,32 @@
+#
+#  RPM build
+#  Copyright (C) 2014 Jaroslav Kysela
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+include $(dir $(lastword $(MAKEFILE_LIST)))../.config.mk
+
+COMMIT   ?= $(shell git rev-parse HEAD)
+COMMIT1   = $(shell git rev-parse $(COMMIT))
+VERSION   = $(shell cd .. && git describe --match "v*" $(COMMIT1) | sed -e 's/-/./g' -e 's/^v//g' )
+
+tvheadend.spec: tvheadend.spec.in
+	@sed -e 's/@VERSION@/$(VERSION)/g' \
+	     -e 's/@COMMIT@/$(COMMIT1)/g' \
+		$< > $@
+
+build: tvheadend.spec
+	spectool --get-files --sourcedir tvheadend.spec
+	rpmbuild -ba tvheadend.spec

rpm/tvheadend.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Tvheadend - a TV streaming server and DVR
+After=syslog.target network.target auditd.service
+
+[Service]
+EnvironmentFile=/etc/sysconfig/tvheadend
+ExecStart=/usr/bin/tvheadend -f -p /var/run/tvheadend.pid $OPTIONS
+PIDFile=/var/run/tvheadend.pid
+Type=forking
+Restart=on-failure
+RestartSec=54s
+
+[Install]
+WantedBy=multi-user.target

rpm/tvheadend.spec.in

@@ -0,0 +1,91 @@
+%global commit @COMMIT@
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+Summary:        Tvheadend - a TV streaming server and DVR
+Name:           tvheadend
+Version:        @VERSION@
+Release:        1
+
+License:        GPLv3
+Group:          Applications/Multimedia
+URL:            http://tvheadend.org
+
+Source:		https://github.com/tvheadend/tvheadend/archive/%{commit}/tvheadend-%{commit}.tar.gz
+#Patch999:      test.patch
+
+BuildRequires:  systemd-units >= 1
+BuildRequires:  dbus-devel
+BuildRequires:  avahi-libs
+BuildRequires:  openssl-devel
+BuildRequires:  git wget
+
+Requires:       systemd-units >= 1
+
+%description
+Tvheadend is a TV streaming server with DVR for Linux supporting
+DVB, ATSC, IPTV, SAT>IP as input sources. Can be used as a backend
+to Showtime, XBMC and various other clients.
+
+%prep
+%setup -q -n tvheadend-%{commit}
+#%patch999 -p1 -b .test
+
+%build
+echo %{version} > %{_builddir}/%{buildsubdir}/rpm/version
+%ifarch %arm
+      %configure --disable-lockowner --enable-bundle --disable-libffmpeg_static
+%else
+      %configure --disable-lockowner --enable-bundle --enable-libffmpeg_static
+%endif
+%{__make}
+
+%install
+# binary
+mkdir -p -m755 %{buildroot}%{_bindir}
+install -p -m 755 build.linux/tvheadend %{buildroot}%{_bindir}
+# systemd
+mkdir -p -m755 %{buildroot}%{_sysconfdir}/sysconfig
+install -p -m 644 rpm/tvheadend.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/tvheadend
+mkdir -p -m755 %{buildroot}%{_unitdir}
+install -p -m 644 rpm/tvheadend.service %{buildroot}%{_unitdir}
+
+%pre
+getent group tvheadend >/dev/null || groupadd -f -g 283 -r tvheadend
+if ! getent passwd tvheadend > /dev/null ; then
+  if ! getent passwd 283 > /dev/null ; then
+    useradd -r -l -u 283 -g tvheadend -d /home/tvheadend -s /sbin/nologin -c "Tvheadend TV server" tvheadend
+  else
+    useradd -r -l -g tvheadend -d /home/tvheadend -s /sbin/nologin -c "Tvheadend TV server" tvheadend
+  fi
+fi
+if ! test -d /home/tvheadend ; then
+  mkdir -m 0755 /home/tvheadend || exit 1
+  chown tvheadend.tvheadend /home/tvheadend || exit 1
+fi
+exit 0
+
+%post
+%systemd_post tvheadend.service
+
+%postun
+%systemd_postun_with_restart tvheadend.service
+
+%files
+%{_bindir}/*
+%{_sysconfdir}/sysconfig/*
+%{_unitdir}/*
+
+%changelog
+* Wed Mar 25 2015 Bob Lightfoot <boblfoot@gmail.com> 3.9-2658-gb427d7e
+- Patching rpm spec file so the arm architecture builds properly
+
+* Mon Oct 13 2014 Jaroslav Kysela <perex@perex.cz> 3.9-1806-g6f3324e
+- RPM: Typo fixes
+
+* Mon Oct 13 2014 Jaroslav Kysela <perex@perex.cz> 3.9-1805-g14a7de8
+- RPM build - config fixes
+
+* Mon Oct 13 2014 Jaroslav Kysela <perex@perex.cz> 3.9-1803-g392dec0
+- Add basic RPM build support
+
+~   

rpm/tvheadend.sysconfig

@@ -0,0 +1,3 @@
+# Configuration file for the tvheadend service.
+
+OPTIONS="-c /home/tvheadend/config -u tvheadend -g tvheadend -6 --http_port 9981 --htsp_port 9982"

src/access.h

@@ -19,19 +19,24 @@
 #ifndef ACCESS_H_
 #define ACCESS_H_
 
+#include "idnode.h"
+#include "htsmsg.h"
+
+struct profile;
+struct dvr_config;
+struct channel_tag;
 
 typedef struct access_ipmask {
   TAILQ_ENTRY(access_ipmask) ai_link;
 
-  int ai_ipv6;
+  int ai_family;
 
-  struct in_addr ai_ip;
   struct in6_addr ai_ip6;
 
   int ai_prefixlen;
 
-  uint32_t ai_network;
   uint32_t ai_netmask;
+  uint32_t ai_network;
 } access_ipmask_t;
 
 TAILQ_HEAD(access_entry_queue, access_entry);
@@ -39,21 +44,62 @@ TAILQ_HEAD(access_entry_queue, access_entry);
 extern struct access_entry_queue access_entries;
 
 typedef struct access_entry {
-  char *ae_id;
+  idnode_t ae_id;
 
   TAILQ_ENTRY(access_entry) ae_link;
   char *ae_username;
   char *ae_password;
+  char *ae_password2;
   char *ae_comment;
+
+  int ae_index;
   int ae_enabled;
-  int ae_tagonly;
-  
+
+  int ae_streaming;
+  int ae_adv_streaming;
+  int ae_htsp_streaming;
+
+  struct profile *ae_profile;
+  LIST_ENTRY(access_entry) ae_profile_link;
+
+  uint32_t ae_conn_limit;
+
+  int ae_dvr;
+  int ae_htsp_dvr;
+  int ae_all_dvr;
+  int ae_all_rw_dvr;
+  struct dvr_config *ae_dvr_config;
+  LIST_ENTRY(access_entry) ae_dvr_config_link;
+
+  int ae_webui;
+  int ae_admin;
+
+  uint64_t ae_chmin;
+  uint64_t ae_chmax;
+
+  struct channel_tag *ae_chtag;
+  LIST_ENTRY(access_entry) ae_channel_tag_link;
 
   uint32_t ae_rights;
 
   TAILQ_HEAD(, access_ipmask) ae_ipmasks;
 } access_entry_t;
 
+extern const idclass_t access_entry_class;
+
+typedef struct access {
+  char     *aa_username;
+  char     *aa_representative;
+  uint32_t  aa_rights;
+  htsmsg_t *aa_profiles;
+  htsmsg_t *aa_dvrcfgs;
+  uint64_t  aa_chmin;
+  uint64_t  aa_chmax;
+  htsmsg_t *aa_chtags;
+  int       aa_match;
+  uint32_t  aa_conn_limit;
+} access_t;
+
 TAILQ_HEAD(access_ticket_queue, access_ticket);
 
 extern struct access_ticket_queue access_tickets;
@@ -65,27 +111,49 @@ typedef struct access_ticket {
 
   gtimer_t at_timer;
   char *at_resource;
+  access_t *at_access;
 } access_ticket_t;
 
-#define ACCESS_ANONYMOUS       0x0
-#define ACCESS_STREAMING       0x1
-#define ACCESS_WEB_INTERFACE   0x2
-#define ACCESS_RECORDER        0x4
-#define ACCESS_RECORDER_ALL    0x8
-#define ACCESS_ADMIN           0x10
-#define ACCESS_FULL 0x3f
+#define ACCESS_ANONYMOUS          0
+#define ACCESS_STREAMING          (1<<0)
+#define ACCESS_ADVANCED_STREAMING (1<<1)
+#define ACCESS_HTSP_STREAMING     (1<<2)
+#define ACCESS_WEB_INTERFACE      (1<<3)
+#define ACCESS_RECORDER           (1<<4)
+#define ACCESS_HTSP_RECORDER      (1<<5)
+#define ACCESS_ALL_RECORDER       (1<<6)
+#define ACCESS_ADMIN              (1<<7)
+#define ACCESS_ALL_RW_RECORDER    (1<<8)
+#define ACCESS_OR                 (1<<30)
+
+#define ACCESS_FULL \
+  (ACCESS_STREAMING | ACCESS_ADVANCED_STREAMING | \
+   ACCESS_HTSP_STREAMING | ACCESS_WEB_INTERFACE | \
+   ACCESS_RECORDER | ACCESS_HTSP_RECORDER | \
+   ACCESS_ALL_RECORDER | ACCESS_ADMIN | ACCESS_ALL_RW_RECORDER)
 
 /**
  * Create a new ticket for the requested resource and generate a id for it
  */
-const char* access_ticket_create(const char *resource);
+const char* access_ticket_create(const char *resource, access_t *a);
 
 /**
  * Verifies that a given ticket id matches a resource
  */
-int access_ticket_verify(const char *id, const char *resource);
+access_t *access_ticket_verify2(const char *id, const char *resource);
 
 int access_ticket_delete(const char *ticket_id);
+
+/**
+ * Free the access structure
+ */
+void access_destroy(access_t *a);
+
+/**
+ * Copy the access structure
+ */
+access_t *access_copy(access_t *src);
+
 /**
  * Verifies that the given user in combination with the source ip
  * complies with the requested mask
@@ -95,18 +163,53 @@ int access_ticket_delete(const char *ticket_id);
 int access_verify(const char *username, const char *password,
 		  struct sockaddr *src, uint32_t mask);
 
+static inline int access_verify2(access_t *a, uint32_t mask)
+  { return (mask & ACCESS_OR) ?
+      ((a->aa_rights & mask) ? 0 : -1) :
+      ((a->aa_rights & mask) == mask ? 0 : -1); }
+
+int access_verify_list(htsmsg_t *list, const char *item);
+
 /**
- *
+ * Get the access structure
  */
-uint32_t access_get_hashed(const char *username, const uint8_t digest[20],
-			   const uint8_t *challenge, struct sockaddr *src,
-			   int *entrymatch);
+access_t *access_get(const char *username, const char *password,
+                     struct sockaddr *src);
 
 /**
  *
  */
-uint32_t access_get_by_addr(struct sockaddr *src);
+access_t *
+access_get_hashed(const char *username, const uint8_t digest[20],
+		  const uint8_t *challenge, struct sockaddr *src);
 
+/**
+ *
+ */
+access_t *
+access_get_by_addr(struct sockaddr *src);
+
+/**
+ *
+ */
+access_entry_t *
+access_entry_create(const char *uuid, htsmsg_t *conf);
+
+/**
+ *
+ */
+void
+access_entry_save(access_entry_t *ae);
+
+/**
+ *
+ */
+void
+access_destroy_by_profile(struct profile *pro, int delconf);
+void
+access_destroy_by_dvr_config(struct dvr_config *cfg, int delconf);
+void
+access_destroy_by_channel_tag(struct channel_tag *ct, int delconf);
 
 /**
  *
@@ -114,9 +217,4 @@ uint32_t access_get_by_addr(struct sockaddr *src);
 void access_init(int createdefault, int noacl);
 void access_done(void);
 
-/**
- *
- */
-uint32_t access_tag_only(const char *username);
-
 #endif /* ACCESS_H_ */

src/api.c

@@ -61,7 +61,8 @@ api_register_all ( const api_hook_t *hooks )
 }
 
 int
-api_exec ( const char *subsystem, htsmsg_t *args, htsmsg_t **resp )
+api_exec ( access_t *perm, const char *subsystem,
+           htsmsg_t *args, htsmsg_t **resp )
 {
   api_hook_t h;
   api_link_t *ah, skel;
@@ -83,6 +84,9 @@ api_exec ( const char *subsystem, htsmsg_t *args, htsmsg_t **resp )
     return ENOSYS; // TODO: is this really the right error code?
   }
 
+  if (access_verify2(perm, ah->hook->ah_access))
+    return EPERM;
+
   /* Extract method */
   op = htsmsg_get_str(args, "method");
   if (!op)
@@ -90,12 +94,12 @@ api_exec ( const char *subsystem, htsmsg_t *args, htsmsg_t **resp )
   // Note: this is not required (so no final validation)
 
   /* Execute */
-  return ah->hook->ah_callback(ah->hook->ah_opaque, op, args, resp);
+  return ah->hook->ah_callback(perm, ah->hook->ah_opaque, op, args, resp);
 }
 
 static int
 api_serverinfo
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   *resp = htsmsg_create_map();
   htsmsg_add_str(*resp, "sw_version",   tvheadend_version);
@@ -121,12 +125,17 @@ void api_init ( void )
   api_mpegts_init();
   api_service_init();
   api_channel_init();
+  api_bouquet_init();
   api_epg_init();
   api_epggrab_init();
   api_status_init();
   api_imagecache_init();
   api_esfilter_init();
   api_intlconv_init();
+  api_access_init();
+  api_dvr_init();
+  api_caclient_init();
+  api_profile_init();
 }
 
 void api_done ( void )

src/api.h

@@ -23,15 +23,17 @@
 #include "htsmsg.h"
 #include "idnode.h"
 #include "redblack.h"
+#include "access.h"
 
-#define TVH_API_VERSION 12
+#define TVH_API_VERSION 15
 
 /*
  * Command hook
  */
 
 typedef int (*api_callback_t)
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp );
+  ( access_t *perm, void *opaque, const char *op,
+    htsmsg_t *args, htsmsg_t **resp );
 
 typedef struct api_hook
 {
@@ -50,7 +52,8 @@ void api_register_all ( const api_hook_t *hooks );
 /*
  * Execute
  */
-int  api_exec ( const char *subsystem, htsmsg_t *args, htsmsg_t **resp );
+int  api_exec ( access_t *perm, const char *subsystem,
+                htsmsg_t *args, htsmsg_t **resp );
 
 /*
  * Initialise
@@ -59,9 +62,9 @@ void api_init               ( void );
 void api_done               ( void );
 void api_idnode_init        ( void );
 void api_input_init         ( void );
-void api_input_satip_init   ( void );
 void api_service_init       ( void );
 void api_channel_init       ( void );
+void api_bouquet_init       ( void );
 void api_mpegts_init        ( void );
 void api_epg_init           ( void );
 void api_epggrab_init       ( void );
@@ -69,35 +72,41 @@ void api_status_init        ( void );
 void api_imagecache_init    ( void );
 void api_esfilter_init      ( void );
 void api_intlconv_init      ( void );
+void api_access_init        ( void );
+void api_dvr_init           ( void );
+void api_caclient_init      ( void );
+void api_profile_init       ( void );
 
 /*
  * IDnode
  */
 typedef struct api_idnode_grid_conf
 {
-  int             tindex;
-  int             start;
-  int             limit;
+  uint32_t        start;
+  uint32_t        limit;
   idnode_filter_t filter;
   idnode_sort_t   sort;
 } api_idnode_grid_conf_t;
 
 typedef void (*api_idnode_grid_callback_t)
-  (idnode_set_t*, api_idnode_grid_conf_t*, htsmsg_t *args);
+  (access_t *perm, idnode_set_t*, api_idnode_grid_conf_t*, htsmsg_t *args);
 typedef idnode_set_t *(*api_idnode_tree_callback_t)
-  (void);
+  (access_t *perm);
 
 int api_idnode_grid
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp );
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp );
 
 int api_idnode_class
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp );
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp );
 
 int api_idnode_tree
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp );
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp );
 
 int api_idnode_load_by_class
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp );
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp );
+
+int api_idnode_handler
+  ( access_t *perm, htsmsg_t *args, htsmsg_t **resp, void (*handler)(access_t *perm, idnode_t *in) );
 
 /*
  * Service mapper

src/api/api_access.c

@@ -0,0 +1,63 @@
+/*
+ *  API - access control
+ *
+ *  Copyright (C) 2014 Jaroslav Kysela
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "tvheadend.h"
+#include "access.h"
+#include "api.h"
+
+static void
+api_access_entry_grid
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
+{
+  access_entry_t *ae;
+
+  TAILQ_FOREACH(ae, &access_entries, ae_link)
+    idnode_set_add(ins, (idnode_t*)ae, &conf->filter);
+}
+
+static int
+api_access_entry_create
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  htsmsg_t *conf;
+  access_entry_t *ae;
+
+  if (!(conf  = htsmsg_get_map(args, "conf")))
+    return EINVAL;
+
+  pthread_mutex_lock(&global_lock);
+  if ((ae = access_entry_create(NULL, conf)) != NULL)
+    access_entry_save(ae);
+  pthread_mutex_unlock(&global_lock);
+
+  return 0;
+}
+
+void api_access_init ( void )
+{
+  static api_hook_t ah[] = {
+    { "access/entry/class",  ACCESS_ADMIN, api_idnode_class, (void*)&access_entry_class },
+    { "access/entry/grid",   ACCESS_ADMIN, api_idnode_grid,  api_access_entry_grid },
+    { "access/entry/create", ACCESS_ADMIN, api_access_entry_create, NULL },
+
+    { NULL },
+  };
+
+  api_register_all(ah);
+}

src/api/api_bouquet.c

@@ -0,0 +1,93 @@
+/*
+ *  API - bouquet calls
+ *
+ *  Copyright (C) 2014 Jaroslav Kysela
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __TVH_API_BOUQUET_H__
+#define __TVH_API_BOUQUET_H__
+
+#include "tvheadend.h"
+#include "bouquet.h"
+#include "access.h"
+#include "api.h"
+
+static int
+api_bouquet_list
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  bouquet_t *bq;
+  htsmsg_t *l, *e;
+
+  l = htsmsg_create_list();
+  pthread_mutex_lock(&global_lock);
+  RB_FOREACH(bq, &bouquets, bq_link) {
+    e = htsmsg_create_map();
+    htsmsg_add_str(e, "key", idnode_uuid_as_str(&bq->bq_id));
+    htsmsg_add_str(e, "val", bq->bq_name ?: "");
+    htsmsg_add_msg(l, NULL, e);
+  }
+  pthread_mutex_unlock(&global_lock);
+  *resp = htsmsg_create_map();
+  htsmsg_add_msg(*resp, "entries", l);
+
+  return 0;
+}
+
+static void
+api_bouquet_grid
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf )
+{
+  bouquet_t *bq;
+
+  RB_FOREACH(bq, &bouquets, bq_link)
+    idnode_set_add(ins, (idnode_t*)bq, &conf->filter);
+}
+
+static int
+api_bouquet_create
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  htsmsg_t *conf;
+  bouquet_t *bq;
+
+  if (!(conf  = htsmsg_get_map(args, "conf")))
+    return EINVAL;
+
+  pthread_mutex_lock(&global_lock);
+  bq = bouquet_create(NULL, conf, NULL, NULL);
+  if (bq)
+    bouquet_save(bq, 0);
+  pthread_mutex_unlock(&global_lock);
+
+  return 0;
+}
+
+void api_bouquet_init ( void )
+{
+  static api_hook_t ah[] = {
+    { "bouquet/list",    ACCESS_ADMIN, api_bouquet_list, NULL },
+    { "bouquet/class",   ACCESS_ADMIN, api_idnode_class, (void*)&bouquet_class },
+    { "bouquet/grid",    ACCESS_ADMIN, api_idnode_grid,  api_bouquet_grid },
+    { "bouquet/create",  ACCESS_ADMIN, api_bouquet_create, NULL },
+
+    { NULL },
+  };
+
+  api_register_all(ah);
+}
+
+#endif /* __TVH_API_BOUQUET_H__ */

src/api/api_caclient.c

@@ -0,0 +1,108 @@
+/*
+ *  tvheadend - API access to Conditional Access Clients
+ *
+ *  Copyright (C) 2014 Jaroslav Kysela
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "tvheadend.h"
+#include "access.h"
+#include "htsmsg.h"
+#include "api.h"
+#include "descrambler/caclient.h"
+
+/*
+ *
+ */
+static int
+api_caclient_list
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  caclient_t *cac;
+  htsmsg_t *l, *e;
+
+  l = htsmsg_create_list();
+  pthread_mutex_lock(&global_lock);
+  TAILQ_FOREACH(cac, &caclients, cac_link) {
+    e = htsmsg_create_map();
+    htsmsg_add_str(e, "uuid", idnode_uuid_as_str(&cac->cac_id));
+    htsmsg_add_str(e, "title", idnode_get_title(&cac->cac_id));
+    htsmsg_add_str(e, "status", caclient_get_status(cac));
+    htsmsg_add_msg(l, NULL, e);
+  }
+  pthread_mutex_unlock(&global_lock);
+  *resp = htsmsg_create_map();
+  htsmsg_add_msg(*resp, "entries", l);
+  return 0;
+}
+
+static int
+api_caclient_builders
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  const idclass_t **r;
+  htsmsg_t *l, *e;
+
+  /* List of available builder classes */
+  l = htsmsg_create_list();
+  for (r = caclient_classes; *r; r++)
+    if ((e = idclass_serialize(*r)))
+      htsmsg_add_msg(l, NULL, e);
+
+  /* Output */
+  *resp = htsmsg_create_map();
+  htsmsg_add_msg(*resp, "entries", l);
+
+  return 0;
+}
+
+static int
+api_caclient_create
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  int err = 0;
+  const char *clazz;
+  htsmsg_t *conf;
+
+  if (!(clazz = htsmsg_get_str(args, "class")))
+    return EINVAL;
+  if (!(conf  = htsmsg_get_map(args, "conf")))
+    return EINVAL;
+  htsmsg_set_str(conf, "class", clazz);
+
+  pthread_mutex_lock(&global_lock);
+  if (caclient_create(NULL, conf, 1) == NULL)
+    err = -EINVAL;
+  pthread_mutex_unlock(&global_lock);
+
+  return err;
+}
+
+/*
+ * Init
+ */
+void
+api_caclient_init ( void )
+{
+  static api_hook_t ah[] = {
+    { "caclient/list",       ACCESS_ADMIN, api_caclient_list,     NULL },
+    { "caclient/class",      ACCESS_ADMIN, api_idnode_class, (void*)&caclient_class },
+    { "caclient/builders",   ACCESS_ADMIN, api_caclient_builders, NULL },
+    { "caclient/create",     ACCESS_ADMIN, api_caclient_create,   NULL },
+    { NULL },
+  };
+
+  api_register_all(ah);
+}

src/api/api_channel.c

@@ -17,29 +17,50 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __TVH_API_SERVICE_H__
-#define __TVH_API_SERVICE_H__
+#ifndef __TVH_API_CHANNEL_H__
+#define __TVH_API_CHANNEL_H__
 
 #include "tvheadend.h"
 #include "channels.h"
 #include "access.h"
 #include "api.h"
 
+static void
+api_channel_key_val(htsmsg_t *dst, const char *key, const char *val)
+{
+  htsmsg_t *e = htsmsg_create_map();
+  htsmsg_add_str(e, "key", key);
+  htsmsg_add_str(e, "val", val ?: "");
+  htsmsg_add_msg(dst, NULL, e);
+}
+
+static int
+api_channel_is_all(access_t *perm, htsmsg_t *args)
+{
+  return htsmsg_get_bool_or_default(args, "all", 0) &&
+         !access_verify2(perm, ACCESS_ADMIN);
+}
+
 // TODO: this will need converting to an idnode system
 static int
 api_channel_list
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   channel_t *ch;
-  htsmsg_t *l, *e;
+  htsmsg_t *l;
+  int cfg = api_channel_is_all(perm, args);
+  char buf[128];
 
   l = htsmsg_create_list();
   pthread_mutex_lock(&global_lock);
   CHANNEL_FOREACH(ch) {
-    e = htsmsg_create_map();
-    htsmsg_add_str(e, "key", idnode_uuid_as_str(&ch->ch_id));
-    htsmsg_add_str(e, "val", channel_get_name(ch));
-    htsmsg_add_msg(l, NULL, e);
+    if (!cfg && !channel_access(ch, perm, 0)) continue;
+    if (!ch->ch_enabled) {
+      snprintf(buf, sizeof(buf), "{%s}", channel_get_name(ch));
+      api_channel_key_val(l, idnode_uuid_as_str(&ch->ch_id), buf);
+    } else {
+      api_channel_key_val(l, idnode_uuid_as_str(&ch->ch_id), channel_get_name(ch));
+    }
   }
   pthread_mutex_unlock(&global_lock);
   *resp = htsmsg_create_map();
@@ -50,17 +71,19 @@ api_channel_list
 
 static void
 api_channel_grid
-  ( idnode_set_t *ins, api_idnode_grid_conf_t *conf )
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
 {
   channel_t *ch;
+  int cfg = api_channel_is_all(perm, args);
 
   CHANNEL_FOREACH(ch)
-    idnode_set_add(ins, (idnode_t*)ch, &conf->filter);
+    if (cfg || channel_access(ch, perm, 0))
+      idnode_set_add(ins, (idnode_t*)ch, &conf->filter);
 }
 
 static int
 api_channel_create
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   htsmsg_t *conf;
   channel_t *ch;
@@ -78,27 +101,57 @@ api_channel_create
 }
 
 static int
-api_channeltag_enum
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+api_channel_tag_list
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   channel_tag_t *ct;
-  htsmsg_t *l, *e;
-  
-  int _enum = htsmsg_get_bool_or_default(args, "enum", 0);
+  htsmsg_t *l;
+  int cfg = api_channel_is_all(perm, args);
+  char buf[128];
 
-  if (_enum) {
-    l = htsmsg_create_list();
-    TAILQ_FOREACH(ct, &channel_tags, ct_link) {
-      e = htsmsg_create_map();
-      htsmsg_add_u32(e, "key", ct->ct_identifier);
-      htsmsg_add_str(e, "val", ct->ct_name);
-      htsmsg_add_msg(l, NULL, e);
+  l = htsmsg_create_list();
+  TAILQ_FOREACH(ct, &channel_tags, ct_link)
+    if (cfg || channel_tag_access(ct, perm, 0)) {
+      if (ct->ct_enabled) {
+        api_channel_key_val(l, idnode_uuid_as_str(&ct->ct_id), ct->ct_name);
+      } else {
+        snprintf(buf, sizeof(buf), "{%s}", ct->ct_name);
+        api_channel_key_val(l, idnode_uuid_as_str(&ct->ct_id), buf);
+      }
     }
-    *resp = htsmsg_create_map();
-    htsmsg_add_msg(*resp, "entries", l);
-  } else {
-    // TODO: support full listing v enum
-  }
+  *resp = htsmsg_create_map();
+  htsmsg_add_msg(*resp, "entries", l);
+  return 0;
+}
+
+static void
+api_channel_tag_grid
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
+{
+  channel_tag_t *ct;
+  int cfg = api_channel_is_all(perm, args);
+
+  TAILQ_FOREACH(ct, &channel_tags, ct_link)
+    if (cfg || channel_tag_access(ct, perm, 0))
+      idnode_set_add(ins, (idnode_t*)ct, &conf->filter);
+}
+
+static int
+api_channel_tag_create
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  htsmsg_t *conf;
+  channel_tag_t *ct;
+
+  if (!(conf  = htsmsg_get_map(args, "conf")))
+    return EINVAL;
+
+  pthread_mutex_lock(&global_lock);
+  ct = channel_tag_create(NULL, conf);
+  if (ct)
+    channel_tag_save(ct);
+  pthread_mutex_unlock(&global_lock);
+
   return 0;
 }
 
@@ -110,7 +163,10 @@ void api_channel_init ( void )
     { "channel/list",    ACCESS_ANONYMOUS, api_channel_list, NULL },
     { "channel/create",  ACCESS_ADMIN,     api_channel_create, NULL },
 
-    { "channeltag/list", ACCESS_ANONYMOUS, api_channeltag_enum, NULL },
+    { "channeltag/class",ACCESS_ANONYMOUS, api_idnode_class, (void*)&channel_tag_class },
+    { "channeltag/grid", ACCESS_ANONYMOUS, api_idnode_grid,  api_channel_tag_grid },
+    { "channeltag/list", ACCESS_ANONYMOUS, api_channel_tag_list, NULL },
+    { "channeltag/create",  ACCESS_ADMIN,  api_channel_tag_create, NULL },
 
     { NULL },
   };
@@ -119,4 +175,4 @@ void api_channel_init ( void )
 }
 
 
-#endif /* __TVH_API_IDNODE_H__ */
+#endif /* __TVH_API_CHANNEL_H__ */

src/api/api_dvr.c

@@ -0,0 +1,394 @@
+/*
+ *  API - DVR
+ *
+ *  Copyright (C) 2014 Jaroslav Kysela
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "tvheadend.h"
+#include "dvr/dvr.h"
+#include "epg.h"
+#include "api.h"
+
+/*
+ *
+ */
+
+static void
+api_dvr_config_grid
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
+{
+  dvr_config_t *cfg;
+
+  LIST_FOREACH(cfg, &dvrconfigs, config_link)
+    if (!idnode_perm((idnode_t *)cfg, perm, NULL))
+      idnode_set_add(ins, (idnode_t*)cfg, &conf->filter);
+}
+
+static int
+api_dvr_config_create
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  dvr_config_t *cfg;
+  htsmsg_t *conf;
+  const char *s;
+
+  if (!(conf = htsmsg_get_map(args, "conf")))
+    return EINVAL;
+  if (!(s = htsmsg_get_str(conf, "name")))
+    return EINVAL;
+  if (s[0] == '\0')
+    return EINVAL;
+
+  pthread_mutex_lock(&global_lock);
+  if ((cfg = dvr_config_create(NULL, NULL, conf)))
+    dvr_config_save(cfg);
+  pthread_mutex_unlock(&global_lock);
+
+  return 0;
+}
+
+static int is_dvr_entry_finished(dvr_entry_t *entry)
+{
+  dvr_entry_sched_state_t state = entry->de_sched_state;
+  return state == DVR_COMPLETED && !entry->de_last_error && dvr_get_filesize(entry) != -1;
+}
+
+static int is_dvr_entry_upcoming(dvr_entry_t *entry)
+{
+  dvr_entry_sched_state_t state = entry->de_sched_state;
+  return state == DVR_RECORDING || state == DVR_SCHEDULED || state == DVR_NOSTATE;
+}
+
+static int is_dvr_entry_failed(dvr_entry_t *entry)
+{
+  if (is_dvr_entry_finished(entry))
+    return 0;
+  if (is_dvr_entry_upcoming(entry))
+    return 0;
+  return 1;
+}
+
+static void
+api_dvr_entry_grid
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
+{
+  dvr_entry_t *de;
+
+  LIST_FOREACH(de, &dvrentries, de_global_link)
+    idnode_set_add(ins, (idnode_t*)de, &conf->filter);
+}
+
+static void
+api_dvr_entry_grid_upcoming
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
+{
+  dvr_entry_t *de;
+
+  LIST_FOREACH(de, &dvrentries, de_global_link)
+    if (is_dvr_entry_upcoming(de))
+      idnode_set_add(ins, (idnode_t*)de, &conf->filter);
+}
+
+static void
+api_dvr_entry_grid_finished
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
+{
+  dvr_entry_t *de;
+
+  LIST_FOREACH(de, &dvrentries, de_global_link)
+    if (is_dvr_entry_finished(de))
+      idnode_set_add(ins, (idnode_t*)de, &conf->filter);
+}
+
+static void
+api_dvr_entry_grid_failed
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
+{
+  dvr_entry_t *de;
+
+  LIST_FOREACH(de, &dvrentries, de_global_link)
+    if (is_dvr_entry_failed(de))
+      idnode_set_add(ins, (idnode_t*)de, &conf->filter);
+}
+
+static int
+api_dvr_entry_create
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  dvr_entry_t *de;
+  dvr_config_t *cfg;
+  htsmsg_t *conf;
+  const char *s1;
+  int res = EPERM;
+
+  if (!(conf = htsmsg_get_map(args, "conf")))
+    return EINVAL;
+
+  pthread_mutex_lock(&global_lock);
+  s1 = htsmsg_get_str(conf, "config_name");
+  cfg = dvr_config_find_by_list(perm->aa_dvrcfgs, s1);
+  if (cfg) {
+    htsmsg_set_str(conf, "config_name", idnode_uuid_as_str(&cfg->dvr_id));
+
+    if (perm->aa_representative)
+       htsmsg_set_str(conf, "creator", perm->aa_representative);
+
+    if ((de = dvr_entry_create(NULL, conf)))
+      dvr_entry_save(de);
+
+    res = 0;
+  }
+  pthread_mutex_unlock(&global_lock);
+
+  return res;
+}
+
+static htsmsg_t *
+api_dvr_entry_create_from_single(htsmsg_t *args)
+{
+  htsmsg_t *entries, *m;
+  const char *s1, *s2, *s3;
+
+  if (!(s1 = htsmsg_get_str(args, "config_uuid")))
+    return NULL;
+  if (!(s2 = htsmsg_get_str(args, "event_id")))
+    return NULL;
+  s3 = htsmsg_get_str(args, "comment");
+  entries = htsmsg_create_list();
+  m = htsmsg_create_map();
+  htsmsg_add_str(m, "config_uuid", s1);
+  htsmsg_add_str(m, "event_id", s2);
+  if (s3)
+    htsmsg_add_str(m, "comment", s3);
+  htsmsg_add_msg(entries, NULL, m);
+  return entries;
+}
+
+static int
+api_dvr_entry_create_by_event
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  dvr_entry_t *de;
+  const char *config_uuid, *comment;
+  epg_broadcast_t *e;
+  htsmsg_t *entries, *entries2 = NULL, *m;
+  htsmsg_field_t *f;
+  const char *s;
+  int count = 0;
+
+  if (!(entries = htsmsg_get_list(args, "entries"))) {
+    entries = entries2 = api_dvr_entry_create_from_single(args);
+    if (!entries)
+      return EINVAL;
+  }
+
+  HTSMSG_FOREACH(f, entries) {
+    if (!(m = htsmsg_get_map_by_field(f))) continue;
+
+    if (!(s = htsmsg_get_str(m, "event_id")))
+      continue;
+
+    config_uuid = htsmsg_get_str(m, "config_uuid");
+    comment = htsmsg_get_str(m, "comment");
+
+    pthread_mutex_lock(&global_lock);
+    if ((e = epg_broadcast_find_by_id(strtoll(s, NULL, 10)))) {
+      dvr_config_t *cfg = dvr_config_find_by_list(perm->aa_dvrcfgs, config_uuid);
+      if (cfg) {
+        de = dvr_entry_create_by_event(idnode_uuid_as_str(&cfg->dvr_id),
+                                       e, 0, 0,
+                                       perm->aa_username,
+                                       perm->aa_representative,
+                                       NULL, DVR_PRIO_NORMAL, 0, comment);
+        if (de)
+          dvr_entry_save(de);
+      }
+    }
+    pthread_mutex_unlock(&global_lock);
+    count++;
+  }
+
+  htsmsg_destroy(entries2);
+
+  return !count ? EINVAL : 0;
+}
+
+static void
+api_dvr_cancel(access_t *perm, idnode_t *self)
+{
+  dvr_entry_cancel((dvr_entry_t *)self);
+}
+
+static int
+api_dvr_entry_cancel
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  return api_idnode_handler(perm, args, resp, api_dvr_cancel);
+}
+
+static void
+api_dvr_autorec_grid
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
+{
+  dvr_autorec_entry_t *dae;
+
+  TAILQ_FOREACH(dae, &autorec_entries, dae_link)
+    idnode_set_add(ins, (idnode_t*)dae, &conf->filter);
+}
+
+static int
+api_dvr_autorec_create
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  htsmsg_t *conf;
+  dvr_autorec_entry_t *dae;
+
+  if (!(conf  = htsmsg_get_map(args, "conf")))
+    return EINVAL;
+
+  if (perm->aa_username)
+    htsmsg_set_str(conf, "owner", perm->aa_username);
+  if (perm->aa_representative)
+    htsmsg_set_str(conf, "creator", perm->aa_representative);
+
+  pthread_mutex_lock(&global_lock);
+  dae = dvr_autorec_create(NULL, conf);
+  if (dae) {
+    dvr_autorec_save(dae);
+    dvr_autorec_changed(dae, 1);
+  }
+  pthread_mutex_unlock(&global_lock);
+
+  return 0;
+}
+
+static int
+api_dvr_autorec_create_by_series
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  dvr_autorec_entry_t *dae;
+  epg_broadcast_t *e;
+  htsmsg_t *entries, *entries2 = NULL, *m;
+  htsmsg_field_t *f;
+  const char *config_uuid, *s;
+  int count = 0;
+
+  if (!(entries = htsmsg_get_list(args, "entries"))) {
+    entries = entries2 = api_dvr_entry_create_from_single(args);
+    if (!entries)
+      return EINVAL;
+  }
+
+  HTSMSG_FOREACH(f, entries) {
+    if (!(m = htsmsg_get_map_by_field(f))) continue;
+
+    if (!(s = htsmsg_get_str(m, "event_id")))
+      continue;
+
+    config_uuid = htsmsg_get_str(m, "config_uuid");
+
+    pthread_mutex_lock(&global_lock);
+    if ((e = epg_broadcast_find_by_id(strtoll(s, NULL, 10)))) {
+      dvr_config_t *cfg = dvr_config_find_by_list(perm->aa_dvrcfgs, config_uuid);
+      if (cfg) {
+        dae = dvr_autorec_add_series_link(idnode_uuid_as_str(&cfg->dvr_id),
+                                          e,
+                                          perm->aa_username,
+                                          perm->aa_representative,
+                                          "Created from EPG query");
+        if (dae) {
+          dvr_autorec_save(dae);
+          dvr_autorec_changed(dae, 1);
+        }
+      }
+    }
+    pthread_mutex_unlock(&global_lock);
+    count++;
+  }
+
+  htsmsg_destroy(entries2);
+
+  return !count ? EINVAL : 0;
+}
+
+static void
+api_dvr_timerec_grid
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
+{
+  dvr_timerec_entry_t *dte;
+
+  TAILQ_FOREACH(dte, &timerec_entries, dte_link)
+    idnode_set_add(ins, (idnode_t*)dte, &conf->filter);
+}
+
+static int
+api_dvr_timerec_create
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  htsmsg_t *conf;
+  dvr_timerec_entry_t *dte;
+
+  if (!(conf  = htsmsg_get_map(args, "conf")))
+    return EINVAL;
+
+  if (perm->aa_username)
+    htsmsg_set_str(conf, "owner", perm->aa_username);
+  if (perm->aa_representative)
+    htsmsg_set_str(conf, "creator", perm->aa_representative);
+
+  pthread_mutex_lock(&global_lock);
+  dte = dvr_timerec_create(NULL, conf);
+  if (dte) {
+    dvr_timerec_save(dte);
+    dvr_timerec_check(dte);
+  }
+  pthread_mutex_unlock(&global_lock);
+
+  return 0;
+}
+
+void api_dvr_init ( void )
+{
+  static api_hook_t ah[] = {
+    { "dvr/config/class",          ACCESS_OR|ACCESS_ADMIN|ACCESS_RECORDER,
+                                     api_idnode_class, (void*)&dvr_config_class },
+    { "dvr/config/grid",           ACCESS_OR|ACCESS_ADMIN|ACCESS_RECORDER,
+                                     api_idnode_grid, api_dvr_config_grid },
+    { "dvr/config/create",         ACCESS_ADMIN, api_dvr_config_create, NULL },
+
+    { "dvr/entry/class",           ACCESS_RECORDER, api_idnode_class, (void*)&dvr_entry_class },
+    { "dvr/entry/grid",            ACCESS_RECORDER, api_idnode_grid, api_dvr_entry_grid },
+    { "dvr/entry/grid_upcoming",   ACCESS_RECORDER, api_idnode_grid, api_dvr_entry_grid_upcoming },
+    { "dvr/entry/grid_finished",   ACCESS_RECORDER, api_idnode_grid, api_dvr_entry_grid_finished },
+    { "dvr/entry/grid_failed",     ACCESS_RECORDER, api_idnode_grid, api_dvr_entry_grid_failed },
+    { "dvr/entry/create",          ACCESS_RECORDER, api_dvr_entry_create, NULL },
+    { "dvr/entry/create_by_event", ACCESS_RECORDER, api_dvr_entry_create_by_event, NULL },
+    { "dvr/entry/cancel",          ACCESS_RECORDER, api_dvr_entry_cancel, NULL },
+
+    { "dvr/autorec/class",         ACCESS_RECORDER, api_idnode_class, (void*)&dvr_autorec_entry_class },
+    { "dvr/autorec/grid",          ACCESS_RECORDER, api_idnode_grid,  api_dvr_autorec_grid },
+    { "dvr/autorec/create",        ACCESS_RECORDER, api_dvr_autorec_create, NULL },
+    { "dvr/autorec/create_by_series", ACCESS_RECORDER, api_dvr_autorec_create_by_series, NULL },
+
+    { "dvr/timerec/class",         ACCESS_RECORDER, api_idnode_class, (void*)&dvr_timerec_entry_class },
+    { "dvr/timerec/grid",          ACCESS_RECORDER, api_idnode_grid,  api_dvr_timerec_grid },
+    { "dvr/timerec/create",        ACCESS_RECORDER, api_dvr_timerec_create, NULL },
+
+    { NULL },
+  };
+
+  api_register_all(ah);
+}

src/api/api_epg.c

@@ -22,17 +22,63 @@
 #include "access.h"
 #include "api.h"
 #include "epg.h"
+#include "imagecache.h"
 #include "dvr/dvr.h"
 
 static htsmsg_t *
-api_epg_entry ( epg_broadcast_t *eb, const char *lang )
+api_epg_get_list ( const char *s )
+{
+  htsmsg_t *m = NULL;
+  char *r, *saveptr = NULL;
+  if (s && s[0] != '\0') {
+    s = r = strdup(s);
+    r = strtok_r(r, ";", &saveptr);
+    while (r) {
+      while (*r != '\0' && *r <= ' ')
+        r++;
+      if (*r != '\0') {
+        if (m == NULL)
+          m = htsmsg_create_list();
+        htsmsg_add_str(m, NULL, r);
+      }
+      r = strtok_r(NULL, ";", &saveptr);
+    }
+    free((char *)s);
+  }
+  return m;
+}
+
+static void
+api_epg_add_channel ( htsmsg_t *m, channel_t *ch )
+{
+  int64_t chnum;
+  char buf[32];
+  const char *s;
+  htsmsg_add_str(m, "channelName", channel_get_name(ch));
+  htsmsg_add_str(m, "channelUuid", channel_get_uuid(ch));
+  if ((chnum = channel_get_number(ch)) >= 0) {
+    uint32_t maj = chnum / CHANNEL_SPLIT;
+    uint32_t min = chnum % CHANNEL_SPLIT;
+    if (min)
+      snprintf(buf, sizeof(buf), "%u.%u", maj, min);
+    else
+      snprintf(buf, sizeof(buf), "%u", maj);
+    htsmsg_add_str(m, "channelNumber", buf);
+  }
+  if ((s = channel_get_icon(ch)) != NULL)
+    htsmsg_add_str(m, "channelIcon", s);
+}
+
+static htsmsg_t *
+api_epg_entry ( epg_broadcast_t *eb, const char *lang, access_t *perm )
 {
   const char *s;
   char buf[64];
   epg_episode_t *ee = eb->episode;
   channel_t     *ch = eb->channel;
-  htsmsg_t *m;
+  htsmsg_t *m, *m2;
   epg_episode_num_t epnum;
+  epg_genre_t *eg;
   dvr_entry_t *de;
 
   if (!ee || !ch) return NULL;
@@ -40,8 +86,6 @@ api_epg_entry ( epg_broadcast_t *eb, const char *lang )
   m = htsmsg_create_map();
 
   /* EPG IDs */
-  // Note: "id" is for UI compat, remove it?
-  htsmsg_add_u32(m, "id", eb->id);
   htsmsg_add_u32(m, "eventId", eb->id);
   if (ee) {
     htsmsg_add_u32(m, "episodeId", ee->id);
@@ -55,25 +99,17 @@ api_epg_entry ( epg_broadcast_t *eb, const char *lang )
   }
   
   /* Channel Info */
-  // Note: "channel" is for UI compat, remove it?
-  htsmsg_add_str(m, "channel",     channel_get_name(ch));
-  htsmsg_add_str(m, "channelName", channel_get_name(ch));
-  htsmsg_add_str(m, "channelUuid", channel_get_uuid(ch));
-  htsmsg_add_u32(m, "channelId",   channel_get_id(ch));
+  api_epg_add_channel(m, ch);
   
   /* Time */
   htsmsg_add_s64(m, "start", eb->start);
   htsmsg_add_s64(m, "stop", eb->stop);
-  htsmsg_add_s64(m, "duration", eb->stop - eb->start);
-  // TODO: the above can be removed
 
   /* Title/description */
   if ((s = epg_broadcast_get_title(eb, lang)))
     htsmsg_add_str(m, "title", s);
-#if TODO
   if ((s = epg_broadcast_get_subtitle(eb, lang)))
     htsmsg_add_str(m, "subtitle", s);
-#endif
   if ((s = epg_broadcast_get_summary(eb, lang)))
     htsmsg_add_str(m, "summary", s);
   if ((s = epg_broadcast_get_description(eb, lang)))
@@ -108,11 +144,32 @@ api_epg_entry ( epg_broadcast_t *eb, const char *lang )
     /* Image */
     if (ee->image)
       htsmsg_add_str(m, "image", ee->image);
+
+    /* Rating */
+    if (ee->star_rating)
+      htsmsg_add_u32(m, "starRating", ee->star_rating);
+    if (ee->age_rating)
+      htsmsg_add_u32(m, "ageRating", ee->age_rating);
+
+    /* Content Type */
+    m2 = NULL;
+    LIST_FOREACH(eg, &ee->genre, link) {
+      if (m2 == NULL)
+        m2 = htsmsg_create_list();
+      htsmsg_add_u32(m2, NULL, eg->code);
+    }
+    if (m2)
+      htsmsg_add_msg(m, "genre", m2);
   }
-    
+
   /* Recording */
-  if ((de = dvr_entry_find_by_event(eb)))
-    htsmsg_add_u32(m, "dvrId", de->de_id);
+  if (!access_verify2(perm, ACCESS_RECORDER) &&
+      (de = dvr_entry_find_by_event(eb)) &&
+      !access_verify_list(perm->aa_dvrcfgs,
+                          idnode_uuid_as_str(&de->de_config->dvr_id))) {
+    htsmsg_add_str(m, "dvrUuid", idnode_uuid_as_str(&de->de_id));
+    htsmsg_add_str(m, "dvrState", dvr_entry_schedstatus(de));
+  }
 
   /* Next event */
   if ((eb = epg_broadcast_get_next(eb)))
@@ -121,25 +178,244 @@ api_epg_entry ( epg_broadcast_t *eb, const char *lang )
   return m;
 }
 
+static void
+api_epg_filter_set_str
+  ( epg_filter_str_t *f, const char *str, int comp )
+{
+  f->str = strdup(str);
+  f->comp = comp;
+}
+
+static void
+api_epg_filter_add_str
+  ( epg_query_t *eq, const char *k, const char *v, int comp )
+{
+  if (!strcmp(k, "channelName"))
+    api_epg_filter_set_str(&eq->channel_name, v, comp);
+  else if (!strcmp(k, "title"))
+    api_epg_filter_set_str(&eq->title, v, comp);
+  else if (!strcmp(k, "subtitle"))
+    api_epg_filter_set_str(&eq->subtitle, v, comp);
+  else if (!strcmp(k, "summary"))
+    api_epg_filter_set_str(&eq->summary, v, comp);
+  else if (!strcmp(k, "description"))
+    api_epg_filter_set_str(&eq->description, v, comp);
+}
+
+static void
+api_epg_filter_set_num
+  ( epg_filter_num_t *f, int64_t v1, int64_t v2, int comp )
+{
+  /* Range? */
+  if (f->comp == EC_LT && comp == EC_GT) {
+    f->val2 = f->val1;
+    f->val1 = v1;
+    f->comp = EC_RG;
+    return;
+  }
+  if (f->comp == EC_GT && comp == EC_LT) {
+    f->val2 = v1;
+    f->comp = EC_RG;
+    return;
+  }
+  f->val1 = v1;
+  f->val2 = v2;
+  f->comp = comp;
+}
+
+static void
+api_epg_filter_add_num
+  ( epg_query_t *eq, const char *k, int64_t v1, int64_t v2, int comp )
+{
+  if (!strcmp(k, "start"))
+    api_epg_filter_set_num(&eq->start, v1, v2, comp);
+  else if (!strcmp(k, "stop"))
+    api_epg_filter_set_num(&eq->stop, v1, v2, comp);
+  else if (!strcmp(k, "duration"))
+    api_epg_filter_set_num(&eq->duration, v1, v2, comp);
+  else if (!strcmp(k, "episode"))
+    api_epg_filter_set_num(&eq->episode, v1, v2, comp);
+  else if (!strcmp(k, "stars"))
+    api_epg_filter_set_num(&eq->episode, v1, v2, comp);
+  else if (!strcmp(k, "age"))
+    api_epg_filter_set_num(&eq->age, v1, v2, comp);
+}
+
+static struct strtab sortcmptab[] = {
+  { "start",         ESK_START },
+  { "stop",          ESK_STOP },
+  { "duration",      ESK_DURATION },
+  { "title",         ESK_TITLE },
+  { "subtitle",      ESK_SUBTITLE },
+  { "summary",       ESK_SUMMARY },
+  { "description",   ESK_DESCRIPTION },
+  { "channelName",   ESK_CHANNEL },
+  { "channelNumber", ESK_CHANNEL_NUM },
+  { "starRating",    ESK_STARS },
+  { "ageRating",     ESK_AGE },
+  { "genre",         ESK_GENRE }
+};
+
+static struct strtab filtcmptab[] = {
+  { "gt",    EC_GT },
+  { "lt",    EC_LT },
+  { "eq",    EC_EQ },
+  { "regex", EC_RE },
+  { "range", EC_RG }
+};
+
+static int64_t
+api_epg_decode_channel_num ( const char *s )
+{
+   int64_t v = atol(s);
+   const char *s1 = strchr(s, '.');
+   if (s1)
+     v += atol(s1 + 1) % CHANNEL_SPLIT;
+   return v;
+}
+
 static int
 api_epg_grid
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   int i;
-  epg_query_result_t eqr;
-  const char *ch, *tag, *title, *lang/*, *genre*/;
-  uint32_t start, limit, end;
-  htsmsg_t *l = NULL, *e;
+  epg_query_t eq;
+  const char *lang, *str;
+  uint32_t start, limit, end, genre;
+  int64_t duration_min, duration_max;
+  htsmsg_field_t *f, *f2;
+  htsmsg_t *l = NULL, *e, *filter;
 
-  *resp = htsmsg_create_map();
+  memset(&eq, 0, sizeof(eq));
 
-  /* Query params */
-  ch    = htsmsg_get_str(args, "channel");
-  tag   = htsmsg_get_str(args, "tag");
-  //genre = htsmsg_get_str(args, "genre");
-  title = htsmsg_get_str(args, "title");
-  lang  = htsmsg_get_str(args, "lang");
-  // TODO: support multiple tag/genre/channel?
+  lang = htsmsg_get_str(args, "lang");
+  if (lang)
+    eq.lang = strdup(lang);
+  str = htsmsg_get_str(args, "title");
+  if (str)
+    eq.stitle = strdup(str);
+  eq.fulltext = htsmsg_get_bool_or_default(args, "fulltext", 0);
+  str = htsmsg_get_str(args, "channel");
+  if (str)
+    eq.channel = strdup(str);
+  str = htsmsg_get_str(args, "channelTag");
+  if (str)
+    eq.channel_tag = strdup(str);
+
+  duration_min = -1;
+  duration_max = -1;
+  htsmsg_get_s64(args, "durationMin", &duration_min);
+  htsmsg_get_s64(args, "durationMax", &duration_max);
+  if (duration_min > 0 || duration_max > 0) {
+    eq.duration.comp = EC_RG;
+    eq.duration.val1 = duration_min < 0 ? 0 : duration_min;
+    eq.duration.val2 = duration_max < 0 ? 0 : duration_max;
+  }
+
+  if (!htsmsg_get_u32(args, "contentType", &genre)) {
+    eq.genre = eq.genre_static;
+    eq.genre[0] = genre;
+    eq.genre_count = 1;
+  }
+
+  /* Filter params */
+  if ((filter = htsmsg_get_list(args, "filter"))) {
+    HTSMSG_FOREACH(f, filter) {
+      const char *k, *t, *v;
+      int comp;
+      if (!(e = htsmsg_get_map_by_field(f))) continue;
+      if (!(k = htsmsg_get_str(e, "field"))) continue;
+      if (!(t = htsmsg_get_str(e, "type")))  continue;
+      comp = str2val(htsmsg_get_str(e, "comparison") ?: "", filtcmptab);
+      if (comp == -1) comp = EC_EQ;
+      if (!strcmp(k, "channelNumber")) {
+        if (!strcmp(t, "numeric")) {
+          f2 = htsmsg_field_find(e, "value");
+          if (f2) {
+            int64_t v1, v2 = 0;
+            if (f2->hmf_type == HMF_STR) {
+              const char *s = htsmsg_field_get_str(f2);
+              const char *z = s ? strchr(s, ';') : NULL;
+              if (s) {
+                v1 = api_epg_decode_channel_num(s);
+                if (z)
+                  v2 = api_epg_decode_channel_num(z);
+                api_epg_filter_set_num(&eq.channel_num, v1, v2, comp);
+              }
+            } else {
+              if (!htsmsg_field_get_s64(f2, &v1)) {
+                if (v1 < CHANNEL_SPLIT)
+                  v1 *= CHANNEL_SPLIT;
+                api_epg_filter_set_num(&eq.channel_num, v1, 0, comp);
+              }
+            }
+          }
+        }
+      } else if (!strcmp(k, "genre")) {
+        if (!strcmp(t, "numeric")) {
+          f2 = htsmsg_field_find(e, "value");
+          if (f2) {
+            int64_t v;
+            if (f2->hmf_type == HMF_STR) {
+              htsmsg_t *z = api_epg_get_list(htsmsg_field_get_str(f2));
+              if (z) {
+                htsmsg_field_t *f3;
+                uint32_t count = 0;
+                HTSMSG_FOREACH(f3, z)
+                  count++;
+                if (ARRAY_SIZE(eq.genre_static) > count)
+                  eq.genre = malloc(sizeof(eq.genre[0]) * count);
+                else
+                  eq.genre = eq.genre_static;
+                HTSMSG_FOREACH(f3, z)
+                  if (!htsmsg_field_get_s64(f3, &v))
+                    eq.genre[eq.genre_count++] = v;
+              }
+            } else {
+              if (!htsmsg_field_get_s64(f2, &v)) {
+                eq.genre_count = 1;
+                eq.genre = eq.genre_static;
+                eq.genre[0] = v;
+              }
+            }
+          }
+        }
+      } else if (!strcmp(t, "string")) {
+        if ((v = htsmsg_get_str(e, "value")))
+          api_epg_filter_add_str(&eq, k, v, EC_RE);
+      } else if (!strcmp(t, "numeric")) {
+        f2 = htsmsg_field_find(e, "value");
+        if (f2) {
+          int64_t v1 = 0, v2 = 0;
+          if (f2->hmf_type == HMF_STR) {
+            const char *z = htsmsg_field_get_str(f2);
+            if (z) {
+              const char *z2 = strchr(z, ';');
+              if (z2)
+                v2 = strtoll(z2 + 1, NULL, 0);
+              v1 = strtoll(z, NULL, 0);
+            }
+            api_epg_filter_add_num(&eq, k, v1, v2, comp);
+          } else {
+            if (!htsmsg_field_get_s64(f2, &v1))
+              api_epg_filter_add_num(&eq, k, v1, v2, comp);
+          }
+        }
+      }
+    }
+  }
+
+  /* Sort */
+  if ((str = htsmsg_get_str(args, "sort"))) {
+    int skey = str2val(str, sortcmptab);
+    if (skey >= 0) {
+      eq.sort_key = skey;
+      if ((str = htsmsg_get_str(args, "dir")) && !strcasecmp(str, "DESC"))
+        eq.sort_dir = IS_DSC;
+      else
+        eq.sort_dir = IS_ASC;
+    }
+  } /* else.. keep default start time ascending sorting */
 
   /* Pagination settings */
   start = htsmsg_get_u32_or_default(args, "start", 0);
@@ -147,34 +423,151 @@ api_epg_grid
 
   /* Query the EPG */
   pthread_mutex_lock(&global_lock); 
-  epg_query(&eqr, ch, tag, NULL, /*genre,*/ title, lang);
-  epg_query_sort(&eqr);
-  // TODO: optional sorting
+  epg_query(&eq, perm);
 
   /* Build response */
-  start = MIN(eqr.eqr_entries, start);
-  end   = MIN(eqr.eqr_entries, start + limit);
+  start = MIN(eq.entries, start);
+  end   = MIN(eq.entries, start + limit);
+  l     = htsmsg_create_list();
   for (i = start; i < end; i++) {
-    if (!(e = api_epg_entry(eqr.eqr_array[i], lang))) continue;
-    if (!l) l = htsmsg_create_list();
+    if (!(e = api_epg_entry(eq.result[i], lang, perm))) continue;
     htsmsg_add_msg(l, NULL, e);
   }
+  pthread_mutex_unlock(&global_lock);
 
+  epg_query_free(&eq);
+
+  /* Build response */
+  *resp = htsmsg_create_map();
+  htsmsg_add_u32(*resp, "totalCount", eq.entries);
+  htsmsg_add_msg(*resp, "entries", l);
+
+  return 0;
+}
+
+static void
+api_epg_episode_broadcasts
+  ( access_t *perm, htsmsg_t *l, const char *lang, epg_episode_t *ep,
+    uint32_t *entries, epg_broadcast_t *ebc_skip )
+{
+  epg_broadcast_t *ebc;
+  channel_t *ch;
+  htsmsg_t *m;
+
+  LIST_FOREACH(ebc, &ep->broadcasts, ep_link) {
+    ch = ebc->channel;
+    if (ch == NULL) continue;
+    if (ebc == ebc_skip) continue;
+    m = api_epg_entry(ebc, lang, perm);
+    htsmsg_add_msg(l, NULL, m);
+    (*entries)++;
+  }
+}
+
+static int
+api_epg_alternative
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  uint32_t id, entries = 0;
+  htsmsg_t *l = htsmsg_create_list();
+  epg_broadcast_t *e;
+  const char *lang = htsmsg_get_str(args, "lang");
+
+  if (!htsmsg_get_u32(args, "eventId", &id))
+    return -EINVAL;
+
+  /* Main Job */
+  pthread_mutex_lock(&global_lock);
+  e = epg_broadcast_find_by_id(id);
+  if (e && e->episode)
+    api_epg_episode_broadcasts(perm, l, lang, e->episode, &entries, e);
   pthread_mutex_unlock(&global_lock);
 
   /* Build response */
-  htsmsg_add_u32(*resp, "totalCount", eqr.eqr_entries);
-  if (l)
-    htsmsg_add_msg(*resp, "events", l);
+  htsmsg_add_u32(*resp, "totalCount", entries);
+  htsmsg_add_msg(*resp, "entries", l);
 
+  return 0;
+}
+
+static int
+api_epg_related
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  uint32_t id, entries = 0;
+  htsmsg_t *l = htsmsg_create_list();
+  epg_broadcast_t *e;
+  epg_episode_t *ep, *ep2;
+  const char *lang = htsmsg_get_str(args, "lang");
   
+  if (!htsmsg_get_u32(args, "eventId", &id))
+    return -EINVAL;
+
+  /* Main Job */
+  pthread_mutex_lock(&global_lock);
+  e = epg_broadcast_find_by_id(id);
+  ep = e ? e->episode : NULL;
+  if (ep && ep->brand) {
+    LIST_FOREACH(ep2, &ep->brand->episodes, blink) {
+      if (ep2 == ep) continue;
+      if (!ep2->title) continue;
+      api_epg_episode_broadcasts(perm, l, lang, ep2, &entries, e);
+      entries++;
+    }
+  } else if (ep && ep->season) {
+    LIST_FOREACH(ep2, &ep->season->episodes, slink) {
+      if (ep2 == ep) continue;
+      if (!ep2->title) continue;
+      api_epg_episode_broadcasts(perm, l, lang, ep2, &entries, e);
+    }
+  }
+  pthread_mutex_unlock(&global_lock);
+
+  /* Build response */
+  htsmsg_add_u32(*resp, "totalCount", entries);
+  htsmsg_add_msg(*resp, "entries", l);
+
+  return 0;
+}
+
+static int
+api_epg_brand_list(access_t *perm, void *opaque, const char *op,
+                   htsmsg_t *args, htsmsg_t **resp)
+{
+  htsmsg_t *array;
+
+  *resp = htsmsg_create_map();
+  pthread_mutex_lock(&global_lock);
+  array = epg_brand_list();
+  pthread_mutex_unlock(&global_lock);
+  htsmsg_add_msg(*resp, "entries", array);
+  return 0;
+}
+
+static int
+api_epg_content_type_list(access_t *perm, void *opaque, const char *op,
+                          htsmsg_t *args, htsmsg_t **resp)
+{
+  htsmsg_t *array;
+  int full = 0;
+
+  htsmsg_get_bool(args, "full", &full);
+
+  *resp = htsmsg_create_map();
+  array = epg_genres_list_all(full ? 0 : 1, 0);
+  htsmsg_add_msg(*resp, "entries", array);
   return 0;
 }
 
 void api_epg_init ( void )
 {
   static api_hook_t ah[] = {
-    { "epg/grid",  ACCESS_ANONYMOUS, api_epg_grid, NULL },
+    { "epg/events/grid",        ACCESS_ANONYMOUS, api_epg_grid, NULL },
+    { "epg/events/alternative", ACCESS_ANONYMOUS, api_epg_alternative, NULL },
+    { "epg/events/related",     ACCESS_ANONYMOUS, api_epg_related, NULL },
+    { "epg/brand/list",         ACCESS_ANONYMOUS, api_epg_brand_list, NULL },
+    { "epg/content_type/list",  ACCESS_ANONYMOUS, api_epg_content_type_list, NULL },
+
     { NULL },
   };
 

src/api/api_epggrab.c

@@ -24,7 +24,7 @@
 
 static int
 api_epggrab_channel_list
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   htsmsg_t *m;
   pthread_mutex_lock(&global_lock);

src/api/api_esfilter.c

@@ -25,7 +25,7 @@
 
 static void
 api_esfilter_grid
-  ( idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args,
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args,
     esfilter_class_t cls )
 {
   esfilter_t *esf;
@@ -37,7 +37,7 @@ api_esfilter_grid
 
 static int
 api_esfilter_create
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp,
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp,
     esfilter_class_t cls )
 {
   htsmsg_t *conf;
@@ -54,11 +54,11 @@ api_esfilter_create
 
 #define ESFILTER(func, t) \
 static void api_esfilter_grid_##func \
-  ( idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args ) \
-{ return api_esfilter_grid(ins, conf, args, (t)); } \
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args ) \
+{ return api_esfilter_grid(perm, ins, conf, args, (t)); } \
 static int api_esfilter_create_##func \
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp ) \
-{ return api_esfilter_create(opaque, op, args, resp, (t)); }
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp ) \
+{ return api_esfilter_create(perm, opaque, op, args, resp, (t)); }
 
 ESFILTER(video, ESF_CLASS_VIDEO);
 ESFILTER(audio, ESF_CLASS_AUDIO);

src/api/api_idnode.c

@@ -23,6 +23,35 @@
 #include "htsmsg.h"
 #include "api.h"
 
+static htsmsg_t *
+api_idnode_flist_conf( htsmsg_t *args, const char *name )
+{
+  htsmsg_t *m = NULL;
+  const char *s = htsmsg_get_str(args, name);
+  char *r, *saveptr = NULL;
+  int use = 1;
+  if (s && s[0] == '-') {
+    use = 0;
+    s++;
+  }
+  if (s && s[0] != '\0') {
+    s = r = strdup(s);
+    r = strtok_r(r, ",;:", &saveptr);
+    while (r) {
+      while (*r != '\0' && *r <= ' ')
+        r++;
+      if (*r != '\0') {
+        if (m == NULL)
+          m = htsmsg_create_map();
+        htsmsg_add_bool(m, r, use);
+      }
+      r = strtok_r(NULL, ",;:", &saveptr);
+    }
+    free((char *)s);
+  }
+  return m;
+}
+
 static struct strtab filtcmptab[] = {
   { "gt", IC_GT },
   { "lt", IC_LT },
@@ -33,21 +62,12 @@ static void
 api_idnode_grid_conf
   ( htsmsg_t *args, api_idnode_grid_conf_t *conf )
 {
-  htsmsg_field_t *f;
+  htsmsg_field_t *f, *f2;
   htsmsg_t *filter, *e;
   const char *str;
 
-  /* Start */
-  if ((str = htsmsg_get_str(args, "start")))
-    conf->start = atoi(str);
-  else
-    conf->start = 0;
-
-  /* Limit */
-  if ((str = htsmsg_get_str(args, "limit")))
-    conf->limit = atoi(str);
-  else
-    conf->limit = 50;
+  conf->start = htsmsg_get_u32_or_default(args, "start", 0);
+  conf->limit = htsmsg_get_u32_or_default(args, "limit", 50);
 
   /* Filter */
   if ((filter = htsmsg_get_list(args, "filter"))) {
@@ -60,11 +80,20 @@ api_idnode_grid_conf
         if ((v = htsmsg_get_str(e, "value")))
           idnode_filter_add_str(&conf->filter, k, v, IC_RE);
       } else if (!strcmp(t, "numeric")) {
-        uint32_t v;
-        if (!htsmsg_get_u32(e, "value", &v)) {
-          int t = str2val(htsmsg_get_str(e, "comparison") ?: "",
-                          filtcmptab);
-          idnode_filter_add_num(&conf->filter, k, v, t == -1 ? IC_EQ : t);
+        f2 = htsmsg_field_find(e, "value");
+        if (f2) {
+          int t = str2val(htsmsg_get_str(e, "comparison") ?: "", filtcmptab);
+          if (f2->hmf_type == HMF_DBL) {
+            double dbl;
+            if (!htsmsg_field_get_dbl(f2, &dbl))
+              idnode_filter_add_dbl(&conf->filter, k, dbl, t == -1 ? IC_EQ : t);
+          } else {
+            int64_t v;
+            int64_t intsplit = 0;
+            htsmsg_get_s64(e, "intsplit", &intsplit);
+            if (!htsmsg_field_get_s64(f2, &v))
+              idnode_filter_add_num(&conf->filter, k, v, t == -1 ? IC_EQ : t, intsplit);
+          }
         }
       } else if (!strcmp(t, "boolean")) {
         uint32_t v;
@@ -77,7 +106,7 @@ api_idnode_grid_conf
   /* Sort */
   if ((str = htsmsg_get_str(args, "sort"))) {
     conf->sort.key = str;
-    if ((str = htsmsg_get_str(args, "dir")) && !strcmp(str, "DESC"))
+    if ((str = htsmsg_get_str(args, "dir")) && !strcasecmp(str, "DESC"))
       conf->sort.dir = IS_DSC;
     else
       conf->sort.dir = IS_ASC;
@@ -87,10 +116,11 @@ api_idnode_grid_conf
 
 int
 api_idnode_grid
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   int i;
   htsmsg_t *list, *e;
+  htsmsg_t *flist = api_idnode_flist_conf(args, "list");
   api_idnode_grid_conf_t conf = { 0 };
   idnode_set_t ins = { 0 };
   api_idnode_grid_callback_t cb = opaque;
@@ -100,7 +130,7 @@ api_idnode_grid
 
   /* Create list */
   pthread_mutex_lock(&global_lock);
-  cb(&ins, &conf, args);
+  cb(perm, &ins, &conf, args);
 
   /* Sort */
   if (conf.sort.key)
@@ -111,7 +141,7 @@ api_idnode_grid
   for (i = conf.start; i < ins.is_count && conf.limit != 0; i++) {
     e = htsmsg_create_map();
     htsmsg_add_str(e, "uuid", idnode_uuid_as_str(ins.is_array[i]));
-    idnode_read0(ins.is_array[i], e, 0);
+    idnode_read0(ins.is_array[i], e, flist, 0);
     htsmsg_add_msg(list, NULL, e);
     if (conf.limit > 0) conf.limit--;
   }
@@ -126,13 +156,14 @@ api_idnode_grid
   /* Cleanup */
   free(ins.is_array);
   idnode_filter_clear(&conf.filter);
+  htsmsg_destroy(flist);
 
   return 0;
 }
 
 int
 api_idnode_load_by_class
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   int i, _enum;
   const idclass_t *idc;
@@ -150,10 +181,13 @@ api_idnode_load_by_class
   assert(idc);
 
   l = htsmsg_create_list();
-  if ((is = idnode_find_all(idc))) {
+  if ((is = idnode_find_all(idc, NULL))) {
     for (i = 0; i < is->is_count; i++) {
       in = is->is_array[i];
 
+      if (idnode_perm(in, perm, NULL))
+        continue;
+
       /* Name/UUID only */
       if (_enum) {
         e = htsmsg_create_map();
@@ -161,8 +195,11 @@ api_idnode_load_by_class
         htsmsg_add_str(e, "val", idnode_get_title(in));
 
       /* Full record */
-      } else
-        e = idnode_serialize(in);
+      } else {
+        htsmsg_t *flist = api_idnode_flist_conf(args, "list");
+        e = idnode_serialize0(in, flist, 0);
+        htsmsg_destroy(flist);
+      }
         
       if (e)
         htsmsg_add_msg(l, NULL, e);
@@ -180,11 +217,12 @@ api_idnode_load_by_class
 
 static int
 api_idnode_load
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
-  int err = 0;
+  int err = 0, meta, count = 0;
   idnode_t *in;
-  htsmsg_t *uuids, *l = NULL;
+  htsmsg_t *uuids, *l = NULL, *m;
+  htsmsg_t *flist;
   htsmsg_field_t *f;
   const char *uuid, *class;
 
@@ -197,7 +235,7 @@ api_idnode_load
     if (!idc)
       return EINVAL;
     // TODO: bit naff that 2 locks are required here
-    return api_idnode_load_by_class((void*)idc, NULL, args, resp);
+    return api_idnode_load_by_class(perm, (void*)idc, NULL, args, resp);
   }
   
   /* UUIDs */
@@ -206,25 +244,48 @@ api_idnode_load
   if (!(uuids = htsmsg_field_get_list(f)))
     if (!(uuid = htsmsg_field_get_str(f)))
       return EINVAL;
+  meta = htsmsg_get_s32_or_default(args, "meta", 0);
+
+  flist = api_idnode_flist_conf(args, "list");
 
   pthread_mutex_lock(&global_lock);
 
   /* Multiple */
   if (uuids) {
+    const idnodes_rb_t *domain = NULL;
     l = htsmsg_create_list();
     HTSMSG_FOREACH(f, uuids) {
       if (!(uuid = htsmsg_field_get_str(f))) continue;
-      if (!(in   = idnode_find(uuid, NULL))) continue;
-      htsmsg_add_msg(l, NULL, idnode_serialize(in));
+      if (!(in   = idnode_find(uuid, NULL, domain))) continue;
+      domain = in->in_domain;
+      if (idnode_perm(in, perm, NULL)) {
+        err = EPERM;
+        continue;
+      }
+      m = idnode_serialize0(in, flist, 0);
+      if (meta > 0)
+        htsmsg_add_msg(m, "meta", idclass_serialize0(in->in_class, flist, 0));
+      htsmsg_add_msg(l, NULL, m);
+      count++;
     }
 
+    if (count)
+      err = 0;
+
   /* Single */
   } else {
-    if (!(in = idnode_find(uuid, NULL)))
+    if (!(in = idnode_find(uuid, NULL, NULL)))
       err = ENOENT;
     else {
-      l     = htsmsg_create_list();
-      htsmsg_add_msg(l, NULL, idnode_serialize(in));
+      if (idnode_perm(in, perm, NULL)) {
+        err = EPERM;
+      } else {
+        l = htsmsg_create_list();
+        m = idnode_serialize0(in, flist, 0);
+        if (meta > 0)
+          htsmsg_add_msg(m, "meta", idclass_serialize0(in->in_class, flist, 0));
+        htsmsg_add_msg(l, NULL, m);
+      }
     }
   }
 
@@ -235,18 +296,21 @@ api_idnode_load
 
   pthread_mutex_unlock(&global_lock);
 
+  htsmsg_destroy(flist);
+
   return err;
 }
 
 static int
 api_idnode_save
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   int err = EINVAL;
   idnode_t *in;
   htsmsg_t *msg, *conf;
   htsmsg_field_t *f;
   const char *uuid;
+  int count = 0;
 
   if (!(f = htsmsg_field_find(args, "node")))
     return EINVAL;
@@ -260,23 +324,35 @@ api_idnode_save
   if (!msg->hm_islist) {
     if (!(uuid = htsmsg_get_str(msg, "uuid")))
       goto exit;
-    if (!(in = idnode_find(uuid, NULL)))
+    if (!(in = idnode_find(uuid, NULL, NULL)))
       goto exit;
+    if (idnode_perm(in, perm, msg)) {
+      err = EPERM;
+      goto exit;
+    }
     idnode_update(in, msg);
     err = 0;
 
   /* Multiple */
   } else {
+    const idnodes_rb_t *domain = NULL;
     HTSMSG_FOREACH(f, msg) {
       if (!(conf = htsmsg_field_get_map(f)))
         continue;
       if (!(uuid = htsmsg_get_str(conf, "uuid")))
         continue;
-      if (!(in = idnode_find(uuid, NULL)))
+      if (!(in = idnode_find(uuid, NULL, domain)))
         continue;
+      domain = in->in_domain;
+      if (idnode_perm(in, perm, conf)) {
+        err = EPERM;
+        continue;
+      }
+      count++;
       idnode_update(in, conf);
     }
-    err = 0;
+    if (count)
+      err = 0;
   }
 
   // TODO: return updated UUIDs?
@@ -289,7 +365,7 @@ exit:
 
 int
 api_idnode_tree
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   const char *uuid;
   const char *root = NULL;
@@ -313,7 +389,7 @@ api_idnode_tree
   pthread_mutex_lock(&global_lock);
 
   if (!isroot || root) {
-    if (!(node = idnode_find(isroot ? root : uuid, NULL))) {
+    if (!(node = idnode_find(isroot ? root : uuid, NULL, NULL))) {
       pthread_mutex_unlock(&global_lock);
       return EINVAL;
     }
@@ -329,7 +405,7 @@ api_idnode_tree
 
   /* Children */
   } else {
-    idnode_set_t *v = node ? idnode_get_childs(node) : rootfn();
+    idnode_set_t *v = node ? idnode_get_childs(node) : rootfn(perm);
     if (v) {
       int i;
       idnode_set_sort_by_title(v);
@@ -348,11 +424,12 @@ api_idnode_tree
 
 int
 api_idnode_class
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   int err = EINVAL;
   const char      *name;
   const idclass_t *idc;
+  htsmsg_t *flist = api_idnode_flist_conf(args, "list");
 
   pthread_mutex_lock(&global_lock);
 
@@ -368,17 +445,20 @@ api_idnode_class
   }
 
   err   = 0;
-  *resp = idclass_serialize(idc);
+  *resp = idclass_serialize0(idc, flist, 0);
 
 exit:
   pthread_mutex_unlock(&global_lock);
 
+  htsmsg_destroy(flist);
+
   return err;
 }
 
-static int
+int
 api_idnode_handler
-  ( htsmsg_t *args, htsmsg_t **resp, void (*handler)(idnode_t *in) )
+  ( access_t *perm, htsmsg_t *args, htsmsg_t **resp,
+    void (*handler)(access_t *perm, idnode_t *in) )
 {
   int err = 0;
   idnode_t *in;
@@ -397,19 +477,21 @@ api_idnode_handler
 
   /* Multiple */
   if (uuids) {
+    const idnodes_rb_t *domain = NULL;
     HTSMSG_FOREACH(f, uuids) {
       if (!(uuid = htsmsg_field_get_string(f))) continue;
-      if (!(in   = idnode_find(uuid, NULL))) continue;
-      handler(in);
+      if (!(in   = idnode_find(uuid, NULL, domain))) continue;
+      domain = in->in_domain;
+      handler(perm, in);
     }
   
   /* Single */
   } else {
     uuid = htsmsg_field_get_string(f);
-    if (!(in   = idnode_find(uuid, NULL)))
+    if (!(in   = idnode_find(uuid, NULL, NULL)))
       err = ENOENT;
     else
-      handler(in);
+      handler(perm, in);
   }
 
   pthread_mutex_unlock(&global_lock);
@@ -417,25 +499,43 @@ api_idnode_handler
   return err;
 }
 
+static void
+api_idnode_delete_ (access_t *perm, idnode_t *in)
+{
+  return idnode_delete(in);
+}
+
 static int
 api_idnode_delete
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
-  return api_idnode_handler(args, resp, idnode_delete);
+  return api_idnode_handler(perm, args, resp, api_idnode_delete_);
+}
+
+static void
+api_idnode_moveup_ (access_t *perm, idnode_t *in)
+{
+  return idnode_moveup(in);
 }
 
 static int
 api_idnode_moveup
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
-  return api_idnode_handler(args, resp, idnode_moveup);
+  return api_idnode_handler(perm, args, resp, api_idnode_moveup_);
+}
+
+static void
+api_idnode_movedown_ (access_t *perm, idnode_t *in)
+{
+  return idnode_movedown(in);
 }
 
 static int
 api_idnode_movedown
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
-  return api_idnode_handler(args, resp, idnode_movedown);
+  return api_idnode_handler(perm, args, resp, api_idnode_movedown_);
 }
 
 void api_idnode_init ( void )

src/api/api_imagecache.c

@@ -27,7 +27,7 @@
 
 static int
 api_imagecache_load
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   htsmsg_t *l;
   pthread_mutex_lock(&global_lock);
@@ -41,11 +41,15 @@ api_imagecache_load
 
 static int
 api_imagecache_save
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
+  int b;
+
   pthread_mutex_lock(&global_lock);
   if (imagecache_set_config(args))
     imagecache_save();
+  if (!htsmsg_get_bool(args, "clean", &b) && b)
+    imagecache_clean();
   pthread_mutex_unlock(&global_lock);
   *resp = htsmsg_create_map();
   htsmsg_add_u32(*resp, "success", 1);

src/api/api_input.c

@@ -30,7 +30,7 @@ static idnode_set_t *
 api_input_hw_tree ( void )
 {
   tvh_hardware_t *th;
-  idnode_set_t *is = idnode_set_create();
+  idnode_set_t *is = idnode_set_create(0);
   TVH_HARDWARE_FOREACH(th)
     idnode_set_add(is, &th->th_id, NULL);
   return is;

src/api/api_intlconv.c

@@ -27,28 +27,22 @@
 
 static int
 api_intlconv_charset_enum
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   const char **chrst;
   htsmsg_t *l, *e;
   
-  int _enum = htsmsg_get_bool_or_default(args, "enum", 0);
-
-  if (_enum) {
-    l = htsmsg_create_list();
-    chrst = intlconv_charsets;
-    while (*chrst) {
-      e = htsmsg_create_map();
-      htsmsg_add_str(e, "key", *chrst);
-      htsmsg_add_str(e, "val", *chrst);
-      htsmsg_add_msg(l, NULL, e);
-      chrst++;
-    }
-    *resp = htsmsg_create_map();
-    htsmsg_add_msg(*resp, "entries", l);
-  } else {
-    // TODO: support full listing v enum
+  l = htsmsg_create_list();
+  chrst = intlconv_charsets;
+  while (*chrst) {
+    e = htsmsg_create_map();
+    htsmsg_add_str(e, "key", *chrst);
+    htsmsg_add_str(e, "val", *chrst);
+    htsmsg_add_msg(l, NULL, e);
+    chrst++;
   }
+  *resp = htsmsg_create_map();
+  htsmsg_add_msg(*resp, "entries", l);
   return 0;
 }
 

src/api/api_mpegts.c

@@ -31,7 +31,7 @@
  */
 static int
 api_mpegts_input_network_list
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   int i, err = EINVAL;
   const char *uuid;
@@ -49,6 +49,8 @@ api_mpegts_input_network_list
   if (!mi)
     goto exit;
 
+  tvhtrace("mpegts", "network-list: found input '%s'", mi->mi_name ?: "");
+
   htsmsg_t     *l  = htsmsg_create_list();
   if ((is = mi->mi_network_list(mi))) {
     for (i = 0; i < is->is_count; i++) {
@@ -77,7 +79,7 @@ exit:
  */
 static void
 api_mpegts_network_grid
-  ( idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
 {
   mpegts_network_t *mn;
 
@@ -88,7 +90,7 @@ api_mpegts_network_grid
 
 static int
 api_mpegts_network_builders
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   mpegts_network_builder_t *mnb;
   htsmsg_t *l, *e;
@@ -108,7 +110,7 @@ api_mpegts_network_builders
 
 static int
 api_mpegts_network_create
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   int err;
   const char *class;
@@ -134,9 +136,46 @@ api_mpegts_network_create
   return err;
 }
 
+static int
+api_mpegts_network_scan
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+{
+  htsmsg_field_t *f;
+  htsmsg_t *uuids;
+  mpegts_network_t *mn;
+  const char *uuid;
+
+  if (!(f = htsmsg_field_find(args, "uuid")))
+    return -EINVAL;
+  if ((uuids = htsmsg_field_get_list(f))) {
+    HTSMSG_FOREACH(f, uuids) {
+      if (!(uuid = htsmsg_field_get_str(f))) continue;
+      mn = mpegts_network_find(uuid);
+      if (mn) {
+        pthread_mutex_lock(&global_lock);
+        mpegts_network_scan(mn);
+        pthread_mutex_unlock(&global_lock);
+      }
+    }
+  } else if ((uuid = htsmsg_field_get_str(f))) {
+    mn = mpegts_network_find(uuid);
+    if (mn) {
+      pthread_mutex_lock(&global_lock);
+      mpegts_network_scan(mn);
+      pthread_mutex_unlock(&global_lock);
+    }
+    else
+      return -ENOENT;
+  } else {
+    return -EINVAL;
+  }
+
+  return 0;
+}
+
 static int
 api_mpegts_network_muxclass
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   int err = EINVAL;
   const idclass_t *idc; 
@@ -164,7 +203,7 @@ exit:
 
 static int
 api_mpegts_network_muxcreate
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   int err = EINVAL;
   mpegts_network_t *mn;
@@ -198,7 +237,7 @@ exit:
  */
 static void
 api_mpegts_mux_grid
-  ( idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
 {
   mpegts_network_t *mn;
   mpegts_mux_t *mm;
@@ -225,7 +264,7 @@ api_mpegts_mux_grid
  */
 static void
 api_mpegts_service_grid
-  ( idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
 {
   mpegts_network_t *mn;
   mpegts_mux_t *mm;
@@ -244,7 +283,7 @@ api_mpegts_service_grid
     LIST_FOREACH(mm, &mn->mn_muxes, mm_network_link) {
       if (hide && !mm->mm_is_enabled(mm)) continue;
       LIST_FOREACH(ms, &mm->mm_services, s_dvb_mux_link) {
-        if (hide == 2 && !ms->s_is_enabled((service_t*)ms)) continue;
+        if (hide == 2 && !ms->s_is_enabled((service_t*)ms, 0)) continue;
         idnode_set_add(ins, (idnode_t*)ms, &conf->filter);
       }
     }
@@ -256,7 +295,7 @@ api_mpegts_service_grid
  */
 static void
 api_mpegts_mux_sched_grid
-  ( idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
+  ( access_t *perm, idnode_set_t *ins, api_idnode_grid_conf_t *conf, htsmsg_t *args )
 {
   mpegts_mux_sched_t *mms;
   LIST_FOREACH(mms, &mpegts_mux_sched_all, mms_link)
@@ -265,7 +304,7 @@ api_mpegts_mux_sched_grid
 
 static int
 api_mpegts_mux_sched_create
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   int err;
   htsmsg_t *conf;
@@ -288,13 +327,51 @@ 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 )
+{
+  htsmsg_t *l, *e, *c;
+  htsmsg_field_t *f;
+  const char *s;
+  int satpos, i;
+  char buf[128];
+
+  if (!satellites)
+    return 0;
+
+  l = htsmsg_create_list();
+  HTSMSG_FOREACH(f, satellites) {
+    if((c = htsmsg_get_map_by_field(f)) == NULL)
+      continue;
+    if(htsmsg_get_s32(c, "pos", &satpos))
+      continue;
+    if((s = htsmsg_get_str(c, "name")) == NULL)
+      continue;
+    e = htsmsg_create_map();
+    dvb_sat_position_to_str(satpos, buf, sizeof(buf));
+    htsmsg_add_str(e, "key", buf);
+    i = strlen(buf);
+    snprintf(buf + i, sizeof(buf) - i, " : %s", s);
+    htsmsg_add_str(e, "val", buf);
+    htsmsg_add_msg(l, NULL, e);
+  }
+  *resp = htsmsg_create_map();
+  htsmsg_add_msg(*resp, "entries", l);
+
+  return 0;
+}
+#endif
+
 #if ENABLE_MPEGTS_DVB
 static int
 api_dvb_scanfile_list
-  ( void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
+  ( access_t *perm, void *opaque, const char *op, htsmsg_t *args, htsmsg_t **resp )
 {
   char buf[512];
   const char *type = htsmsg_get_str(args, "type");
+  int satpos = htsmsg_get_s32_or_default(args, "satpos", INT_MAX);
   scanfile_region_list_t *list = NULL;
   htsmsg_t *l, *e;
   scanfile_region_t *r;
@@ -317,6 +394,7 @@ api_dvb_scanfile_list
   l = htsmsg_create_list();
   LIST_FOREACH(r, list, sfr_link) {
     LIST_FOREACH(n, &r->sfr_networks, sfn_link) {
+      if (satpos != INT_MAX && n->sfn_satpos != satpos) continue;
       e = htsmsg_create_map();
       sprintf(buf, "%s/%s/%s", type, r->sfr_id, n->sfn_id);
       htsmsg_add_str(e, "key", buf);
@@ -347,22 +425,24 @@ api_mpegts_init ( void )
   extern const idclass_t mpegts_service_class;
 
   static api_hook_t ah[] = {
-    { "mpegts/input/network_list", ACCESS_ANONYMOUS, api_mpegts_input_network_list, NULL },
-    { "mpegts/network/grid",       ACCESS_ANONYMOUS, api_idnode_grid,  api_mpegts_network_grid },
-    { "mpegts/network/class",      ACCESS_ANONYMOUS, api_idnode_class, (void*)&mpegts_network_class },
-    { "mpegts/network/builders",   ACCESS_ANONYMOUS, api_mpegts_network_builders, NULL },
-    { "mpegts/network/create",     ACCESS_ANONYMOUS, api_mpegts_network_create,   NULL },
-    { "mpegts/network/mux_class",  ACCESS_ANONYMOUS, api_mpegts_network_muxclass, NULL },
-    { "mpegts/network/mux_create", ACCESS_ANONYMOUS, api_mpegts_network_muxcreate, NULL },
-    { "mpegts/mux/grid",           ACCESS_ANONYMOUS, api_idnode_grid,  api_mpegts_mux_grid },
-    { "mpegts/mux/class",          ACCESS_ANONYMOUS, api_idnode_class, (void*)&mpegts_mux_class },
-    { "mpegts/service/grid",       ACCESS_ANONYMOUS, api_idnode_grid,  api_mpegts_service_grid },
-    { "mpegts/service/class",      ACCESS_ANONYMOUS, api_idnode_class, (void*)&mpegts_service_class },
-    { "mpegts/mux_sched/class",    ACCESS_ANONYMOUS, api_idnode_class, (void*)&mpegts_mux_sched_class },
-    { "mpegts/mux_sched/grid",     ACCESS_ANONYMOUS, api_idnode_grid, api_mpegts_mux_sched_grid },
-    { "mpegts/mux_sched/create",   ACCESS_ANONYMOUS, api_mpegts_mux_sched_create, NULL },
+    { "mpegts/input/network_list", ACCESS_ADMIN, api_mpegts_input_network_list, NULL },
+    { "mpegts/network/grid",       ACCESS_ADMIN, api_idnode_grid,  api_mpegts_network_grid },
+    { "mpegts/network/class",      ACCESS_ADMIN, api_idnode_class, (void*)&mpegts_network_class },
+    { "mpegts/network/builders",   ACCESS_ADMIN, api_mpegts_network_builders, NULL },
+    { "mpegts/network/create",     ACCESS_ADMIN, api_mpegts_network_create,   NULL },
+    { "mpegts/network/mux_class",  ACCESS_ADMIN, api_mpegts_network_muxclass, NULL },
+    { "mpegts/network/mux_create", ACCESS_ADMIN, api_mpegts_network_muxcreate, NULL },
+    { "mpegts/network/scan",       ACCESS_ADMIN, api_mpegts_network_scan, NULL },
+    { "mpegts/mux/grid",           ACCESS_ADMIN, api_idnode_grid,  api_mpegts_mux_grid },
+    { "mpegts/mux/class",          ACCESS_ADMIN, api_idnode_class, (void*)&mpegts_mux_class },
+    { "mpegts/service/grid",       ACCESS_ADMIN, api_idnode_grid,  api_mpegts_service_grid },
+    { "mpegts/service/class",      ACCESS_ADMIN, api_idnode_class, (void*)&mpegts_service_class },
+    { "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 },
 #if ENABLE_MPEGTS_DVB
-    { "dvb/scanfile/list",         ACCESS_ANONYMOUS, api_dvb_scanfile_list, NULL },
+    { "dvb/orbitalpos/list",       ACCESS_ADMIN, api_dvb_orbitalpos_list, NULL },
+    { "dvb/scanfile/list",         ACCESS_ADMIN, api_dvb_scanfile_list, NULL },
 #endif
     { NULL },
   };