bugfixes and visual fixes in player control

svn path=/trunk/; revision=109

diff --git a/actions/playctl.sh b/actions/playctl.sh
index 38cd54ccdbc8b714a71c085cdae1404bb3a15184..bda4d1b208c9b94a5b4152c17514f1494d2a7097 100755 (executable)
--- a/actions/playctl.sh
+++ b/actions/playctl.sh
@@ -29,6 +29,10 @@ elif [ -n "${_POST[ctl]+x}" ]; then
   printf '%s\n' $(validate "${_POST[ctl]}" "pause|stop" pause) >"$fifofile"
 elif [ -n "${_POST[seek]+x}" ]; then
   printf 'seek %s\n' $(validate "${_POST[seek]}" "[+-]?[0-9]+" 0) >"$fifofile"
+elif [ -n "${_POST[osd]+x}" ]; then
+  case ${_POST[osd]} in
+    progression) printf "osd_show_progression\\n";;
+  esac >"$fifofile"
 fi &
 
 redirect "$HTTP_REFERER"

diff --git a/pages/playctl.sh b/pages/playctl.sh
index 143c4d952c7f440e03383132e3ad5dfab064aca7..015e7d338d16d3678bb3042954c0817e1ece98c4 100755 (executable)
--- a/pages/playctl.sh
+++ b/pages/playctl.sh
@@ -25,15 +25,14 @@ directory="${location%/*}"
 
 TITLE="$info"
 
-meta="${_DATA}/meta/$info.meta"
-[ -n "$info" ] && video="${_DATA}/videos/$info" \
-               || video="${treeroot%/}/${location#/}"
-tags="$(sed -n '2p' "$meta")"
-description="$(sed -n '3,$p' "$meta")"
-head -n1 "$meta" |read length width height x
-
-video="videos/$info"
-[ -n "$info" ] && video="videos/$info" \
-               || video="${location#/}"
+if [ -n "$info" ]; then
+  video="${_DATA}/videos/$info"
+  meta="${_DATA}/meta/$info.meta"
+  tags="$(sed -n '2p' "$meta")"
+  description="$(sed -n '3,$p' "$meta")"
+  head -n1 "$meta" |read length width height x
+else
+  video="${treeroot%/}/${location#/}"
+fi
 
 volume=$(validate "$(cat "$_DATA/mplayer.volume")" '[1-9]?[0-9]|100' 20)

diff --git a/templates/common.css.sh b/templates/common.css.sh
index 8c7e2d8e159d5d749e71cdd765b3d9256ca4b5bd..3ab88702e543141cbdc8135a066f9364d0685b56 100755 (executable)
--- a/templates/common.css.sh
+++ b/templates/common.css.sh
@@ -290,10 +290,13 @@ a.panel {
 }
 .panel#preferences > input { display: block; }
 
+#videoview h1, 
+#playctl h1 { font-size: 1.25em;}
 #videoview h1, #videoview > a,
 #playctl h1, #playctl > a {
   display: inline-block;
   margin-right: 1em;
+  padding: 0; margin: .5em 0;
 }
 #videoview video {
   display: block;

diff --git a/templates/playctl.html.sh b/templates/playctl.html.sh
index 339644dda86993a16c4cd9a6606bf0d2cac042a5..e1e2dfc433ff82e7ddc6e147750ff31c74e2d74c 100755 (executable)
--- a/templates/playctl.html.sh
+++ b/templates/playctl.html.sh
@@ -56,6 +56,8 @@ cat <<EOF
      $(for n in $(seq 0 5 100); do
        printf '<button class="%s" type="submit" name="vol" value="%s">&nbsp;</button>' "$([ "$volume" = "$n" ] && printf selected)" "$n"
      done)
+     <br>
+     <button type="submit" name="osd" value="progression">Progress</button>
   </form>
 
   <span class="info length">$(($length / 60)):$(($length % 60)) min</span>