From c17126553fd7dfe199828da7d2c7d4fb31aa39bb Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@gmail.com>
Date: Mon, 27 Dec 2010 22:07:24 -0500
Subject: [PATCH] web seeking

This patch adds the ability to seek forwards or backwards in a song
through the web controls.
---
 html/controls.html      |   3 +++
 html/controls.js        |  10 ++++++++++
 html/controls.py        |   7 +++++++
 html/images/forward.png | Bin 0 -> 1786 bytes
 html/images/rewind.png  | Bin 0 -> 1762 bytes
 5 files changed, 20 insertions(+)
 create mode 100644 html/images/forward.png
 create mode 100644 html/images/rewind.png

diff --git a/html/controls.html b/html/controls.html
index f69596ba..37c26612 100644
--- a/html/controls.html
+++ b/html/controls.html
@@ -75,6 +75,9 @@ function stop2()
 	<td><img id="button" src="images/play.png" onclick="play2();" /></td>
 	<td><img src="images/stop.png" onclick="stop2();" /></td>
 	<td><img src="images/next.png" onclick="next();"  /></td>
+	</tr><tr>
+	<td><img src="images/rewind.png"  onclick="rewind();"  /></td>
+	<td><img src="images/forward.png" onclick="forward();" /></td>
 </tr></table>
 
 </body>
diff --git a/html/controls.js b/html/controls.js
index 24c5fa9d..626cc65b 100644
--- a/html/controls.js
+++ b/html/controls.js
@@ -24,3 +24,13 @@ function next()
 {
 	control("next");
 }
+
+function forward()
+{
+	control("forward");
+}
+
+function rewind()
+{
+	control("rewind");
+}
diff --git a/html/controls.py b/html/controls.py
index 4999e442..b0561b69 100644
--- a/html/controls.py
+++ b/html/controls.py
@@ -11,7 +11,10 @@ pause = controls.pause
 stop  = controls.stop
 next  = controls.next
 attrs = libsaria.sources.get_attrs
+
 playing = controls.playing
+forward = controls.seek_forward
+rewind  = controls.seek_backward
 
 def to_html(wfile, args):
 	action = args["a"]
@@ -24,6 +27,10 @@ def to_html(wfile, args):
 		ret = stop()
 	elif action == "next":
 		ret = next()
+	elif action == "forward":
+		ret = forward()
+	elif action == "rewind":
+		ret = rewind()
 	elif action == "version":
 		ret = ocarina.__vers__
 	elif action == "uptime":
