Permalink
Browse files

*** 1.48 released ***

	* cplay:
	- xmp regexp (Yuri D'Elia)
	- URL support in mpg123 regexp (Martin Michlmayr)
	- rudimentary /etc/cplayrc support (Toni Timonen)

	* cplay.1:
	- xmp, play and cplayrc references

	* cplayrc:
	- new file
  • Loading branch information...
1 parent d2ab673 commit ebce86f1fc74e295450727b376860d91f5c95c2b Ulf Betlehem committed with Aug 26, 2003
Showing with 862 additions and 29 deletions.
  1. +15 −0 ChangeLog
  2. +24 −15 README
  3. +10 −3 TODO
  4. +9 −9 cplay
  5. +7 −2 cplay.1
  6. +10 −0 cplayrc
  7. +278 −0 po/da.po
  8. +189 −0 po/hu.po
  9. +320 −0 po/pl.po
View
@@ -1,3 +1,18 @@
+2003-08-26 Ulf Betlehem <flu@iki.fi>
+
+ *** 1.48 released ***
+
+ * cplay:
+ - xmp regexp (Yuri D'Elia)
+ - URL support in mpg123 regexp (Martin Michlmayr)
+ - rudimentary /etc/cplayrc support (Toni Timonen)
+
+ * cplay.1:
+ - xmp, play and cplayrc references
+
+ * cplayrc:
+ - new file
+
2003-08-20 Ulf Betlehem <flu@iki.fi>
* cplay(1.48pre1):
View
39 README
@@ -7,18 +7,21 @@ Description:
Requirements:
- - cplay http://www.tf.hut.fi/~flu/cplay/
- - python http://www.python.org/
- - mpg321 (optional) http://sourceforge.net/projects/mpg321/
- - ogg123 (optional) http://www.vorbis.com/
- - mpg123 (optional) http://www.mpg123.org/
- - splay (optional) http://splay.sourceforge.net/
- - madplay (optional) http://www.mars.org/home/rob/proj/mpeg/
- - mikmod (optional) http://www.mikmod.org/
- - fintl (optional) http://www.python.org/sigs/i18n-sig/
- - pyncurses (optional) http://pyncurses.sourceforge.net/
- - ID3-py (optional) http://id3-py.sourceforge.net/
- - pyvorbis (optional) http://www.duke.edu/~ahc4/pyogg/
+ - cplay http://www.tf.hut.fi/~flu/cplay/
+ - python http://www.python.org/
+ - python-oss (optional) http://net.indra.com/~tim/ossmodule/
+ - mpg321 (optional) http://sourceforge.net/projects/mpg321/
+ - ogg123 (optional) http://www.vorbis.com/
+ - mpg123 (optional) http://www.mpg123.org/
+ - splay (optional) http://splay.sourceforge.net/
+ - madplay (optional) http://www.mars.org/home/rob/proj/mpeg/
+ - mikmod (optional) http://www.mikmod.org/
+ - fintl (optional) http://www.python.org/sigs/i18n-sig/
+ - pyncurses (optional) http://pyncurses.sourceforge.net/
+ - ID3-py (optional) http://id3-py.sourceforge.net/
+ - pyvorbis (optional) http://www.duke.edu/~ahc4/pyogg/
+ - xmp (optional) http://xmp.sf.net/
+ - sox (optional) http://sox.sf.net/
Installation:
@@ -30,15 +33,21 @@ Usage:
When in doubt, press 'h' for a friendly help page.
+Configuration:
+
+ If you would like to change options passed to the actual
+ players just edit the PLAYERS list in the cplay script or
+ put the PLAYERS definition in /etc/cplayrc. If this file
+ is available it is executed by cplay before initialization.
+
+ Note, there are currently no version control for this file!
+
Miscellaneous:
In order for either mp3info (ID3) or ogginfo to work,
both corresponding python modules have to be installed.
This will probably change someday.
- If you would like to change options passed to the actual
- players just edit the PLAYERS list in the cplay script.
-
A playlist can contain URLs, but the playlist itself will
have to be local. For mpeg streaming, splay is recommended.
View
13 TODO
@@ -1,6 +1,15 @@
TODO
------------------------------------------
-x - relative pathname support for PLS-playlists
+5 - document <, >
+x - wma (mplayer?)
+x - replace current playlist (useful when streaming?)
+x - browse bookmarks?
+x - use "file" to both get mime and bitrate info?
+x - backspace does not work on gentoo?
+x - index-mode: group/sort/search by ctime, filename, metadata, etc.
+x - screen title patch
+x - expand 2 or more dirs mode for filelist?
+x - musepack
x - don't require both ID3 and pyogg for one of them to work
x ? title/status realtime only from playlist
x - progress bar not always reset?
@@ -14,7 +23,6 @@ x - shell from playlist?
x - macros / bind user commands
2 - optionally show all files in a dir
3 - center current line (requires one-line scrolling)
-5 - long shell input lines should be <... instead of ...>
x - shell prompt could show number of args? (tagged entries)
x ? change cwd for shell commands (what about "search results"!?)
x - embed search command in pathname to view in filelist? (bookmark results)
@@ -114,7 +122,6 @@ misc thoughts
- i/I = Insert mp3/dir
- Meta-<, Meta-> commands? (avoid meta)
- show progress-counter while streaming?
-- Python 1.4 compatibility?
- support slang?
- fade in/out mode? (a la repeat/random)
- crossfade mode (hardly)
View
18 cplay
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- python -*-
-__version__ = "cplay 1.48pre1"
+__version__ = "cplay 1.48"
"""
cplay - A curses front-end for various audio players
@@ -1537,9 +1537,8 @@ class Application:
def open_mixer(self):
import oss
- if not self.channels:
- self.channels = [['MASTER', oss.SOUND_MIXER_VOLUME],
- ['PCM', oss.SOUND_MIXER_PCM]]
+ self.channels = self.channels or \
+ [['MASTER', oss.SOUND_MIXER_VOLUME], ['PCM', oss.SOUND_MIXER_PCM]]
return oss.open_mixer(), self.channels[0]
def get_volume(self):
@@ -1669,12 +1668,12 @@ def main():
# ------------------------------------------
PLAYERS = [
FrameOffsetPlayer("ogg123 -q -v -k %d %s", "\.ogg$"),
- FrameOffsetPlayer("mpg123 -q -v -k %d %s", "\.mp[123]$", 38.28),
FrameOffsetPlayer("splay -f -k %d %s", "(^http://|\.mp[123]$)", 38.28),
+ FrameOffsetPlayer("mpg123 -q -v -k %d %s", "(^http://|\.mp[123]$)", 38.28),
FrameOffsetPlayer("mpg321 -q -v -k %d %s", "(^http://|\.mp[123]$)", 38.28),
TimeOffsetPlayer("madplay -v --no-tty-control --display-time=remaining -s %d %s", "\.mp[123]$"),
NoOffsetPlayer("mikmod -q -p0 %s", "\.(mod|xm|fm|s3m|med|col|669|it|mtm)$"),
- NoOffsetPlayer("xmp -q %s", "\.(mod|xm|fm|s3m|med|col|669|it|mtm)$"),
+ NoOffsetPlayer("xmp -q %s", "\.(mod|xm|fm|s3m|med|col|669|it|mtm|stm)$"),
NoOffsetPlayer("play %s", "\.(aiff|au|cdr|mp3|ogg|wav)$")
]
@@ -1683,11 +1682,12 @@ def VALID_SONG(name):
if player.re_files.search(name):
return 1
-RE_PLAYLIST = re.compile("\.(m3u|pls)$", re.I)
-
def VALID_PLAYLIST(name):
- if RE_PLAYLIST.search(name):
+ if re.match("\.(m3u|pls)$", name, re.I):
return 1
+try: execfile("/etc/cplayrc")
+except IOError: pass
+
# ------------------------------------------
if __name__ == "__main__": main()
View
@@ -51,12 +51,17 @@ Toggles PCM and MASTER (default) volume control
.BR mpg321 (1),
.BR splay (1),
.BR madplay (1),
-.BR mikmod (1)
+.BR mikmod (1),
+.BR xmp (1),
+.BR play (1)
.SH FILES
.PP
.I /var/tmp/cplay_control
-- The remote control fifo.
+- The optional remote control fifo.
+
+.I /etc/cplayrc
+- The optional configuration file.
.SH AUTHOR
.PP
View
10 cplayrc
@@ -0,0 +1,10 @@
+PLAYERS = [
+ FrameOffsetPlayer("ogg123 -q -v -k %d %s", "\.ogg$"),
+ FrameOffsetPlayer("splay -f -k %d %s", "(^http://|\.mp[123]$)", 38.28),
+ FrameOffsetPlayer("mpg123 -q -v -k %d %s", "(^http://|\.mp[123]$)", 38.28),
+ FrameOffsetPlayer("mpg321 -q -v -k %d %s", "(^http://|\.mp[123]$)", 38.28),
+ TimeOffsetPlayer("madplay -v --no-tty-control --display-time=remaining -s %d %s", "\.mp[123]$"),
+ NoOffsetPlayer("mikmod -q -p0 %s", "\.(mod|xm|fm|s3m|med|col|669|it|mtm)$"),
+ NoOffsetPlayer("xmp -q %s", "\.(mod|xm|fm|s3m|med|col|669|it|mtm|stm)$"),
+ NoOffsetPlayer("play %s", "\.(aiff|au|cdr|mp3|ogg|wav)$")
+ ]
Oops, something went wrong.

0 comments on commit ebce86f

Please sign in to comment.