]> git.sesse.net Git - vlc/commitdiff
luaHTTP: behave like oldHTTP for seeking
authorJean-Baptiste Kempf <jb@videolan.org>
Sun, 18 Sep 2011 09:12:02 +0000 (11:12 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Sun, 18 Sep 2011 09:12:02 +0000 (11:12 +0200)
Close #5345
Patch by jikuja

share/lua/http/js/controlers.js
share/lua/http/js/ui.js

index bc969b7617ac36095f7254da3a12b4f6428d2938..ba2315bc667dafcdd752e6c37a2623a543534ddb 100644 (file)
@@ -10,7 +10,7 @@ function updateStatus(){
                                $('#mediaTitle').append($('[name="filename"]',data).text());
                                $('#totalTime').append(format_time($('length',data).text()));
                                $('#currentTime').append(format_time($('time',data).text()));
-                               $('#seekSlider').slider({value: ($('time',data).text()/$('length',data).text()*100) })
+                               $('#seekSlider').slider({value: ($('position',data).text()*100) });
                                $('#currentVolume').append(Math.round($('volume',data).text()/5.12)+'%');
                                $('#volumeSlider').slider({value: ($('volume',data).text()/5.12) });
                                $('#rateSlider').slider({value: ($('rate',data).text()) });
index fbef9ff1921696af340fa3da9e44ee3f3b47a335..5bce9153b9eaec4c754a4a2571296aa92be79601 100644 (file)
@@ -8,7 +8,7 @@ $(function(){
                        $( "#currentTime" ).empty().append( format_time(Math.round((ui.value/100)*$('#seekSlider').attr('totalLength'))) );
                        switch(current_que){
                                case 'main':
-                                       sendCommand({'command':'seek','val':Math.round((ui.value/100)*$('#seekSlider').attr('totalLength'))});
+                                       sendCommand({'command':'seek','val':(ui.value)+'%'});
                                        break;
                                case 'stream':
                                        sendVLMCmd('control Current seek '+ui.value);
@@ -69,4 +69,4 @@ $(function(){
                return false;
        });
        $('#stream_host').val(stream_server);
-})
\ No newline at end of file
+})