Changed option syntax and added list-format and status-format to CONFIGURATION

git-svn-id: https://svn.musicpd.org/ncmpc/trunk@1510 09075e82-0dd4-0310-85a5-a0d7c8717e4f

diff --git a/ChangeLog b/ChangeLog
index 5b42582434148b7c36e10d2f1c37ed2125b8510c..75d9fd09ee5d4982f560dac34a4c6b3c75a788da 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2004-06-16 Kalle Wallin <kaw@linux.se>
+       * libmpdclient updated (r1507)
+       * mpdclient: add path to mpdclient_cmd_db_update() 
+       * screen_file.c: Use current path when updating the db (browse screen)
+
+2004-06-15 Kalle Wallin <kaw@linux.se>
+       * conf.c: Replaced '_' with '-' in configuration field names
+       * conf.c: Added support for cusomized format strings with 
+                 list-format and status-format
+       * options.c: Added status_format, list_format fields
+       * mpdclient.c: Sort playlist if needed after plchanges, 
+         update the song position fields in mpdclient_cmd_move, 
+         use song id's by default (define ENABLE_SONG_ID), disable plchanges
+       * screen_play.c: Offer to overwrite when saving playlists
+       * screen_utils.c: Use the alert color in screen_readln()
+       
+
+2004-06-14 Kalle Wallin <kaw@linux.se>
+       * libmpdclient updated (r1482)
+       * Major cleanup of the mpd client code (mpc->mpdclient)
+         including error callbacks and playlist (changes) callbacks 
+       * strfsong: added a modified version of mpc's songToFormatedString
+       * screen_file.c: added position history (feature #0000233)
+
+
+2004-06-09 Kalle Wallin <kaw@linux.se>
+       * Use the teminal in raw  mode (ignore interrupt,quit,suspend, and 
+         flow control characters)
+       * command.*: Added the get_keyboard_command_with_timeout() function
+       * main.c: Redesigned the reconnect code to allow user interrupt
+       * screen*: Changed arguments to the get_title callback (and the title)
+       * support.c: moved utility function for scrolling
+       * list_window.c: fixed a small layout bug in list_window_paint()
+
+
+2004-06-08 Kalle Wallin <kaw@linux.se>
+       * mpc.c: Dont use basename on stream urls (get_song_name2)
+

 2004-06-07 Kalle Wallin <kaw@linux.se>
        * configure.ac: disable nls if glib is pre 2.4
        * mpc.c: added support for the PLCHANGES command
 2004-06-07 Kalle Wallin <kaw@linux.se>
        * configure.ac: disable nls if glib is pre 2.4
        * mpc.c: added support for the PLCHANGES command


@@ -9,7 +47,7 @@
        * main.c: added bind_textdomain_codeset()       
        * Added wreadln.c, wreadln.h a simple line editor
        * screen_utils.c: use wreadln() instead of curses wgetstr()
        * main.c: added bind_textdomain_codeset()       
        * Added wreadln.c, wreadln.h a simple line editor
        * screen_utils.c: use wreadln() instead of curses wgetstr()

-       * Added a history for the find command!
+       * Added find history

        * Added screen_clock.c an optional clock screen (just for fun)
 
 
        * Added screen_clock.c an optional clock screen (just for fun)
 
 

diff --git a/doc/ncmpc.1 b/doc/ncmpc.1
index bf471e7550db251dd4ee8ea5215d37ee3f20f1a9..40183d35c8c386b1e0f1c28c4157a678ca048f02 100644 (file)
--- a/doc/ncmpc.1
+++ b/doc/ncmpc.1
@@ -65,14 +65,20 @@ Possible text colors are the base colors plus grey, brightred, brightgreen, brig
 
 Supported configuration options:
 .TP 
 
 Supported configuration options:
 .TP 

-.B auto_center = yes|no
+.B auto\-center = yes|no

 Enable/disable auto center mode. When auto center mode is enabled 
 ncmpc centers the current track in the playlist window.
 .TP 
 Enable/disable auto center mode. When auto center mode is enabled 
 ncmpc centers the current track in the playlist window.
 .TP 

-.B wide_cursor = yes|no
+.B wide\-cursor = yes|no

 Make the cursor as wide as the screen.
 .TP 
 Make the cursor as wide as the screen.
 .TP 

-.B enable_colors = yes|no
+.B list\-format = SONG FORMAT
+The format used to display songs in the main window.
+.TP 
+.B status\-format = SONG FORMAT
+The format used to display songs on the status line.
+.TP 
+.B enable\-colors = yes|no

 Enable/disable colors.
 .TP 
 .B color background = COLOR
 Enable/disable colors.
 .TP 
 .B color background = COLOR


@@ -119,6 +125,19 @@ When ncmpc start it tries to read user key bindings from the ~/ncmpc/keys file.
 
 You can view ncmpc's key bindings by pressing '1' (help) when 
 ncmpc is running. To edit key bindings use the key editor in ncmpc (press 'K').
 
 You can view ncmpc's key bindings by pressing '1' (help) when 
 ncmpc is running. To edit key bindings use the key editor in ncmpc (press 'K').

+.SH "SONG FORMAT"
+Format of song display for status and the list window.
+The  metadata  delimeters  are: %name%, %artist%, %track%, %time%, %file%, %shortfile%.
+
+The [] operators is used to group output such that if no metadata delimeters are found or matched between '[' and ']', then none of  the  characters between '[' and ']' are outputed. '&' and '|' are logical operators for and and or. '#'  is used to escape characters. 
+
+Some  useful examples for format are: 
+
+   "%file%" 
+
+and 
+
+   "[[%artist% \- ]%title%]|[%file]" 

 .SH "BUGS"
 Report bugs on http://www.musicpd.org/mantis/
 .SH "NOTE"
 .SH "BUGS"
 Report bugs on http://www.musicpd.org/mantis/
 .SH "NOTE"