diff --git a/html/images/forward.png b/html/images/forward.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1d49403ede834e4996a7b2fd7906b88b0557724
GIT binary patch
literal 1786
zcmV<W1_k+vP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x2Cqp(K~!jg?Ur3^6xSJs-!pUOcX#dGS+m~7e}pZ&G`1o~hzi_BDk3qM
z1RS}skzGLeD!GB)Bv_GLiJM9h3av^@NpC<+o3;|UsH(O?a8V-Eswp7UsB&%m1CCtB
z#`b!>yR);qGdrgjvo^RH8?S?U(|x7UNM}aR`QGpSW^{mxDypcWiYlt8qW@p<YpiPk
z!T@9dIRN%1`Ok{8rq(i0-+tibvBqtU%KY5?M4?cy0OU8pe^#6|wU&Wk^lRHseYdZ#
zHEZa-)m6Uf>FJpT00jWnM&Xhq1-ET$I@Q<P*J>DgZ@}-LURX#hSe8{5r)&dNRaL?I
zhPqSd-~SQ6fB$~Z!^wy3HKE{MNu>96-N>1yxuJ2;G);>{!l!?D-r+p>{6V{4^Y8Vl
z@`!CCr|WutBb?0`&?1rW>Ep*vz_bcDa=4Sm<MI08k$?4u!nIz?({Z2AXC;%#b;m)|
zG;K?$ro_qP$ZMT69*frx4gIq>P@{Q0if3F^)u(dGHV}zKG))VfK7Q;3ve^ubd=8Ot
zgmk}glme{v(fmxWEXmW93iBS1$4sSCuH(?y*ck9tc~2idb^;kaja)wen8R4>%*?-g
zWl5g)`Ksol(Wp5!HC6Ulxf-aet6SOFFtQ*7u!}`lMH9Pr?dIEGY4_Y88$BQh!d_Jo
zhr{8mxwf{p+|bYvdy>=8(4eWR;xxk0!EwalSPtiv5{K~E%WP{n6bid?$~F*-#R7sz
zzjyrD3FHfT5W;~Y1cVS+mI+Cc@!G40X*?dQzjyCm9~G%5lh((g(Wo^sF;Q6NG&eT~
z2!|3U2ae+%4o6^GCL~e9;a88)cq~?b_wL<3Q5HOfygAm?)U=ATo;bHfS(YEaKsfLm
zSK6EhAslSmM%K{L($d2H`lH{-M|+OGsd}YbJddu9j*hzS?rsGDBuRRL!>{6Sgacy?
zStGN;>3*Z<O)B7)DDquhU0ro2Po9*&T-|CBx5e)6?&mUkYT{3SyoPip1rUI^zY31y
zAc_)_i;H;gy&vQrOitcmMe;7CbOeBRnUhK{fpFwY9L5+JV<3b;mK7`|lO@jQcX&eI
z^?JP{nM@{e_3G84>;7(wvMfUsg_Qz1jxXI;UxahIn9t|n^?Gsc+<AF$@cV6wD&1hj
z9`yVD!ZIh9H(=zlFpMmWTozeFe|+V1=-D*p7G@!cLWwijCW!nE-AE7m{r+fwfB%*Z
z8}N8MOcbS(0Vi&!b58e|%}}(9C|VXQ%S67AM<$y_VljbuEY4lI@(a1E>pO2Hml7jS
za(Iq{=Xvlv1*HNgPeCaK<tcccg6DV`IURHJk5)LZzuxs$aw##wn7Qlh*|X|@*Gk<C
z`2BvQ^(6p6p^yh51cU$p0RsaVgI$W=wr$w94aRIZzYfPL&vOtZafK;R;i(*efHC6A
zQB{vysqO}No@bKiY%U1S#!mOy<C!fL4#L0)fg*dLDjp0E580PK_*ua&+CSeJd;a2s
zhhz7@DreV=yMJn$=Ip@0Kz2h0d_EsrSab|fDu8p^279IBMW-0zJg-tzq|<4<f9YKA
zi`nVh0l$Bsx;i*22!gttLb;ro*)MK~w$u#N*4B>(0)fSzo*vha*wsKF5Ww_|xSR$!
z!l7sv0p`Tc7z4nd$SOF(;o9|Ug_}43oaCwS&ewOe+z>@^vA@4Rclq+=22tD`=Y{4M
zuh-VrE*?5`Xx(Fms{ug}Rz|2;ETYJ)(yTgh^E`zlN*Es>wSV=|FAH|D_`&l#TYeG@
z2Io3EJJZV?MNv==2aLIL$~K^B+R6uLnI>3iW;wz^krib03_kquN^W-U(e0oXI1`IC
z-%q7dOP!sat75LMu4WtH7_)Pa?$m}tXSQ#TxpK-jAc`Vej^4BiAcTV~E8qx+Pj1~T
zeER8Mld`P7-M;_e^+Y0(Jb3V+Ys`wG;8}3WHsJUBnOHgoP%1!CR7_4jw15AH-xXl9
zORX>Lz97r;{GL5~GV8%5Nm`RbKrZe1#!DAMq0oGDbMv~KvJI%J`o!$oxcc#LjfF(w
zc5P(qnWn8xqf=8;OC22@PmMVk47zf*);GMfGrDthcz8IqZ{NNRkIRM)$g<2tQN-W=
z{+Ik`pZy~#E6UpkUhcTg7+c!0W5<SLRutu#a5iT^5-~A8e(|Mm?z>P^Q?n2Xh02au
zmStO%M2wA%Ui?<uw|^WA1{cENu>RG{eu@}l-b^M_%NX-B#$3-!|4U9q6;)JGMHN+4
cQAO_h4^MZ8=;H*iP5=M^07*qoM6N<$g4UUN<p2Nx

literal 0
HcmV?d00001

diff --git a/html/images/rewind.png b/html/images/rewind.png
new file mode 100644
index 0000000000000000000000000000000000000000..f448b2eb4750f3bece72153697f945f84b94b4b2
GIT binary patch
literal 1762
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
Ef(DFOr~m)}

literal 0
HcmV?d00001