adapted local player to mplayer1, bugfix for location playback

svn path=/trunk/; revision=110

diff --git a/actions/watch.sh b/actions/watch.sh
index c198f4a000f851ebb5a1c48c97133ee3747e2340..3398b99271fc240fb2b5ecb074b6b4b1fdcd6529 100755 (executable)
--- a/actions/watch.sh
+++ b/actions/watch.sh
@@ -58,12 +58,21 @@ case "${_COOKIE[watch]}" in
     volume="$(validate "$(cat "${_DATA}/mplayer.volume")" '[1-9]?[0-9]|100' 20)"
     [ \! -p "$fifofile" ] && rm -f "$fifofile" && mkfifo -m 600 "$fifofile"
 
+    debug PLAYURI $playuri
+
     DISPLAY=:0 XDG_RUNTIME_DIR=/run/user/1006 \
-      nohup /usr/bin/mplayer -ao pulse --quiet \
-      --slave --input=file="$fifofile" \
-      --volume="$volume" \
+      nohup /usr/bin/mplayer -ao pulse -quiet \
+      -slave -input file="$fifofile" \
+      -volume "$volume" \
       "$playuri" >/dev/null 2>/dev/null &
 
+    # # MPlayer2:
+    # DISPLAY=:0 XDG_RUNTIME_DIR=/run/user/1006 \
+    #   nohup /usr/bin/mplayer -ao pulse --quiet \
+    #   --slave --input=file="$fifofile" \
+    #   --volume="$volume" \
+    #   "$playuri" >/dev/null 2>/dev/null &
+
     redirect "?p=playctl&${watch_link}"
   ;;
   *) redirect "?p=view&${watch_link}"

diff --git a/pages/playctl.sh b/pages/playctl.sh
index 015e7d338d16d3678bb3042954c0817e1ece98c4..ded8603313ddff9ffe8682cff43565f4361b2a9e 100755 (executable)
--- a/pages/playctl.sh
+++ b/pages/playctl.sh
@@ -33,6 +33,10 @@ if [ -n "$info" ]; then
   head -n1 "$meta" |read length width height x
 else
   video="${treeroot%/}/${location#/}"
+  meta=''; tags=''; length=0; width=0; height=0;
+  description=0
 fi
 
 volume=$(validate "$(cat "$_DATA/mplayer.volume")" '[1-9]?[0-9]|100' 20)
+
+debug VIDEO: $video