Revert "Lua SD: let the user know we are working"

[vlc] / share / lua / sd / freebox.lua

diff --git a/share/lua/sd/freebox.lua b/share/lua/sd/freebox.lua
index 270b692ad9a4c372c7217374eeb50d9fd8095344..a908648ef08f8e11fe45ba6af32bf8bc67fec409 100644 (file)
--- a/share/lua/sd/freebox.lua
+++ b/share/lua/sd/freebox.lua
@@ -1,9 +1,8 @@
---SD_Description=Freebox TV
 --[[
  $Id$
 
- Copyright © 2010 the VideoLAN team
- 
+ Copyright © 2010 VideoLAN and AUTHORS
+
  Authors: Fabio Ritrovato <sephiroth87 at videolan dot org>
 
  This program is free software; you can redistribute it and/or modify
@@ -21,8 +20,16 @@
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 --]]
 
+function descriptor()
+    return { title="Freebox TV" }
+end
+
 function main()
-    local fd = vlc.stream( "http://mafreebox.freebox.fr/freeboxtv/playlist.m3u" )
+    local fd, msg = vlc.stream( "http://mafreebox.freebox.fr/freeboxtv/playlist.m3u" )
+    if not fd then
+        vlc.msg.warn(msg)
+        return nil
+    end
     local line=  fd:readline()
     if line ~= "#EXTM3U" then
         return nil
@@ -33,12 +40,11 @@ function main()
     while line ~= nil do
         if( string.find( line, "#EXTINF" ) ) then
             _, _, duration, artist, name = string.find( line, ":(%w+),(%w+)%s*-%s*(.+)" )
-            --TODO: fix the name not showing special characters correctly
         elseif( string.find( line, "#EXTVLCOPT" ) ) then
             _, _, option = string.find( line, ":(.+)" )
             table.insert( options, option )
         else
-            vlc.sd.add_item( {url=line,duration=duration,artist=artist,title=name,options=options} )
+            vlc.sd.add_item( {path=line,duration=duration,artist=artist,title=name,options=options} )
             duration = nil
             artist = nil
             name = nil