Commit 220aa8fc authored by Damien Lucas's avatar Damien Lucas

. Bug fix in the command line argument parsing

parent 62844f30
......@@ -2,7 +2,7 @@
* parsers.cpp: Command line and configuration files parsers
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: parsers.cpp,v 1.11 2002/12/09 01:36:24 nitrox Exp $
* $Id: parsers.cpp,v 1.12 2003/01/04 15:37:39 nitrox Exp $
*
* Authors: Benoit Steiner <benny@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)
/* Input section */
m_pCallBack->OnStartSection("Input");
m_pCallBack->OnStartSection("input1");
m_pCallBack->OnProperty("ProgramCount", "1");
m_pCallBack->OnEndSection("Input");
m_pCallBack->OnEndSection("input1");
/* Inputs section */
m_pCallBack->OnStartSection("Inputs");
......@@ -413,12 +413,12 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
/* Input Section */
if(sMeth == "dvd")
{
m_pCallBack->OnStartSection("1");
m_pCallBack->OnStartSection("input1.1");
m_pCallBack->OnProperty("Name", "program1");
m_pCallBack->OnProperty("Device", sFile);
m_pCallBack->OnProperty("Type", "Dvd");
sProgramLaunch = "program1";
m_pCallBack->OnEndSection("1");
m_pCallBack->OnEndSection("input1.1");
}
else if(sMeth == "dvb")
{
......@@ -431,7 +431,7 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
}
else if(sMeth == "file")
{
m_pCallBack->OnStartSection("1");
m_pCallBack->OnStartSection("input1.1");
m_pCallBack->OnProperty("Name", "program1");
m_pCallBack->OnProperty("FileName", sFile);
C_File fFile = C_File(sFile);
......@@ -445,7 +445,7 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
else if(bFormat==0x04) m_pCallBack->OnProperty("Type", "MPEG2-PS");
fFile.Close();
sProgramLaunch = "program1";
m_pCallBack->OnEndSection("1");
m_pCallBack->OnEndSection("input1.1");
}
/* Automatic start section */
......
......@@ -2,7 +2,7 @@
* settings.cpp: Application settings management
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: settings.cpp,v 1.10 2002/12/09 01:36:24 nitrox Exp $
* $Id: settings.cpp,v 1.11 2003/01/04 15:37:39 nitrox Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
*
......@@ -193,6 +193,7 @@ void C_SettingsHandler::OnProperty(const C_String& strName,
{
C_String strKey = m_strPrefix + strName;
m_pSettings->Update(strKey.ToLower(), strValue);
//printf ("+ %s = %s \n", strKey.GetString(), strValue.GetString());
}
......
......@@ -2,7 +2,7 @@
* localinput.cpp: Local streams
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: localinput.cpp,v 1.13 2002/12/09 01:36:24 nitrox Exp $
* $Id: localinput.cpp,v 1.14 2003/01/04 15:37:39 nitrox Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -243,7 +243,7 @@ void C_LocalInput::OnStartStreaming(C_Broadcast* pBroadcast)
C_MpegReader* pReader;
// Create the converter
// Create the reader
C_MpegReaderModule* pReaderModule = (C_MpegReaderModule*)
C_Application::GetModuleManager()
->GetModule("mpegreader",
......
// Creer plutot une class EventListener globale partagee avec le Timer
// TODO Creer plutot une class EventListener globale partagee avec le Timer
class C_SchedulerEvent
{
......
......@@ -34,6 +34,7 @@ END
BEGIN "Telnet"
# Domain = "Inet6" # Inet4 or Inet6
LocalPort = "9999" # Port to use for that purpose
Use = "true"
END
# Streams sources declaration
......@@ -44,7 +45,7 @@ BEGIN "Inputs"
local1 = "local" # Local input example
# kfir = "video" # Video input example (mpeg encoder)
# dvb = "dvb" # Video input example (DVB card)
webcam = "v4l" # Video For Linux example (webcam)
# webcam = "v4l" # Video For Linux example (webcam)
END
BEGIN "Input"
......
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