[vlc-devel] commit: libvlc: Put vlc_usage in the same file than where it is used. ( Pierre d'Herbemont )

[git version control]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at free.fr> | Thu Aug 20 19:06:58 2009 +0200| [66f6cb986298d928cd2173feabc49a5dbe104e41] | committer: Pierre d'Herbemont 

libvlc: Put vlc_usage in the same file than where it is used.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=66f6cb986298d928cd2173feabc49a5dbe104e41
---

 src/libvlc.c |   32 ++++++++++++++++++++++++++++++++
 src/libvlc.h |    2 --
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/libvlc.c b/src/libvlc.c
index 66f0e31..7e1613d 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -1315,6 +1315,38 @@ static inline void print_help_on_full_help( void )
     utf8_fprintf( stdout, "%s\n", _("To get exhaustive help, use '-H'.") );
 }
 
+static const char vlc_usage[] = N_(
+                            "Usage: %s [options] [stream] ..."
+                            "\nYou can specify multiple streams on the commandline. They will be enqueued in the playlist."
+                            "\nThe first item specified will be played first."
+                            "\n"
+                            "\nOptions-styles:"
+                            "\n  --option  A global option that is set for the duration of the program."
+                            "\n   -option  A single letter version of a global --option."
+                            "\n   :option  An option that only applies to the stream directly before it"
+                            "\n            and that overrides previous settings."
+                            "\n"
+                            "\nStream MRL syntax:"
+                            "\n  [[access][/demux]://]URL[@[title][:chapter][-[title][:chapter]]] [:option=value ...]"
+                            "\n"
+                            "\n  Many of the global --options can also be used as MRL specific :options."
+                            "\n  Multiple :option=value pairs can be specified."
+                            "\n"
+                            "\nURL syntax:"
+                            "\n  [file://]filename              Plain media file"
+                            "\n  http://ip:port/file            HTTP URL"
+                            "\n  ftp://ip:port/file             FTP URL"
+                            "\n  mms://ip:port/file             MMS URL"
+                            "\n  screen://                      Screen capture"
+                            "\n  [dvd://][device][@raw_device]  DVD device"
+                            "\n  [vcd://][device]               VCD device"
+                            "\n  [cdda://][device]              Audio CD device"
+                            "\n  udp://[[<source address>]@[<bind address>][:<bind port>]]"
+                            "\n                                 UDP stream sent by a streaming server"
+                            "\n  vlc://pause:<seconds>          Special item to pause the playlist for a certain time"
+                            "\n  vlc://quit                     Special item to quit VLC"
+                            "\n");
+
 static void Help( libvlc_int_t *p_this, char const *psz_help_name )
 {
 #ifdef WIN32
diff --git a/src/libvlc.h b/src/libvlc.h
index 76cf3e4..b6560e7 100644
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -27,8 +27,6 @@
 
 typedef struct variable_t variable_t;
 
-extern const char vlc_usage[];
-
 /* Actions (hot keys) */
 typedef struct action
 {