Permalink
Browse files

add some more options that user can override in playd.conf

  • Loading branch information...
1 parent 50fb9d4 commit 1e7344a6decf3bf0fbf57b5e109e451c8a9bea6c Aldis Berjoza committed Nov 22, 2010
Showing with 7 additions and 8 deletions.
  1. +6 −7 bin/playd.sh
  2. +1 −1 man/man1/playd.1
View
@@ -33,7 +33,7 @@
# 1}}}
# project email: playd@bsdroot.lv
-readonly PLAYD_VERSION='1.13.2'
+readonly PLAYD_VERSION='1.13.3'
readonly PLAYD_NAME="${0##*/}"
readonly PLAYD_FILE_FORMATS='mp3|flac|og[agxmv]|wv|aac|mp[421a]|wav|aif[cf]?|m4[abpr]|ape|mk[av]|avi|mpf|vob|di?vx|mpga?|mov|3gp|wm[av]|midi?'
readonly PLAYD_PLAYLIST_FORMATS='plst?|m3u8?|asx|xspf|ram|qtl|wax|wpl'
@@ -59,21 +59,20 @@ playd_die() { # {{{1
readonly OS=`uname`
readonly PLAYD_HOME="${XDG_CONFIG_HOME:-"$HOME/.config"}/playd"
-readonly PLAYD_PIPE="$PLAYD_HOME/playd.fifo"
-readonly PLAYD_PLAYLIST="$PLAYD_HOME/playlist.plst"
-readonly PLAYD_LOCK="$PLAYD_HOME/mplayer.lock"
-
# users config file
[ -f "$PLAYD_HOME/playd.conf" ] && . "$PLAYD_HOME/playd.conf"
+PLAYD_PIPE="${PLAYD_PIPE:-$PLAYD_HOME/playd.fifo}"
+PLAYD_PLAYLIST="${PLAYD_PLAYLIST:-$PLAYD_HOME/playlist.plst}"
+PLAYD_LOCK="${PLAYD_LOCK:-$PLAYD_HOME/mplayer.lock}"
+
PAGER=${PAGER:-more}
FORMAT_SHORTNAMES=${FORMAT_SHORTNAMES:-'yes'}
FORMAT_SPACES=${FORMAT_SPACES:-'yes'}
# to customise mplayers command line set PLAYD_MPLAYER_USER_OPTIONS environment variable
-readonly MPLAYER_CMD_GENERIC="$PLAYD_MPLAYER_USER_OPTIONS -really-quiet -idle -input file=$PLAYD_PIPE"
-#readonly MPLAYER_CMD_GENERIC="$PLAYD_MPLAYER_USER_OPTIONS -quiet -idle -input file=$PLAYD_PIPE"
+readonly MPLAYER_CMD_GENERIC="$PLAYD_MPLAYER_USER_OPTIONS -really-quiet -msglevel all=-1 -nomsgmodule -idle -input file=$PLAYD_PIPE"
readonly MPLAYER_CMD="mplayer $MPLAYER_CMD_GENERIC"
readonly MPLAYER_SND_ONLY_CMD="mplayer -vo null $MPLAYER_CMD_GENERIC"
NOVID=0
View
@@ -330,7 +330,7 @@ dvd -d
file -f
filename fname
help -h
-list -l
+list -l ls
longcat lcat
longlist -L llist
mute -m

0 comments on commit 1e7344a

Please sign in to comment.