Commit 2e371262 authored by Cyril Deguet's avatar Cyril Deguet

- fixed the famous "Error: -1" bug in the "browse" command

- the user doc is still growing...
parent 4289c550
......@@ -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.1 2002/03/11 21:44:39 asmax Exp $
$Id: vls-guide.sgml,v 1.2 2002/03/13 12:32:48 asmax Exp $
</date>
<abstract>
This document describes how to install, configure, and run the VideoLAN Server
......@@ -595,8 +595,9 @@ BEGIN "client1" # unicast towards client1
DstPort = "1234"
END
BEGIN "client2" # unicast towards client2
DstHost = "192.168.1.3"
BEGIN "client2" # unicast towards client2 with IPv6
Domain = "inet6"
DstHost = "3ffe:ffff::2:12:42"
DstPort = "1234"
END
......@@ -765,7 +766,43 @@ To log out, type "logout" after the telnet prompt.
<sect1>Interface commands
<p>
to be written
<descrip>
<tag/help/ Usage: help [command].
Called with no argument, "help" gives the
list of all the commands (available or not). Called with one argument it gives
details about how to use the specified command.
<tag/logout/ Usage: logout
"logout" closes the current administration session and the remote connection.
<tag/start/ Usage: start &lt;program&gt; &lt;channel&gt; &lt;input&gt; [--loop]
"start" launches the specified program of the specified input and broadcasts
it through the specified channel. The option "--loop" makes the program being
repeated indefinitely.
<tag/stop/ Usage: stop &lt;input&gt; &lt;program&gt;
"stop" ends the broadcast of the specified program of the specified input.
<tag/suspend/ Usage: suspend &lt;input&gt; &lt;program&gt;
"suspend" suspends the broadcast of the specified program of the specified
input.
<tag/shutdown/ Usage: shutdown
"shutdown" stops all the programs and then the VideoLAN Server stops.
<tag/browse/ Usage: browse [input]
Called with one argument, "browse" gives all programs of inputs. Called with
one argument it only gives the programs of the specified input. Each program is
given with its status.
<tag/resume/ Usage: resume &lt;input&gt; &lt;program&gt;
"resume" resumes the broadcast of the specified program of the specified input.
</descrip>
</sect1>
</sect>
......
......@@ -2,7 +2,7 @@
* admin.cpp:
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: admin.cpp,v 1.2 2002/03/04 01:55:50 bozo Exp $
* $Id: admin.cpp,v 1.3 2002/03/13 12:32:48 asmax Exp $
*
* Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
*
......@@ -236,7 +236,7 @@ int C_Admin::Init()
"gives the program list",
"Called with one argument, \"browse\" gives all programs of inputs."
" Called with one argument it only gives the programs of the"
"specified input. Each program is given with its status.");
" specified input. Each program is given with its status.");
pStr = new C_String("input");
pCmdDesc->m_vOptionalArgs.Add(pStr);
pCmdDesc->BuildUsage();
......
......@@ -2,7 +2,7 @@
* manager.cpp: Vls manager
*-------------------------------------------------------------------------------
* (c)1999-2001 VideoLAN
* $Id: manager.cpp,v 1.5 2001/11/29 17:55:19 bozo Exp $
* $Id: manager.cpp,v 1.6 2002/03/13 12:32:48 asmax Exp $
*
* Authors: Benoit Steiner <benny@via.ecp.fr>
* Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
......@@ -578,6 +578,7 @@ C_Answer C_Manager::Browse(const C_Request& cRequest)
C_String strPgrmName = pPgrm->GetName();
ASSERT(strPgrmName != "");
C_Answer cPgrmDescr(strPgrmName);
cPgrmDescr.SetStatus(NO_ERR);
cPgrmDescr.AddMessage(pPgrm->GetDescription());
const C_Vector<C_Input>& cProviders = pPgrmInfo->GetProviders();
......
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