Changed the names of the settings for DVB to something better.

Updated documentation for DVB stuff.
parent 82a20ef2
......@@ -6,7 +6,7 @@
<author>written by Cyril Deguet <htmlurl url="mailto:asmax@via.ecp.fr" name=
"&lt;asmax@via.ecp.fr&gt;">
<date>
$Id: vls-guide.sgml,v 1.7 2002/03/22 00:16:23 asmax Exp $
$Id: vls-guide.sgml,v 1.8 2002/03/26 19:51:50 bozo Exp $
</date>
<abstract>
This document describes how to install, configure, and run the VideoLAN Server
......@@ -71,6 +71,8 @@ if you want to stream DVDs with vls, and
encrypted DVDs. BE CAREFUL: if you want to use libdvdcss with libdvdread,
do not use the libdvdread stable release, because it only works with
an old version of libdvdcss.
<p>
DVB support requires <htmlurl url="http://www.videolan.org/libdvbpsi/" name="libdvbpsi"> and the DVB drivers installed.
</sect2>
<sect2>Hardware requirements
......@@ -161,6 +163,11 @@ all options available. Here is an explanation of vls-specific options:
option if you don't have libdvdread installed.
</tscreen>
</tscreen>
<tscreen>
<verb>--enable-dvb</verb>
<tscreen>Enable DVB support (disabled by default).
</tscreen>
</tscreen>
</sect2>
<sect2>Building
<p>
......@@ -444,10 +451,12 @@ you need, add a line in the following format:
<verb>InputName = "Type"</verb>
<tscreen>
This adds a input named "InputName", the type of which is "Type". As
explained before, there are currently two types of input: "local" and
"video". You must use the "local" input to play a stream from a file or a
DVD, and the "video" input to play a stream from a Video4Linux device.
Each input must be configured in its own section (see next paragraph).
explained before, there are currently two types of input: "local",
"video" and "dvb". You must use the "local" input to play a stream
from a file or a DVD, the "video" input to play a stream from a
Video4Linux device, and the "dvb" input to play a stream from a DVB
receiver like Win-TV Nova. Each input must be configured in its
own section (see next paragraph).
</tscreen>
</tscreen>
......@@ -501,6 +510,35 @@ END
</tscreen>
</tscreen>
To configure a dvb input, add a section in the following format:
<tscreen>
<verb>
BEGIN "DvbInputName"
DeviceNumber = "devicenumber"
Frequency = "frequency"
Polarization = "polarization"
SymbolRate = "symrate"
DiSEqC = "diseqc"
LNB_Lof1 = "lnb_lof1"
LNB_Lof2 = "lnb_lof2"
LNB_SLof = "lnb_slof"
END
</verb>
<tscreen>
"DvbInputName" is the name of the dvb input you want to configure.
"devicenumber" is the number of the DVB device you want to read from
(read from /dev/ost/dvr&lt;devicenumber&gt;, default is "").
"frequency" is the frequency of the transponder given in kHz.
"polarization" is "0" or "1". "symrate" is the symbol rate. "diseqc"
is the DiSEqC address of the used LNB. "lnb_lof1" is the local
frequency of lower LNB band. "lnb_lof2" is the local frequency of
upper LNB band. "lnb_slof" is the Switch frequency of LNB. All the
frequencies are given in kHz.
</tscreen>
</tscreen>
Example:
<tscreen><verb>
BEGIN "local1"
......@@ -512,6 +550,19 @@ BEGIN "kfir"
Device = "/dev/video"
Type = "Mpeg2-PS"
END
BEGIN "dvb"
DeviceNumber = "0"
Frequency = "12553000"
Polarization = "0"
SymbolRate = "27500000"
DiSEqC = "0"
LNB_Lof1 = "9750000"
LNB_Lof2 = "10600000"
LNB_SLof = "11700000"
END
</verb></tscreen>
</sect2>
......
......@@ -2,7 +2,7 @@
* dvbinput.cpp: DVB streams
*-------------------------------------------------------------------------------
* (c)1999-2002 VideoLAN
* $Id: dvbinput.cpp,v 1.2 2002/03/25 01:23:54 bozo Exp $
* $Id: dvbinput.cpp,v 1.3 2002/03/26 19:51:50 bozo Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -135,15 +135,11 @@ void C_DvbInput::OnInit()
m_iPolarization = pApp->GetSetting(GetName() + ".Polarization", "0").ToInt();
m_iSymbolRate = pApp->GetSetting(GetName() + ".SymbolRate", "0").ToInt();
C_String strUseDiseqc = pApp->GetSetting(GetName() + ".Diseqc", "false");
if(strUseDiseqc == "true")
m_iUseDiseqc = 1;
else
m_iUseDiseqc = 0;
m_iDiSEqC = pApp->GetSetting(GetName() + ".DiSEqC", "0").ToInt();
m_iLnbLof1 = pApp->GetSetting(GetName() + ".LnbLof1", "0").ToInt();
m_iLnbLof2 = pApp->GetSetting(GetName() + ".LnbLof2", "0").ToInt();
m_iLnbSLof = pApp->GetSetting(GetName() + ".LnbSLof", "0").ToInt();
m_iLnbLof1 = pApp->GetSetting(GetName() + ".LNB_Lof1", "0").ToInt();
m_iLnbLof2 = pApp->GetSetting(GetName() + ".LNB_Lof2", "0").ToInt();
m_iLnbSLof = pApp->GetSetting(GetName() + ".LNB_SLof", "0").ToInt();
// Hardware initialization
SecControl();
......@@ -429,7 +425,7 @@ void C_DvbInput::SecControl()
sSCmd.u.diseqc.cmd = 0x38;
sSCmd.u.diseqc.numParams = 1;
sSCmd.u.diseqc.params[0] = 0xF0
| ((m_iUseDiseqc * 4) & 0x0F)
| ((m_iDiSEqC * 4) & 0x0F)
| (sSCmdSeq.continuousTone == SEC_TONE_ON ? 1 : 0)
| (sSCmdSeq.voltage == SEC_VOLTAGE_18 ? 2 : 0);
......
......@@ -2,7 +2,7 @@
* dvbinput.h: DVB Input class definition
*-------------------------------------------------------------------------------
* (c)1999-2002 VideoLAN
* $Id: dvbinput.h,v 1.1 2002/03/21 14:09:19 bozo Exp $
* $Id: dvbinput.h,v 1.2 2002/03/26 19:51:50 bozo Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -76,7 +76,7 @@ private:
int m_iPolarization;
int m_iSymbolRate;
int m_iUseDiseqc;
int m_iDiSEqC;
int m_iLnbLof1;
int m_iLnbLof2;
int m_iLnbSLof;
......
......@@ -63,16 +63,16 @@ END
# Video input (DVB) configuration
BEGIN "dvb"
# --- Example:
# DeviceNumber = ""
# DeviceNumber = "0" # /dev/ost/dvr<i>
# Frequency = "12553000"
# Polarization = "0"
# SymbolRate = "27500000"
# Frequency = "12553000" # Frequency in kHz of the transponder
# Polarization = "0" # 0 or 1
# SymbolRate = "27500000" # Symbol rate
# UseDiseqc = "false"
# LnbLof1 = "9750000"
# LnbLof2 = "10600000"
# LnbSLof = "11700000"
# DiSEqC = "0" # DiSEqC address of the used LNB
# LNB_Lof1 = "9750000" # Local frequency of lower LNB band
# LNB_Lof2 = "10600000" # Local frequency of upper LNB band
# LNB_SLof = "11700000" # Switch frequency of LNB
END
# Channel (outputs) declaration
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment