From: mpmc Date: Sun, 3 Dec 2017 21:26:04 +0000 (+0000) Subject: mdhelp: more refresh X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7202a79913cfc3731474adbe48b1f61627d82a8a;p=thirdparty%2Ftvheadend.git mdhelp: more refresh --- diff --git a/docs/class/bouquet.md b/docs/class/bouquet.md index ba775a8af..07f99a1ab 100644 --- a/docs/class/bouquet.md +++ b/docs/class/bouquet.md @@ -2,7 +2,7 @@ --- -# Overview +## Overview Bouquets are broadcaster-defined groupings and orders of channels. diff --git a/docs/class/caclient.md b/docs/class/caclient.md index 8ddaad56e..e81a23e6c 100644 --- a/docs/class/caclient.md +++ b/docs/class/caclient.md @@ -1,45 +1,43 @@ +inc/caclient_contents + +--- + +## Overview + Tvheadend supports connecting to card clients via the cwc (newcamd) and capmt (linux network dvbapi) protocols for so-called 'softcam' descrambling. -!['CA Client Configuration Example'](static/img/doc/caclient/tab.png) +!['CA Client Configuration Example'](static/img/doc/caclient/cas.png) --- -### Menu Bar/Buttons - -The following functions are available: +## Buttons -Button | Function ---------------------|--------- -**Save** | Save any changes made to the CA client configuration. -**Undo** | Undo any changes made to the CA client configuration since the last save. -**Add** | Add a new CA client configuration. -**Delete** | Delete an existing CA client configuration. -**Clone** | Clone the currently selected configuration. -**Move Up** | Move the selected CA client configuration up in the list. -**Move Down** | Move the selected CA client configuration down in the list. -**Show/Hide Passwords** | Reveal/Hide any stored CA client passwords. -**Help** | Display this help page. +inc/buttons --- -### Available CA types +## Client Types -The following configuration parameters are used, depending on the type -of CA access: +Type | Description +------------------------------------------------------------|------------ +[Linux DVB CAM Client](class/caclient_dvbcam) | For use with devices that have a CAM module. +[Code Word Client (CWC) / newcamd](class/caclient_cwc) | For newcamd or CWC. +[CCCam](class/caclient_cccam) | For CCCam connections. +[CAPMT (Linux DVBAPI)](class/caclient_capmt) | For DVBAPI connections +[CSA CBC Constant Code Word](class/caclient_ccw_csa_cbc) | For Constant Code Word connections (CSA/CBC variant) +[DES NCB Constant Code Word](class/caclient_ccw_des_ncb) | For Constant Code Word connections (DES/NCB variant) +[AES ECB Constant Code Word](class/caclient_ccw_aes_ecb) | For Constant Code Word connections (AES/ECB variant) +[AES ECB Constant Code Word](class/caclient_ccw_aes128_ecb) | For Constant Code Word connections (AES128/ECB variant) -* List of types +Click a type to see its properties (below). - - [CAPMT (Linux Network DVBAPI)](class/caclient_capmt) - - [Code word client (newcamd)](class/caclient_cwc) - - [DES constant code word client](class/caclient_ccw_des) - - [AES constant code word client](class/caclient_ccw_aes) --- -### Connection Status +## Connection Status -The icon next to each entry within the grid indicates the client's +The icon next to each entry within the grid indicates the clients connection status. Icon | Description @@ -49,3 +47,26 @@ Icon | Description !['Stop/Disabled Icon'](icons/stop.png) | The client is disabled. --- + +## OSCam Modes + +| Mode | Notes | +|-----------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| OSCam net protocol (rev >= 10389) | A TCP connection to the server is created. All EMM/ECM data is sent to OSCam using this connection without the need for real linuxdvb devices to be present in the system. This mode is suitable for all DVB devices including SAT\>IP and IPTV. If you run your OSCam server on the same machine as TVHeadend, set *Camd.socket filename / IP Address (TCP mode)* field to 127.0.0.1 and *Listen / Connect port* to 9000 (or your preferred TCP port). Note that the TCP port must match OSCam's configuration. The following lines are required in **[dvbapi]** section of oscam.conf: ```boxtype = pc pmt_mode = 4 listen_port = 9000 # or your preferred port```.| +| OSCam new pc-nodmx (rev >= 10389) | Similar to *OSCam net protocol (rev >= 10389)* mode, but a namedpipe (/tmp/camd.socket) connection is used instead of the TCP connection. | +| OSCam TCP (rev >= 9574) | A TCP connection to the server is created. All EMM/ECM data is sent to OSCam using this connection without the need for real linuxdvb devices to be present in the system. This mode is suitable for all DVB devices including SAT\>IP and IPTV. The following lines are required in **[dvbapi]** section of oscam.conf: ```boxtype = pc pmt_mode = 4 listen_port = 9000 # or your preferred port``` | +| OSCam pc-nodmx (rev >= 9756) | Similar to *OSCam TCP (rev >= 9574)* mode, but a named pipe(/tmp/camd.socket) connection is used instead of the TCP connection. | +| OSCam (rev >= 9095) | This mode uses named pipe (/tmp/camd.socket). The difference between *Older OSCam* mode is that no UDP connections are required. All communication is processed through the named pipe(/tmp/camd.socket). The configuration for OSCam is same as the previous *Older OSCam* mode. | +| Older OSCam | This mode uses named pipe (/tmp/camd.socket). If selected, connection will be made directly to OSCam without using the LD\_PRELOAD / wrapper hack. TVH listens on a range of UDP ports starting with the specified port number (standard port range starts with 9000). The following lines are required in **[dvbapi]** section of oscam.conf: ```boxtype = pc pmt_mode = 4``` | +| Wrapper (capmt_ca.so) | This mode uses named pipe (/tmp/camd.socket). With the LD\_PRELOAD / wrapper hack active. TVH listens on the local specified UDP port (standard is 9000) for the code words. Only onechannel can be decoded at a time. | + +Note, because of how markdown generates tables, the OSCam variables ```highlighted``` above must be on separate lines in your config file. + +For example.. +``` +boxtype = pc +pmt_mode = 4 +listen_port = 9000 # or your preferred port +``` + +--- diff --git a/docs/class/caclient_capmt.md b/docs/class/caclient_capmt.md deleted file mode 100644 index 5a3938935..000000000 --- a/docs/class/caclient_capmt.md +++ /dev/null @@ -1,122 +0,0 @@ -Tvheadend supports connecting to card clients via the cwc (newcamd) and -capmt (linux network dvbapi) protocols for so-called 'softcam' descrambling. - -!['Channel tag'](static/img/doc/caclient_capmt/tab.png) - ---- - -### Menu Bar/Buttons - -The following functions are available: - -Button | Function ---------------------|--------- -**Save** | Save any changes made to the CA client configuration. -**Undo** | Undo any changes made to the CA client configuration since the last save. -**Add** | Add a new CA client configuration. -**Delete** | Delete an existing CA client configuration. -**Clone** | Clone the currently selected configuration. -**Move Up** | Move the selected CA client configuration up in the list. -**Move Down** | Move the selected CA client configuration down in the list. -**Show/Hide Passwords** | Reveal/Hide any stored CA client passwords. -**Help** | Display this help page. - ---- - -### Connection Status - -The icon next to each entry within the grid indicates the client's -connection status. - -Icon | Description ----------------------------------------------|------------ -!['Accept/OK Icon'](icons/accept.png) | The client is connected. -!['Error Icon'](icons/exclamation.png) | There was an error. -!['Stop/Disabled Icon'](icons/stop.png) | The client is disabled. - ---- - -### Modes - -#### OSCam net protocol (rev >= 10389) - -**This is the most preferred mode for the latest OSCam.** It supports -the latest features like ECM status. - -A TCP connection to the server is created. All EMM/ECM data is sent to -OSCam using this connection without the need for real linuxdvb -devices to be present in the system. This mode is suitable for all DVB -devices including SAT\>IP and IPTV. - -If you run your OSCam server on the same machine as TVHeadend, set -*Camd.socket filename / IP Address (TCP mode)* field to 127.0.0.1 -and *Listen / Connect port* to 9000 (or your preferred TCP port). -Note that the TCP port must match OSCam's configuration. - -The following lines are required in **[dvbapi]** section of oscam.conf: - -``` -boxtype = pc -pmt_mode = 4 -listen_port = 9000 # or your preferred port -``` - -#### OSCam new pc-nodmx (rev >= 10389) - -Similar to *OSCam net protocol (rev >= 10389)* mode, but a named -pipe (/tmp/camd.socket) connection is used instead of the TCP connection. - -#### OSCam TCP (rev >= 9574) - -A TCP connection to the server is created. All EMM/ECM data is sent to -OSCam using this connection without the need for real linuxdvb -devices to be present in the system. This mode is suitable for all DVB -devices including SAT\>IP and IPTV. - -The following lines are required in **[dvbapi]** section of oscam.conf: - -``` -boxtype = pc -pmt_mode = 4 -listen_port = 9000 # or your preferred port -``` - -#### OSCam pc-nodmx (rev >= 9756) - -Similar to *OSCAM TCP (rev >= 9574)* mode, but a named pipe -(/tmp/camd.socket) connection is used instead of the TCP connection. - -#### OSCam (rev >= 9095) - -This mode uses named pipe (/tmp/camd.socket). - -The difference between *Older OSCam* mode is that no UDP connections -are required. All communication is processed through the named pipe -(/tmp/camd.socket). The configuration for OSCam is same as the previous -*Older OSCam* mode. - -#### Older OSCam - -This mode uses named pipe (/tmp/camd.socket). - -If selected, connection will be made directly to OSCam without using the -LD\_PRELOAD / wrapper hack. TVH listens on a range of UDP ports -starting with the specified port number (standard port range starts -with 9000). - -The following lines are required in **[dvbapi]** section of oscam.conf: - -``` -boxtype = pc -pmt_mode = 4 -``` - -#### Wrapper (capmt_ca.so) - -This mode uses named pipe (/tmp/camd.socket). - -With the LD\_PRELOAD / wrapper hack active. TVH listens on the local -specified UDP port (standard is 9000) for the code words. Only one -channel can be decoded at a time. - ---- diff --git a/docs/class/channel.md b/docs/class/channel.md index 235fb3636..7a3693604 100644 --- a/docs/class/channel.md +++ b/docs/class/channel.md @@ -2,7 +2,7 @@ --- -# Overview +## Overview This tab lists all defined channels. diff --git a/docs/class/channeltag.md b/docs/class/channeltag.md index 45b55a853..bd171e140 100644 --- a/docs/class/channeltag.md +++ b/docs/class/channeltag.md @@ -2,7 +2,7 @@ --- -# Overview +## Overview This tab is used to configure channel tags. Tags are used to define a set of channels - to group them, to aid searches, and similar. diff --git a/docs/class/codec_profile.md b/docs/class/codec_profile.md index 8042d4664..3a097b84f 100644 --- a/docs/class/codec_profile.md +++ b/docs/class/codec_profile.md @@ -2,7 +2,7 @@ --- -# Overview +## Overview This tab allows you to manage the codec settings used by stream profiles. @@ -15,4 +15,3 @@ This tab allows you to manage the codec settings used by stream profiles. inc/buttons --- - diff --git a/docs/class/debugging.md b/docs/class/debugging.md index 45f369feb..7711fcc07 100644 --- a/docs/class/debugging.md +++ b/docs/class/debugging.md @@ -1,132 +1,148 @@ +Contents | Description +--------------------------------------------------|------------------------ +[Overview](#overview) | Tab overview +[Subsystems](#subsystems) | Available debugging subsystems +[Items/Properties](#items) | Items/Properties + +--- + +## Overview + This tab is used to configure various debugging options in tvheadend. !['Debugging tab'](static/img/doc/debugging/tab.png) -Changes to any of these settings must be confirmed by pressing the +### Notes + +* Changes to any of these settings must be confirmed by pressing the *[Apply configuration]* button before taking effect. -Note that settings are not saved to a storage. Any change is available +* Settings are not saved to a storage. Any change is available only while Tvheadend is running, and will be lost on a restart. To change the default behaviour permanently, use command line options such as `-l,` `–debug`, `–trace`. -Depending on your distribution, the default command-line configuration +* Depending on your distribution, the default command-line configuration is usually stored in the `/etc/sysconfig` tree or an init script. You may also be able to change `/etc/default/tvheadend` to add additional command-line parameters. --- -### Menu Bar/Buttons - -The following functions are available: +## Buttons -Button | Function ------------|--------- -**Apply configuration (run-time only)** | Apply the entered debugging settings. -inc/common_button_table_end +inc/buttons --- -### Subsystems +## Subsystems The following options can be passed to tvheadend to provide detailed debugging information while the application is running. -Subsystem | Name -----------------|------------------------ - START | START - STOP | STOP - CRASH | CRASH - main | Main - gtimer | Global timer - mtimer | Monitonic timer - CPU | CPU - thread | Thread - tvhpoll | Poll multiplexer - time | Time - spawn | Spawn - fsmonitor | Filesystem monitor - lock | Locking - uuid | UUID - idnode | Node subsystem - url | URL - tcp | TCP Protocol - rtsp | RTSP Protocol - upnp | UPnP Protocol - settings | Settings - config | Configuration - access | Access (ACL) - cron | Cron - dbus | DBUS - avahi | Avahi - bonjour | Bonjour - api | API - http | HTTP Server - httpc | HTTP Client - htsp | HTSP Server - htsp-sub | HTSP Subscription - htsp-req | HTSP Request - htsp-ans | HTSP Answer - imagecache | Image Cache - tbl | DVB SI Tables - tbl-base | Base DVB SI Tables (PAT,CAT,PMT,SDT etc.) - tbl-csa | DVB CSA (descrambling) Tables - tbl-eit | DVB EPG Tables - tbl-time | DVB Time Tables - tbl-atsc | ATSC SI Tables - tbl-pass | Passthrough Muxer SI Tables - tbl-satip | SAT>IP Server SI Tables - fastscan | Fastscan DVB - parser | MPEG-TS Parser - TS | Transport Stream - globalheaders | Global Headers - tsfix | Time Stamp Fix - hevc | HEVC - H.265 - muxer | Muxer - pass | Pass-thru muxer - mkv | Matroska muxer - service | Service - channel | Channel - subscription | Subscription - service-mapper | Service Mapper - bouquet | Bouquet - esfilter | Elementary Stream Filter - profile | Streaming Profile - descrambler | Descrambler - caclient | CA (descrambling) Client - csa | CSA (descrambling) - capmt | CAPMT CA Client - cwc | CWC CA Client - dvbcam | DVB CAM Client - dvr | Digital Video Recorder - epg | Electronic Program Guide - epgdb | EPG Database - epggrab | EPG Grabber - charset | Charset - dvb | DVB - mpegts | MPEG-TS - muxsched | Mux Scheduler - libav | libav / ffmpeg - transcode | Transcode - iptv | IPTV - iptv-pcr | IPTV PCR - linuxdvb | LinuxDVB Input - diseqc | DiseqC - en50221 | CI Module - en50494 | Unicable (EN50494) - satip | SAT>IP Client - satips | SAT>IP Server - tvhdhomerun | TVHDHomeRun Client - psip | ATSC PSIP EPG - opentv | OpenTV EPG - pyepg | PyEPG Import - xmltv | XMLTV EPG Import - webui | Web User Interface - timeshift | Timeshift - scanfile | Scanfile - tsfile | MPEG-TS File +Subsystem | Short Description +--------------------------------------|------------------------ + START | START + STOP | STOP + CRASH | CRASH + main | Main + gtimer | Global timer + mtimer | Monitonic timer + CPU | CPU + thread | Thread + tvhpoll | Poll multiplexer + time | Time + spawn | Spawn + fsmonitor | Filesystem monitor + lock | Locking + uuid | UUID + idnode | Node subsystem + url | URL + tcp | TCP Protocol + rtsp | RTSP Protocol + upnp | UPnP Protocol + settings | Settings + config | Configuration + access | Access (ACL) + cron | Cron + dbus | DBUS + avahi | Avahi + bonjour | Bonjour + api | API + http | HTTP Server + httpc | HTTP Client + htsp | HTSP Server + htsp-sub | HTSP Subscription + htsp-req | HTSP Request + htsp-ans | HTSP Answer + imagecache | Image Cache + tbl | DVB SI Tables + tbl-base | Base DVB SI Tables (PAT,CAT,PMT,SDT etc.) + tbl-csa | DVB CSA (descrambling) Tables + tbl-eit | DVB EPG Tables + tbl-time | DVB Time Tables + tbl-atsc | ATSC SI Tables + tbl-pass | Passthrough Muxer SI Tables + tbl-satip | SAT>IP Server SI Tables + fastscan | Fastscan DVB + pcr | PCR Clocks + parser | MPEG-TS Parser + TS | Transport Stream + globalheaders | Global Headers + tsfix | Time Stamp Fix + hevc | HEVC - H.265 + muxer | Muxer + pass | Pass-through muxer + audioes | Audio muxer + mkv | Matroska muxer + service | Service + channel | Channel + subscription | Subscription + service-mapper | Service Mapper + bouquet | Bouquet + esfilter | Elementary Stream Filter + profile | Streaming Profile + descrambler | Descrambler + descrambler-emm | Descrambler EMM + caclient | CA (descrambling) Client + csa | CSA (descrambling) + capmt | CAPMT CA Client + cwc | CWC CA Client + cccam | CWC CCCam Client + dvbcam | DVB CAM Client + dvr | Digital Video Recorder + epg | Electronic Programme Guide + epgdb | EPG Database + epggrab | EPG Grabber + charset | Charset + dvb | DVB + mpegts | MPEG-TS + muxsched | Mux Scheduler + libav | libav / ffmpeg + transcode | Transcode + iptv | IPTV + iptv-pcr | IPTV PCR + iptv-sub | IPTV Subcription + linuxdvb | LinuxDVB Input + diseqc | DiseqC + en50221 | CI Module + en50494 | Unicable (EN50494) + satip | SAT>IP Client + satips | SAT>IP Server + tvhdhomerun | TVHDHomeRun Client + psip | ATSC PSIP EPG + opentv | OpenTV EPG + pyepg | PyEPG Import + xmltv | XMLTV EPG Import + webui | Web User Interface + timeshift | Timeshift + scanfile | Scanfile + tsfile | MPEG-TS File + tsdebug | MPEG-TS Input Debug + codec | Codec + vaapi | VA-API + --- diff --git a/docs/class/dvrconfig.md b/docs/class/dvrconfig.md index 0fd752fc7..be72b98d9 100644 --- a/docs/class/dvrconfig.md +++ b/docs/class/dvrconfig.md @@ -1,23 +1,19 @@ +inc/recording_contents + +--- + +## Overview + This tab is used to configure operation of the Digital Video Recorder. It is not used for scheduling or administration of individual recordings. -!['Digital Video Recorder Profiles' Tab 1](static/img/doc/dvrconfig/tab.png) +!['Digital Video Recorder Profiles' Tab 1](static/img/doc/recordings/dvrprofiles.png) --- -### Menu Bar/Buttons - -The following functions are available: - -Button | Function ---------------------|--------- -**Save** | Save any changes made to the selected profile. -**Undo** | Undo any changes made to the selected profile since the last save. -**Add** | Add a new profile. -**Delete** | Delete an existing profile. -**Clone** | Clone the currently selected profile. +## Buttons -inc/common_button_table_end +inc/buttons --- diff --git a/docs/class/epgconf.md b/docs/class/epgconf.md index d2cf09acf..c8ea7e8c7 100644 --- a/docs/class/epgconf.md +++ b/docs/class/epgconf.md @@ -2,7 +2,7 @@ --- -# Overview +## Overview This tab is used to configure the Electronic Program Guide (EPG) [grabbing](class/epggrab_mod) capabilities. diff --git a/docs/class/epggrabber_modules.md b/docs/class/epggrabber_modules.md index 8e06e8dd4..e4ca12d12 100644 --- a/docs/class/epggrabber_modules.md +++ b/docs/class/epggrabber_modules.md @@ -2,7 +2,7 @@ --- -# Overview +## Overview This tab is used to configure the Electronic Program Guide (EPG) grabber modules. Tvheadend supports a variety of different EPG diff --git a/docs/class/filters.md b/docs/class/filters.md index 68deed74f..13c7e1f13 100644 --- a/docs/class/filters.md +++ b/docs/class/filters.md @@ -2,7 +2,7 @@ --- -# Overview +## Overview This tab allows you to define rules that filter and order various elementary streams. diff --git a/docs/class/profile.md b/docs/class/profile.md index 0109cf12e..95d62b4f3 100644 --- a/docs/class/profile.md +++ b/docs/class/profile.md @@ -2,7 +2,7 @@ --- -# Overview +## Overview Stream Profiles are the settings for output formats. These are used for Live TV streaming and recordings. The profiles can be assigned through Access Entries, diff --git a/docs/class/timeshift.md b/docs/class/timeshift.md index 6072f7921..2cda0773e 100644 --- a/docs/class/timeshift.md +++ b/docs/class/timeshift.md @@ -1,17 +1,17 @@ +inc/recording_contents + +--- + +## Overview + This tab is used to configure timeshift properties. -!['Timeshift Tab'](static/img/doc/timeshift/tab.png) +!['Timeshift Tab'](static/img/doc/recordings/timeshift.png) --- -### Menu Bar/Buttons - -The following functions are available: +## Buttons -Button | Function ------------|--------- -**Save** | Save the current configuration. -**Undo** | Revert the changes made since last save. -inc/common_button_table_end +inc/buttons --- diff --git a/docs/markdown/inc/caclient_contents.md b/docs/markdown/inc/caclient_contents.md new file mode 100644 index 000000000..c2d7ebf46 --- /dev/null +++ b/docs/markdown/inc/caclient_contents.md @@ -0,0 +1,7 @@ +Contents | Description +--------------------------------------------------|------------------------ +[Overview](#overview) | Tab overview +[Client Types](#client-types) | Available CA client types +[Connection Status](#connection-status) | Connection status indicators +[OSCam Modes](#oscam-modes) | OSCam Modes +[Items/Properties](#items) | Items/Properties diff --git a/docs/markdown/inc/recording_contents.md b/docs/markdown/inc/recording_contents.md new file mode 100644 index 000000000..a9d5fb579 --- /dev/null +++ b/docs/markdown/inc/recording_contents.md @@ -0,0 +1,6 @@ +Contents | Description +------------------------------------------------------|------------- +[Overview](#overview) | Overview of the tab +[Digital Video Recorder Profiles](class/dvrconfig) | DVR profiles and related settings +[Timeshift](class/timeshift) | Timeshift settings +[Items/Properties](#items) | Tab specific items and properties diff --git a/docs/markdown/toc.md b/docs/markdown/toc.md index 8118e4f2c..c36876a34 100644 --- a/docs/markdown/toc.md +++ b/docs/markdown/toc.md @@ -18,18 +18,8 @@ Web Interface Guide - [DVB Inputs](dvbinputs) - [Channel / EPG](class/channel) - [Stream](class/profile) - - Recording - - * [Digital Video Recorder Profiles](class/dvrconfig) - * [Timeshift](class/timeshift) - - - Conditional Access (CA) - - * [CAPMT (Linux Network DVBAPI)](class/caclient_capmt) - * [Code word client (newcamd)](class/caclient_cwc) - * [DES constant code word client](class/caclient_ccw_des) - * [AES constant code word client](class/caclient_ccw_aes) - + - [Recording (Profiles/Timeshift)](class/dvrconfig) + - [Conditional Access (CA)](class/caclient) - [Debugging](class/tvhlog_conf) - Status diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c index 42bc850c3..d745c5bbb 100644 --- a/src/descrambler/capmt.c +++ b/src/descrambler/capmt.c @@ -2577,14 +2577,14 @@ caclient_capmt_class_cwmode_list ( void *o, const char *lang ) return strtab2htsmsg(tab, 1, lang); } -CLASS_DOC(caclient_capmt) +CLASS_DOC(caclient) const idclass_t caclient_capmt_class = { .ic_super = &caclient_class, .ic_class = "caclient_capmt", .ic_caption = N_("CAPMT (Linux Network DVBAPI)"), - .ic_doc = tvh_doc_caclient_capmt_class, + .ic_doc = tvh_doc_caclient_class, .ic_properties = (const property_t[]){ { .type = PT_INT, @@ -2594,6 +2594,7 @@ const idclass_t caclient_capmt_class = .off = offsetof(capmt_t, capmt_oscam), .list = caclient_capmt_class_oscam_mode_list, .def.i = CAPMT_OSCAM_NET_PROTO, + .opts = PO_DOC_NLIST, }, { .type = PT_STR, @@ -2619,6 +2620,7 @@ const idclass_t caclient_capmt_class = .off = offsetof(capmt_t, capmt_cwmode), .list = caclient_capmt_class_cwmode_list, .def.i = CAPMT_CWMODE_AUTO, + .opts = PO_DOC_NLIST, }, { } } diff --git a/src/descrambler/cccam.c b/src/descrambler/cccam.c index 9d9a69830..21784bebc 100644 --- a/src/descrambler/cccam.c +++ b/src/descrambler/cccam.c @@ -1971,6 +1971,7 @@ const idclass_t caclient_cccam_class = .off = offsetof(cccam_t, cccam_version), .list = caclient_cccam_class_cccam_version_list, .def.i = CCCAM_VERSION_2_3_0, + .opts = PO_DOC_NLIST, }, #if 0 { @@ -2019,4 +2020,3 @@ caclient_t *cccam_create(void) cccam->cccam_version = CCCAM_VERSION_2_3_0; return (caclient_t *)cccam; } - diff --git a/src/descrambler/dvbcam.c b/src/descrambler/dvbcam.c index bd0831838..77e3437c2 100644 --- a/src/descrambler/dvbcam.c +++ b/src/descrambler/dvbcam.c @@ -847,6 +847,7 @@ const idclass_t caclient_dvbcam_class = .desc = N_("Selection method for CAID"), .list = caclient_dvbcam_class_caid_selection_list, .off = offsetof(dvbcam_t, caid_select), + .opts = PO_DOC_NLIST, }, { .type = PT_STR, diff --git a/src/webui/static/img/doc/caclient/cas.png b/src/webui/static/img/doc/caclient/cas.png new file mode 100644 index 000000000..694bf8486 Binary files /dev/null and b/src/webui/static/img/doc/caclient/cas.png differ diff --git a/src/webui/static/img/doc/caclient/tab.png b/src/webui/static/img/doc/caclient/tab.png deleted file mode 100644 index d7b7c08ec..000000000 Binary files a/src/webui/static/img/doc/caclient/tab.png and /dev/null differ diff --git a/src/webui/static/img/doc/caclient_capmt/tab.png b/src/webui/static/img/doc/caclient_capmt/tab.png deleted file mode 100644 index b7ce0c257..000000000 Binary files a/src/webui/static/img/doc/caclient_capmt/tab.png and /dev/null differ diff --git a/src/webui/static/img/doc/recordings/dvrprofiles.png b/src/webui/static/img/doc/recordings/dvrprofiles.png new file mode 100644 index 000000000..65c8806ca Binary files /dev/null and b/src/webui/static/img/doc/recordings/dvrprofiles.png differ diff --git a/src/webui/static/img/doc/timeshift/tab.png b/src/webui/static/img/doc/recordings/timeshift.png similarity index 100% rename from src/webui/static/img/doc/timeshift/tab.png rename to src/webui/static/img/doc/recordings/timeshift.png