Merge pull request #1 from tvheadend/master

sync with main repository

Makefile

@@ -156,7 +156,8 @@ SRCS += \
 	src/api/api_imagecache.c \
 	src/api/api_esfilter.c \
 	src/api/api_intlconv.c \
-	src/api/api_access.c
+	src/api/api_access.c \
+	src/api/api_dvr.c
 
 SRCS += \
 	src/parsers/parsers.c \

docs/html/config_access.html

@@ -68,13 +68,11 @@
   <dd>
   Enables access to all video recording functions. This also include administration of the auto recordings.
 
-  <dt>All Configs (VR)
+  <dt>DVR Config Profile
   <dd>
-  Allow to use all DVR configuration profiles. If not set, a DVR
-  configuration profile matched to the authorized user by name is always used
-  (the configuration profile must have same name as the user). If the DVR
-  configuration profile does not exists, the default profile is used.
-  The user is also not allowed to select another profile.
+  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>Web interface
   <dd>
@@ -84,13 +82,6 @@
   <dd>
   Enables access to the Configuration tab.
 
-  <dt>Username Channel Tag Match
-  <dd>
-  If enabled, the user will only be able to access channels with a tag the
-  same name as the username.
-
-  This provides a very rudimentary way of limiting access to certain channels.
-
   <dt>Min Channel Num
   <dd>
   If nonzero, the user will only be able to access channels with
@@ -103,11 +94,9 @@
 
   <dt>Channel Tag
   <dd>
-  If set, the user will only be able to access channels with
-  a channel tag equal to this value. Note that this field stores
-  the tag name (not identified). It means that this field would not be
-  updated when the tag name is changed. A manual re-set of this field
-  is required (for security reasons).
+  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>Comment
   <dd>

docs/html/config_dvrauto.html

@@ -0,0 +1,10 @@
+<div class="hts-doc-text">
+
+ <p>
+ This tab is used to manipulate with the Digital Video Recorder entries -
+ the automatic recording.
+
+ <p>
+ A volunteer required to fill this...
+
+</div>

docs/html/config_dvrlog.html

@@ -0,0 +1,9 @@
+<div class="hts-doc-text">
+
+ <p>
+ This tab is used to manipulate with the Digital Video Recorder entries.
+
+ <p>
+ A volunteer required to fill this...
+
+</div>

docs/html/config_muxes.html

@@ -17,7 +17,40 @@
 		<dd>Whether or not the mux is enabled and thus available.
 
 		<dt>EPG
-		<dd>Whether or not to retrieve EPG information from the mux.
+		<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.
@@ -45,6 +78,11 @@
 
 		<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.