Commit c0fe636d authored by Antoine Cellerier's avatar Antoine Cellerier

"[PATCH] http interface workaround to make the play/pause button work well" by Laurent Mutricy.

parent 9769a897
...@@ -78,6 +78,7 @@ Jonas Larsen <jonas at vrt.dk> - Danish translation ...@@ -78,6 +78,7 @@ Jonas Larsen <jonas at vrt.dk> - Danish translation
Julien Blache <jb at technologeek.org> - disc ejection code Julien Blache <jb at technologeek.org> - disc ejection code
kty0ne - WinAmp 5 skin for VLC kty0ne - WinAmp 5 skin for VLC
Laurent Jonqueres <laurent_jonqueres at yahoo.fr> - Occitan localization Laurent Jonqueres <laurent_jonqueres at yahoo.fr> - Occitan localization
Laurent Mutricy <laurent.mutricy at ecl2005 dot ec-lyon dot fr> - HTTP interface fixes
Lorena Gomes - Catalan translation Lorena Gomes - Catalan translation
Marc Nolette <nolette at videotron.ca> - PVR support in DirectShow input Marc Nolette <nolette at videotron.ca> - PVR support in DirectShow input
Marco Munderloh <Marco.Munderloh at web.de> - HTTP fix for Win32 to URL filenames Marco Munderloh <Marco.Munderloh at web.de> - HTTP fix for Win32 to URL filenames
......
...@@ -21,9 +21,12 @@ ...@@ -21,9 +21,12 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
/* global variables */ /**********************************************************************
* Global variables
*********************************************************************/
var old_time = 0; var old_time = 0;
var pl_cur_id;
/********************************************************************** /**********************************************************************
* Slider functions * Slider functions
...@@ -273,11 +276,12 @@ function in_enqueue() ...@@ -273,11 +276,12 @@ function in_enqueue()
function pl_play( id ) function pl_play( id )
{ {
loadXMLDoc( 'requests/status.xml?command=pl_play&id='+id, parse_status ); loadXMLDoc( 'requests/status.xml?command=pl_play&id='+id, parse_status );
pl_cur_id = id;
setTimeout( 'update_playlist()', 1000 ); setTimeout( 'update_playlist()', 1000 );
} }
function pl_pause() function pl_pause()
{ {
loadXMLDoc( 'requests/status.xml?command=pl_pause', parse_status ); loadXMLDoc( 'requests/status.xml?command=pl_pause&id='+pl_cur_id, parse_status );
} }
function pl_stop() function pl_stop()
{ {
...@@ -478,6 +482,9 @@ function parse_playlist() ...@@ -478,6 +482,9 @@ function parse_playlist()
var pos = document.createElement( "div" ); var pos = document.createElement( "div" );
var pos_top = pos; var pos_top = pos;
var elt = answer.firstChild; var elt = answer.firstChild;
pl_cur_id = 0; /* changed to the current id is there actually
* is a current id */
while( elt ) while( elt )
{ {
if( elt.nodeName == "node" ) if( elt.nodeName == "node" )
...@@ -513,6 +520,7 @@ function parse_playlist() ...@@ -513,6 +520,7 @@ function parse_playlist()
clear_children( nowplaying ); clear_children( nowplaying );
nowplaying.appendChild( document.createTextNode( elt.getAttribute( 'name' ) ) ); nowplaying.appendChild( document.createTextNode( elt.getAttribute( 'name' ) ) );
pl.appendChild( document.createTextNode( '* ')); pl.appendChild( document.createTextNode( '* '));
pl_cur_id = elt.getAttribute( 'id' );
} }
pl.setAttribute( 'title', elt.getAttribute( 'uri' )); pl.setAttribute( 'title', elt.getAttribute( 'uri' ));
pl.appendChild( document.createTextNode( elt.getAttribute( 'name' ) ) ); pl.appendChild( document.createTextNode( elt.getAttribute( 'name' ) ) );
......
...@@ -42,7 +42,11 @@ ...@@ -42,7 +42,11 @@
<vlc id="rpn" param1="id value vlc_play" /> <vlc id="rpn" param1="id value vlc_play" />
<vlc id="end" /> <vlc id="end" />
<vlc id="if" param1="command value 'pl_pause' strcmp 0 =" /> <vlc id="if" param1="command value 'pl_pause' strcmp 0 =" />
<vlc id="rpn" param1="vlc_pause" /> <vlc id="if" param1="stream_state value 'stop' strcmp 0 = id value 0 = ! &" />
<vlc id="rpn" param1="id value vlc_play"/>
<vlc id="else" />
<vlc id="rpn" param1="vlc_pause" />
<vlc id="end" />
<vlc id="end" /> <vlc id="end" />
<vlc id="if" param1="command value 'pl_stop' strcmp 0 =" /> <vlc id="if" param1="command value 'pl_stop' strcmp 0 =" />
<vlc id="rpn" param1="vlc_stop" /> <vlc id="rpn" param1="vlc_stop" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment