Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
mdhelp: add bouquet help doc + screenshots
  • Loading branch information
Mark Clarkstone authored and perexg committed May 11, 2016
1 parent 830d9f3 commit 48d61ce
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 9 deletions.
38 changes: 38 additions & 0 deletions docs/class/bouquet.md
@@ -0,0 +1,38 @@
Bouquets are broadcaster-defined groupings and orders of channels.

!['Bouqets' Tab](static/img/doc/bouquettab.png)

To use bouquets, ensure to add and scan all available muxes using the
predefined muxes or manual configuration.

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).

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.

---

<tvh_include>inc/common_button_table_start</tvh_include>

<tvh_include>inc/common_button_table_end</tvh_include>

---

<tvh_include>inc/add_grid_entry</tvh_include>

!['Add Bouquet Dialog'](static/img/doc/bouquetadd.png)

---

<tvh_include>inc/edit_grid_entries</tvh_include>

---

<tvh_include>inc/del_grid_entries</tvh_include>

---
9 changes: 9 additions & 0 deletions docs/property/bouquet_mapping_options.md
@@ -0,0 +1,9 @@
:

Option | Function
-------------------------------|-------------
**Map zero-numbered channels** | Include channels with no channel number.
**Map unnamed channels** | Include channels with no name.
**Map radio channels**: | Include radio channels.
**Map encrypted services** | Include channels even if the linked service is flagged as encrypted.
**Merge same name** | Combine channels with the same name into a single channel.
15 changes: 6 additions & 9 deletions src/bouquet.c
Expand Up @@ -954,9 +954,13 @@ bouquet_class_ext_url_notify ( void *obj, const char *lang )
bouquet_download_trigger((bouquet_t *)obj);
}

CLASS_DOC(bouquet)
PROP_DOC(bouquet_mapping_options)

const idclass_t bouquet_class = {
.ic_class = "bouquet",
.ic_caption = N_("Bouquet"),
.ic_doc = tvh_doc_bouquet_class,
.ic_event = "bouquet",
.ic_perm_def = ACCESS_ADMIN,
.ic_save = bouquet_class_save,
Expand Down Expand Up @@ -994,15 +998,8 @@ const idclass_t bouquet_class = {
.islist = 1,
.id = "mapopt",
.name = N_("Channel mapping options"),
.desc = N_("Options to use/used when mapping "
"channels; Map zero-numbered "
"channels: include channels with no channel number. "
" | Map unnamed channels: include channels with no "
"name. | Map radio channels: include radio "
"channels. | Map encrypted services: include "
"channels even if the linked service is flagged as "
"encrypted. | Merge same name: combine channels "
"with the same name into a single channel."),
.desc = N_("Options to use/used when mapping - see Help for details."),
.doc = prop_doc_bouquet_mapping_options,
.notify = bouquet_class_mapopt_notify,
.list = bouquet_class_mapopt_enum,
.get = bouquet_class_mapopt_get,
Expand Down
Binary file added src/webui/static/img/doc/bouquetadd.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/webui/static/img/doc/bouquettab.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 48d61ce

Please sign in to comment.