From: Rémi Duraffort <ivoire@videolan.org>
Date: Thu, 8 Apr 2010 15:40:59 +0000 (+0200)
Subject: lua_http: fix duration printing.
X-Git-Tag: 1.1.0-pre1~85
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=aa648afd1a957cea4f1119109e10240663397dbc;p=vlc

lua_http: fix duration printing.
---

diff --git a/share/lua/http/js/functions.js b/share/lua/http/js/functions.js
index fc0ed9246a..56b64816b9 100644
--- a/share/lua/http/js/functions.js
+++ b/share/lua/http/js/functions.js
@@ -616,7 +616,7 @@ function parse_playlist()
                     pl.appendChild( document.createTextNode( elt.getAttribute( 'name' ) ) );
                     var duration = elt.getAttribute( 'duration' );
                     if( duration > 0 )
-                        pl.appendChild( document.createTextNode( " (" + format_time( elt.getAttribute( 'duration' ) / 1000000 ) + ")" ) );
+                        pl.appendChild( document.createTextNode( " (" + format_time( elt.getAttribute( 'duration' ) ) + ")" ) );
                     pos.appendChild( pl );
 
                     if( elt.getAttribute( 'ro' ) == 'rw' )
diff --git a/share/lua/http/requests/playlist.xml b/share/lua/http/requests/playlist.xml
index 922e1492ad..619fd04cff 100644
--- a/share/lua/http/requests/playlist.xml
+++ b/share/lua/http/requests/playlist.xml
@@ -57,7 +57,7 @@ function print_playlist(item)
                 current = 'current="current"'
             end
         end
-        print('<leaf id="' ..tostring(item.id).. '" uri="' ..tostring(path).. '" name="' ..name.. '" ro="' ..(item.flags.ro and "ro" or "rw").. '" duration ="' ..tostring(item.duration).. '" ' ..current.. ' />')
+        print('<leaf id="' ..tostring(item.id).. '" uri="' ..tostring(path).. '" name="' ..name.. '" ro="' ..(item.flags.ro and "ro" or "rw").. '" duration ="' ..math.floor(item.duration).. '" ' ..current.. ' />')
     end
 end