casa-mp-base

diff -ur ../moc-2.4.3.orig/main.c ./main.c

--- ../moc-2.4.3.orig/main.c    2006-02-12 12:55:10.000000000 +0100

+++ ./main.c    2008-03-26 22:48:14.000000000 +0100

@@ -264,38 +264,40 @@

    printf (PACKAGE_STRING"\n"

 "Usage:\n"

 "%s [OPTIONS]... [FILE]...\n"

-"-V --version           Print program version and exit.\n"

-"-h --help              Print usage and exit.\n"

+"-V --version                 Print program version and exit.\n"

+"-h --help                    Print usage and exit.\n"

 #ifndef NDEBUG

-"-D --debug             Turn on logging to a file.\n"

+"-D --debug                   Turn on logging to a file.\n"

 #endif

-"-S --server            Run only the server.\n"

-"-F --foreground        Run server in foreground, log to stdout.\n"

-"-R --sound-driver NAME Use the specified sound driver (oss, alsa, jack, null).\n"

-"-m --music-dir         Start in MusicDir.\n"

-"-a --append            Append the files/directories/playlists passed in\n"

-"                       the command line to playlist and exit.\n"

-"-c --clear             Clear the playlist and exit.\n"

-"-p --play              Start playing from the first item on the playlist.\n"

-"-l --playit            Play files given on command line without modifing the\n"

-"                       playlist.\n"

-"-s --stop              Stop playing.\n"

-"-f --next              Play next song.\n"

-"-r --previous          Play previous song.\n"

-"-x --exit              Shutdown the server.\n"

-"-T --theme theme       Use selected theme file (read from ~/.moc/themes if\n"

-"                       the path is not absolute.\n"

-"-C --config FILE       Use the specified config file instead of the default.\n"

-"-M --moc-dir DIR       Use the specified MOC directory instead of the default.\n"

-"-P --pause             Pause.\n"

-"-U --unpause           Unpause.\n"

-"-G --toggle-pause      Toggle between play/pause.\n"

-"-y --sync              Synchronize the playlist with other clients.\n"

-"-n --nosync            Don't synchronize the playlist with other clients.\n"

-"-A --ascii             Use ASCII characters to draw lines.\n"

-"-i --info              Print the information about the currently played file.\n"

-"-e --recursively       Alias for -a.\n"

-"-k --seek N            Seek by N seconds (can be negative).\n"

+"-S --server                  Run only the server.\n"

+"-F --foreground              Run server in foreground, log to stdout.\n"

+"-R --sound-driver NAME       Use the specified sound driver (oss, alsa, jack, null).\n"

+"-j --autostart-jackd         Start jackd on server init, and close it on server exit.\n"

+"-J --no-autostart-jackd      Do not start jackd on server init, and not close it on server exit.\n"

+"-m --music-dir               Start in MusicDir.\n"

+"-a --append                  Append the files/directories/playlists passed in\n"

+"                             the command line to playlist and exit.\n"

+"-c --clear                   Clear the playlist and exit.\n"

+"-p --play                    Start playing from the first item on the playlist.\n"

+"-l --playit                  Play files given on command line without modifing the\n"

+"                             playlist.\n"

+"-s --stop                    Stop playing.\n"

+"-f --next                    Play next song.\n"

+"-r --previous                Play previous song.\n"

+"-x --exit                    Shutdown the server.\n"

+"-T --theme theme             Use selected theme file (read from ~/.moc/themes if\n"

+"                             the path is not absolute.\n"

+"-C --config FILE             Use the specified config file instead of the default.\n"

+"-M --moc-dir DIR             Use the specified MOC directory instead of the default.\n"

+"-P --pause                   Pause.\n"