diff --git a/ChangeLog b/ChangeLog index 5773d5b..1ddbf1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2002-03-24 Ulf Betlehem + + *** 1.45 released *** 2002-03-19 Ulf Betlehem * cplay (1.45pre5): diff --git a/README b/README index b037226..5389527 100644 --- a/README +++ b/README @@ -20,7 +20,7 @@ Installation: make install Usage: - cplay [-rR] [ file | dir | playlist.m3u ] ... + cplay [-rRvV] [ file | dir | playlist.m3u ] ... Documentation: When in doubt, press 'h' for a friendly help page. diff --git a/TODO b/TODO index 28e3902..58058cc 100644 --- a/TODO +++ b/TODO @@ -1,30 +1,27 @@ -high priority +TODO ------------------------------------------ -- alternative scrolling method -- delayed commands -- framework for displaying alternative metadata -- scrollbar / position indicator -- hide cursor after SUSP & CONT cycle -- tilde expansion -- better input support (readline?) -- dynamic help page -- new and more vi-friendly keymap -- Q = quit, q = userfriendly quit (sure? [Y/n]) -- fast Esc - -low priority ------------------------------------------- -- merge id3 patch -- merge cddb patch -- delwin when resizing -- invert playlist markings -- hierarchical playlists? -- better madplay support -- shuffle/sort marked tracks? -- delete files (Han) +2 - alternative scrolling method +5 - framework for displaying alternative metadata +2 - hide cursor after SUSP & CONT cycle +3 - better input support (readline?) +4 - dynamic help page +3 - new and more vi-friendly keymap +4 - Q = quit, q = userfriendly quit (sure? [Y/n]) +4 - fast Esc +5 - numerical arguments +5 - don't parse player output too often +4 - merge id3 patch +4 - merge cddb patch +1 - delwin when resizing +2 - invert playlist markings +3 - hierarchical playlists? +3 - better madplay support +2 - shuffle/sort marked tracks? +1 - info page? misc thoughts ------------------------------------------ +- delete files? (avoid filemanager-bloat) - support alsaplayer, xmp, others? - delayed play command (play after current song is finished) - reset progress when changing song? @@ -37,6 +34,8 @@ misc thoughts - f and b could select next and previous track? - a/A = Append mp3/dir - i/I = Insert mp3/dir +- t/T = tag current/regex +- u/U = untag current/regex - Meta-<, Meta-> commands? - treat .m3u files as directories? - show progress while streaming? @@ -44,6 +43,6 @@ misc thoughts - support slang? - icecast/shoutcast support - fade in/out mode (a la repeat/random) -- filtered view (based on glob / regex) +- filtered or narrowed view (based on glob / regex) - Enter and cursor position logical / intuitive? - lots of suggestions from Chris Liechti diff --git a/cplay b/cplay index a1ceade..f90c7d3 100755 --- a/cplay +++ b/cplay @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- python -*- -__version__ = "cplay 1.45pre5" +__version__ = "cplay 1.45" """ cplay - A curses front-end for various audio players @@ -193,23 +193,22 @@ class HelpWindow(Window): Global Filelist ------ -------- - Up, C-p, k, Down, C-n, j, Space : add to playlist - PgUp, K, PgDown, J a : add recursively + Up, C-p, k, Down, C-n, j, Space, a : add file/dir to playlist + PgUp, K, PgDown, J Enter : chdir or play Home, g, End, G o : open path - : movement Enter : chdir or play - Tab : filelist/playlist Backspace : parent dir - n, p : next/prev track - z, x : toggle pause/stop Playlist - Left, Right, -------- - C-b, C-f : seek Enter : play track - C-s, C-r, / : isearch Space : toggle mark + : movement Backspace : parent dir + Tab : filelist/playlist + n, p : next/prev track Playlist + z, x : toggle pause/stop -------- + Left, Right, Enter : play track + C-b, C-f : seek Space : toggle mark t : toggle counter mode a, A : mark all/regex - C-g, Esc : cancel c, C : clear all/regex - d, D : delete marked/current tracks + C-s, C-r, / : isearch c, C : clear all/regex + C-g, Esc : cancel d, D : delete marked/current tracks 1..9, +, - : volume control m, M : move marked tracks after/before v, V : PCM or MASTER volume r, R : toggle repeat/Random mode C-l : refresh screen s, S : shuffle/Sort playlist - h, q : help, quit w : write playlist (to .m3u file)""") + h, q : help, quit w : write playlist (.m3u file)""") def __init__(self, parent): Window.__init__(self, parent) diff --git a/cplay.1 b/cplay.1 index 305e8db..a02b42e 100644 --- a/cplay.1 +++ b/cplay.1 @@ -36,6 +36,10 @@ various module-formats (through mikmod). Toggles playlist \fIrepeat\fP mode .IP \fB-R Toggles playlist \fIrandom\fP mode +.IP \fB-v +Control PCM volume +.IP \fB-V +Control MASTER volume (default) .SH SEE ALSO .PP