Commit bea2e23d authored by Damien Lucas's avatar Damien Lucas

. removed a bug in broadcast adding (rtp support)

. changed the loop option (in start function it is a boolean/
                           in broadcast_start it is a number of loops to do)
. updated README
. fixed command line launching
parent 92f03b70
......@@ -19,18 +19,18 @@ Troubleshooting
===============
A mailing-list has been set up for support and discussion about the
vls. Its address is :
vls and all the streaming problems. Its address is :
<vls@videolan.org>
<streaming@videolan.org>
To subscribe, send a mail to <listar@videolan.org> with the following
words in the mail body :
subscribe vls
subscribe streaming
To unsubscribe, do the same with the words :
unsubscribe vls
unsubscribe streaming
A mailing-list has been set up for development stuff about vls. Its
......@@ -51,7 +51,7 @@ To unsubscribe, do the same with the words :
When reporting bugs, try to be as precise as possible (which OS, which
distribution, and so on).
Resources
=========
......
......@@ -2,7 +2,7 @@
* parsers.cpp: Command line and configuration files parsers
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: parsers.cpp,v 1.20 2003/08/14 11:12:53 nitrox Exp $
* $Id: parsers.cpp,v 1.21 2003/08/19 21:31:41 nitrox Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
......@@ -399,11 +399,11 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
/* Input section */
m_pCallBack->OnStartSection("input1");
m_pCallBack->OnProperty("ProgramCount", "1");
m_pCallBack->OnProperty("programcount", "1");
m_pCallBack->OnEndSection("input1");
/* Inputs section */
m_pCallBack->OnStartSection("Inputs");
m_pCallBack->OnStartSection("inputs");
if(sMeth == "dvd" || sMeth == "file")
{
m_pCallBack->OnProperty("input1", "local");
......@@ -412,23 +412,23 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
{
m_pCallBack->OnProperty("input1", "dvb");
}
m_pCallBack->OnEndSection("Inputs");
m_pCallBack->OnEndSection("inputs");
/* Input Section */
if(sMeth == "dvd")
{
m_pCallBack->OnStartSection("input1.1");
m_pCallBack->OnProperty("Name", "program1");
m_pCallBack->OnProperty("Device", sFile);
m_pCallBack->OnProperty("Type", "Dvd");
m_pCallBack->OnProperty("name", "program1");
m_pCallBack->OnProperty("device", sFile);
m_pCallBack->OnProperty("type", "Dvd");
sProgramLaunch = "program1";
m_pCallBack->OnEndSection("input1.1");
}
else if(sMeth == "dvb")
{
m_pCallBack->OnStartSection("input1");
m_pCallBack->OnProperty("DeviceNumber", sOptions.ToInt());
m_pCallBack->OnProperty("SendMethod", 0);
m_pCallBack->OnProperty("deviceNumber", sOptions.ToInt());
m_pCallBack->OnProperty("sendmethod", 0);
sProgramLaunch = sFile;
sProgramLaunch.Replace(' ', '_');
m_pCallBack->OnEndSection("input1");
......@@ -436,28 +436,28 @@ void C_CfgFileParser::AddCmdLineTarget(C_String sTarget, C_String sTags)
else if(sMeth == "file")
{
m_pCallBack->OnStartSection("input1.1");
m_pCallBack->OnProperty("Name", "program1");
m_pCallBack->OnProperty("FileName", sFile);
m_pCallBack->OnProperty("name", "program1");
m_pCallBack->OnProperty("filename", sFile);
C_File fFile = C_File(sFile);
fFile.Open("r");
byte bFormat;
fFile.Read(&bFormat,(s64) 1);
if(bFormat==0x47) m_pCallBack->OnProperty("Type", "MPEG2-TS");
if(bFormat==0x47) m_pCallBack->OnProperty("type", "mpeg2-ts");
fFile.Seek((s64)(4+1), SEEK_CUR);
fFile.Read(&bFormat, (s64) 1);
if(bFormat==0x01) m_pCallBack->OnProperty("Type", "MPEG1-PS");
else if(bFormat==0x04) m_pCallBack->OnProperty("Type", "MPEG2-PS");
if(bFormat==0x01) m_pCallBack->OnProperty("Type", "mpeg1-ps");
else if(bFormat==0x04) m_pCallBack->OnProperty("Type", "mpeg2-ps");
fFile.Close();
sProgramLaunch = "program1";
m_pCallBack->OnEndSection("input1.1");
}
/* Automatic start section */
m_pCallBack->OnStartSection("LaunchOnStartUp");
m_pCallBack->OnProperty("command1", "broadcast_add broadcast1 output1 "
m_pCallBack->OnStartSection("launchonstartup");
m_pCallBack->OnProperty("command1", "broadcast_start broadcast1");
m_pCallBack->OnProperty("command2", "broadcast_add broadcast1 output1 "
+ sProgramLaunch +" input1 ");
m_pCallBack->OnProperty("command2", "broadcast_start broadcast1");
// TODO nitrox
// handle sTags (rtp, loop, end, ...)
m_pCallBack->OnEndSection("LaunchOnStartUp");
m_pCallBack->OnEndSection("launchonstartup");
}
......@@ -2,7 +2,7 @@
* dvbinput.cpp: DVB streams
*-------------------------------------------------------------------------------
* (c)1999-2002 VideoLAN
* $Id: dvbinput.cpp,v 1.33 2003/08/17 03:59:38 adq Exp $
* $Id: dvbinput.cpp,v 1.34 2003/08/19 21:31:41 nitrox Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
* Damien Lucas <nitrox@videolan.org>
......@@ -33,7 +33,6 @@
#include "../../core/core.h"
#include <fcntl.h>
#include <sys/ioctl.h>
#ifdef HAVE_DVBPSI_DVBPSI_H
# include <dvbpsi/dvbpsi.h>
......@@ -47,9 +46,20 @@
# include "src/tables/pmt.h"
#endif
// TODO nitrox
// We should be able to get rid of those headers
// using lidvb (the unselectPID function is the only
// one that lacks in last version (4.1) )
#include <sys/ioctl.h>
#include <linux/dvb/frontend.h>
#include <linux/dvb/dmx.h>
// TODO nitrox
// This should not be a system include since libdvb is not
// yet package on all systems
// See configure.in
#include <DVB.hh>
#include "../../mpeg/mpeg.h"
......
......@@ -2,7 +2,7 @@
* filereader.cpp: file reader
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: filereader.cpp,v 1.10 2003/08/14 14:45:49 adq Exp $
* $Id: filereader.cpp,v 1.11 2003/08/19 21:31:42 nitrox Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -80,6 +80,7 @@ C_FileMpegReader::C_FileMpegReader(C_Module* pModule,
m_cFile(pBroadcast->GetOption("filename"))
{
m_iLoop = pBroadcast->GetOption("loop").ToInt();
if(m_iLoop) m_iLoop--;
if(pBroadcast->GetOption("end") == "1")
m_bEnd = true;
......
......@@ -2,7 +2,7 @@
* manager_broadcast.cpp: Brodacast mtehods for Vls manager
*-------------------------------------------------------------------------------
* (c)1999-2003 VideoLAN
* $Id: manager_broadcast.cpp,v 1.5 2003/08/14 08:50:14 nitrox Exp $
* $Id: manager_broadcast.cpp,v 1.6 2003/08/19 21:31:42 nitrox Exp $
*
* Authors: Damien Lucas <damien.lucas@anevia.com>
* Benoit Steiner <benny@via.ecp.fr>
......@@ -232,7 +232,7 @@ C_Answer C_Manager::Broadcast_Start(C_Request& cRequest)
if(pBroadcast)
{
pBroadcast->SetOptions(cRequest.GetArgs());
// pBroadcast->SetOptions(cRequest.GetArgs());
C_Answer cInputAnswer = pBroadcast->GetInput()->StartStreaming(pBroadcast);
cAnswer.Add(cInputAnswer);
cAnswer.SetStatus(cInputAnswer.GetStatus());
......
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