Changeset 121 for smplayer/vendor/current/src/clhelp.cpp

Timestamp:

Mar 15, 2012, 5:14:10 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer 0.7.1: vendor update

File:

• smplayer/vendor/current/src/clhelp.cpp (modified) (3 diffs)

smplayer/vendor/current/src/clhelp.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -88 +88 @@
                         "[-close-at-end] [-no-close-at-end] [-fullscreen] [-no-fullscreen] "
                         "[-sub %5] [-pos x y] [-size %6 %7] "
-                        "[-add-to-playlist] [-help|--help|-h|-?] "
-                        "[[-playlist] %8] [[-playlist] %8]...")
+                        "[-add-to-playlist] [-disable-server] [-help|--help|-h|-?] "
+                        "[%8] [%8]...")
                         .arg(app_name)
                         .arg(QObject::tr("directory"))
@@ -170 +170 @@
         "files will be opened in a new instance."), html );
 
+        s += formatHelp( "-disable-server", QObject::tr(
+                "Disables the server used to communicate with other instances. "
+                "This disables too the possibility to use a single instance."), html );
+
         s += formatHelp( QObject::tr("media"), QObject::tr(
                 "'media' is any kind of file that SMPlayer can open. It can "
         "be a local file, a DVD (e.g. dvd://1), an Internet stream "
-        "(e.g. mms://....) or a local playlist in format m3u or pls. "
-        "If the -playlist option is used, that means that SMPlayer "
-        "will pass the -playlist option to MPlayer, so MPlayer will "
-        "handle the playlist, not SMPlayer."), html );
+        "(e.g. mms://....) or a local playlist in format m3u or pls."), html );
 
         if (html) s += "</table>";