diff --git a/docs/html/config_dvb.html b/docs/html/config_dvb.html index 8a578025..d6032ca9 100644 --- a/docs/html/config_dvb.html +++ b/docs/html/config_dvb.html @@ -1,96 +1,162 @@
- - -

- This tab is split in two panes. To the left is a tree which, at root level, - contains all DVB adapters found by Tvheadend during startup. - +

+
General tab
+ The general tab contains information and some per-adapter global + configuration.
-
Step by step configuration of DVB +
Add DVB Network by location...
- The DVB configuration is perhaps the most tricky part to configure - in Tvheadend. Therefore, this section begins with a step-by-step - guide. -
    -
  • Click on an adapter in the left pane. -
  • Click on 'Add mux(es)'. A popup window will appear: -
    - -
    - For DVB-T and DVB-C adapters, expand appropriate country. - DVB-S adapters only have one folder to expand called 'Geosynchronous Orbit'. - In these folders you find a list of available networks. - Select the appropriate network and press the 'Add' button. - -
  • - Tvheadend will now immediately start to probe each mux for available - services. Expand the DVB adapter in the tree - and wait until all muxes has been visisted - at least once (Status of all multiplexes should change from 'Unknown' - when a mux has been visited). + Pressing this button will popup a window that allows the user to select + a DVB network based on location. The adapter will be populated with + multiplexes from these networks and immediately start to scan for services. -
  • - You can now, if you want, verify that the mux scanner has found - services by expanding the mux nodes. - -
  • - Select the adapters again and press 'Probe services'. - A popup will ask you to confirm this action. Press 'Yes'. - The Service probe will scan through all services on all muxes on the - adapter and map them to channels with the corresponding name. - Progress and result for each service is displayed in the 'System Log' - at the bottom of the application. Wait until the probing is completed. -
  • - Done! You can click over to the 'Channels' configuration tab and - inspect all working channels. - - -
-
DVB Adapters +
Map DVB services to channels...
- A DVB adapter represents a piece of hardware attached to the system. - DVB receivers with dual tuners will present themself as two adapters - to the Tvheadend application. Tvheadend support DVB-T, DVB-C and DVB-S - adapters. -

- When an adapter is selected, the right pane displays configurable items - for the adapter. Also available in the right toolbar is a set of operations - that can be performed on the adapter. -

- Underneath each adapter in the tree is a list of DVB muxes. - For more information about muxes, see further down. -

- There is currently no way of adding a new adapter to Tvheadend when running. - If a new adapter is plugged into the system Tvheadend needs to be restarted - in order to detect it. -

- If Tvheadend has configuration for an adapter and the adapter is missing - upon startup the configuration will be left untouched in case the adapter - will be back in the future. There is currently no way to remove configuration - for a no longer present adapter. -

- Warning: Unplugging an DVB adapter (USB, etc) during operation (i.e when - Tvheadend is running) can result in deadlocking the kernel USB subsystem, - most likely requiring a system restart. -

- Warning2: Suspending a system is (from a USB driver perspective) equivalent - to a unplug/insert event. Thus, suspending a system running Tvheadend - with USB adapters is not recommented at the moment. + Pressing this button will start a process that scans all services on all + multiplexes and tries to verify if the service is actually a working + TV channel. If so, the channel will be created and mapped to this service. -

DVB Multiplexes +
Adapter name
- To put it simply, a DVB multiplex is a digital signal modulated - at a specific frequency that carries a number of servies (where a - service could be, but is not limited to, a TV channel). -

- There are currently no operations that can be performed on a single mux. + You can change the displayname for the adapter. -

DVB Services +
Autodetect muxes
- A service is equivivalent to a TV channel. -

- There are currently no operations that can be performed on a single service. + The DVB transmissions contains information about other muxes available + on the same network. If this checkbox is enabled, Tvheadend will + automatically create new muxes as it receives configuration for them + via the DVB networks. + +

Idle scanning +
+ When nothing else happens Tvheadend will continously rotate among all + muxes and tune to them to verify that they are still working. + If your adapter have problems with lots of tuning, try to disable this. + +
Detailed logging +
+ If this is enabled, Tvheadend will log more information related to + this specific adapter. You might wanna enable this if you have some + kind of issues in order to better diagnose the problems.
+
+ +
+
Multiplexes tab
+ All multiplexes on the currently selected adapter are listed and can be + edited in a grid. + + + + The columns have the following functions: + +
+
Enabled +
Uncheck this if a multiplex is of no interest to you or otherwise + temporary broken + +
Network +
Network name as given in the DVB stream. Can not be changed + +
Frequency +
Center frequency for the mux. Can not be changed + +
Modulation +
Information about the modulation used on the mux. Can not be changed + +
Mux id +
Unique ID for this mux in the dvb network. Can not be changed + +
Quality +
Tvheadend's estimated quality for the mux. +
+
+ +
+
Services tab
+ All services on the currently selected adapter are listed and can be + edited in a grid. + + + +

+ The columns have the following functions: + +

+
Enabled +
Uncheck this if a service is of no interest to you or otherwise + temporary broken + +
Service name +
Service name as given in the DVB stream. Can not be changed + +
Channel name +
Double-click on this column to map the service to a channel. + +
Type +
Type of service. Can not be changed + +
Provider +
Provider as given in the DVB stream. Can not be changed + +
Network +
Network name for the mux this service resides on + +
Multiplex +
Center frequency for the multiplex this service resides on + +
Information button +
Press this to get a popup with more information about the service +
+ +

+ A word about DVB adapters +

+ A DVB adapter represents a piece of hardware attached to the system. + DVB receivers with dual tuners will present themself as two adapters + to the Tvheadend application. Tvheadend support DVB-T, DVB-C and DVB-S + adapters. +

+ There is currently no way of adding a new adapter to Tvheadend when running. + If a new adapter is plugged into the system Tvheadend needs to be restarted + in order to detect it. +

+ If Tvheadend has configuration for an adapter and the adapter is missing + upon startup the configuration will be left untouched in case the adapter + will be back in the future. There is currently no way to remove configuration + for a no longer present adapter. +

+ Warning: Unplugging an DVB adapter (USB, etc) during operation (i.e when + Tvheadend is running) can result in deadlocking the kernel USB subsystem, + most likely requiring a system restart. +

+ Warning2: Suspending a system is (from a USB driver perspective) equivalent + to a unplug/insert event. Thus, suspending a system running Tvheadend + with USB adapters is not recommented at the moment. +

+
diff --git a/src/webui/static/app/dvb.js b/src/webui/static/app/dvb.js index 4bc37fa6..62d07fd9 100644 --- a/src/webui/static/app/dvb.js +++ b/src/webui/static/app/dvb.js @@ -1182,7 +1182,12 @@ tvheadend.dvb = function() iconCls: 'hardware', layout:'fit', tbar: [ - adapterSelection + adapterSelection, '->', { + text: 'Help', + handler: function() { + new tvheadend.help('DVB', 'config_dvb.html'); + } + } ], items: [