Commit ab38b6c0 authored by Damien Lucas's avatar Damien Lucas
Browse files

Backport of my previous commit in the 0.4.5 branch

parent 68998b36
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* parsers.cpp: Command line and configuration files parsers * parsers.cpp: Command line and configuration files parsers
*------------------------------------------------------------------------------- *-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN * (c)1999-2001 VideoLAN
* $Id: parsers.cpp,v 1.11 2002/12/09 01:36:24 nitrox Exp $ * $Id: parsers.cpp,v 1.11.2.1 2003/01/05 18:05:30 nitrox Exp $
* *
* Authors: Benoit Steiner <benny@via.ecp.fr> * Authors: Benoit Steiner <benny@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr> * Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
...@@ -394,9 +394,9 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags) ...@@ -394,9 +394,9 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
/* Input section */ /* Input section */
m_pCallBack->OnStartSection("Input"); m_pCallBack->OnStartSection("input1");
m_pCallBack->OnProperty("ProgramCount", "1"); m_pCallBack->OnProperty("ProgramCount", "1");
m_pCallBack->OnEndSection("Input"); m_pCallBack->OnEndSection("input1");
/* Inputs section */ /* Inputs section */
m_pCallBack->OnStartSection("Inputs"); m_pCallBack->OnStartSection("Inputs");
...@@ -413,12 +413,12 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags) ...@@ -413,12 +413,12 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
/* Input Section */ /* Input Section */
if(sMeth == "dvd") if(sMeth == "dvd")
{ {
m_pCallBack->OnStartSection("1"); m_pCallBack->OnStartSection("input1.1");
m_pCallBack->OnProperty("Name", "program1"); m_pCallBack->OnProperty("Name", "program1");
m_pCallBack->OnProperty("Device", sFile); m_pCallBack->OnProperty("Device", sFile);
m_pCallBack->OnProperty("Type", "Dvd"); m_pCallBack->OnProperty("Type", "Dvd");
sProgramLaunch = "program1"; sProgramLaunch = "program1";
m_pCallBack->OnEndSection("1"); m_pCallBack->OnEndSection("input1.1");
} }
else if(sMeth == "dvb") else if(sMeth == "dvb")
{ {
...@@ -431,7 +431,7 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags) ...@@ -431,7 +431,7 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
} }
else if(sMeth == "file") else if(sMeth == "file")
{ {
m_pCallBack->OnStartSection("1"); m_pCallBack->OnStartSection("input1.1");
m_pCallBack->OnProperty("Name", "program1"); m_pCallBack->OnProperty("Name", "program1");
m_pCallBack->OnProperty("FileName", sFile); m_pCallBack->OnProperty("FileName", sFile);
C_File fFile = C_File(sFile); C_File fFile = C_File(sFile);
...@@ -445,7 +445,7 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags) ...@@ -445,7 +445,7 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
else if(bFormat==0x04) m_pCallBack->OnProperty("Type", "MPEG2-PS"); else if(bFormat==0x04) m_pCallBack->OnProperty("Type", "MPEG2-PS");
fFile.Close(); fFile.Close();
sProgramLaunch = "program1"; sProgramLaunch = "program1";
m_pCallBack->OnEndSection("1"); m_pCallBack->OnEndSection("intput1.1");
} }
/* Automatic start section */ /* Automatic start section */
......
...@@ -34,6 +34,7 @@ END ...@@ -34,6 +34,7 @@ END
BEGIN "Telnet" BEGIN "Telnet"
# Domain = "Inet6" # Inet4 or Inet6 # Domain = "Inet6" # Inet4 or Inet6
LocalPort = "9999" # Port to use for that purpose LocalPort = "9999" # Port to use for that purpose
Use = "true"
END END
# Streams sources declaration # Streams sources declaration
......
Supports Markdown
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