From: Rémi Duraffort <ivoire@videolan.org>
Date: Mon, 5 Apr 2010 09:35:18 +0000 (+0200)
Subject: luahttp: fix service discovery loading.
X-Git-Tag: 1.1.0-pre1~130
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=a9e4799e43b57739786acf23efaa65e1379887ea

luahttp: fix service discovery loading.
---

diff --git a/share/lua/http/dialogs/playlist b/share/lua/http/dialogs/playlist
index cf3f58a2d0..01814cce87 100644
--- a/share/lua/http/dialogs/playlist
+++ b/share/lua/http/dialogs/playlist
@@ -83,7 +83,13 @@ This dialog needs the following dialogs to be fully functional: <none>
           <?vlc
             local sd = vlc.sd.get_services_names()
             for n,ln in pairs(sd) do
-              print([[<button onclick="pl_sd(']]..n..[[');hide_menu('menu_sd');" onmouseover="setclass(this,'menuover');" onmouseout="setclass(this,'menuout');" class="menuout" title="Toggle ]]..ln..[[" >]]..ln..[[</button><br/>]])
+                local sdname = string.gsub(n, "([^{]*)({.*)", "%1")
+                local islua = 0
+                if(sdname == "lua") then
+                    sdname = string.gsub(n, "(lua{sd=')([^']*)'(.*)", "%2")
+                    islua = 1
+                end
+              print([[<button class="menuout" onclick='pl_sd("]]..sdname..[[", "]]..islua..[[");hide_menu("menu_sd");' onmouseover="setclass(this,'menuover');" onmouseout="setclass(this,'menuout');" class="menuout" title="Toggle ]]..ln..[[" >]]..ln..[[</button><br/>]])
             end
           ?>
           </div>
diff --git a/share/lua/http/js/functions.js b/share/lua/http/js/functions.js
index fc0ed9246a..d75aa16e11 100644
--- a/share/lua/http/js/functions.js
+++ b/share/lua/http/js/functions.js
@@ -360,9 +360,9 @@ function pl_repeat()
 {
     loadXMLDoc( 'requests/status.xml?command=pl_repeat', parse_status );
 }
-function pl_sd( value )
+function pl_sd( value, islua )
 {
-    loadXMLDoc( 'requests/status.xml?command=pl_sd&val='+value, parse_status );
+    loadXMLDoc( 'requests/status.xml?command=pl_sd&val='+value+'&islua='+islua, parse_status );
 }
 
 /* misc actions */
diff --git a/share/lua/http/requests/status.xml b/share/lua/http/requests/status.xml
index f4fc486bd6..17c76df1d2 100644
--- a/share/lua/http/requests/status.xml
+++ b/share/lua/http/requests/status.xml
@@ -79,10 +79,15 @@ elseif command == "pl_loop" then
 elseif command == "pl_repeat" then
   vlc.playlist.repeat_()
 elseif command == "pl_sd" then
-  if vlc.sd.is_loaded(val) then
-    vlc.sd.remove(val)
+  if(_GET['islua'] == "1") then
+    sdname = "lua{sd='" .. val .. "'}"
   else
-    vlc.sd.add(val)
+    sdname = val
+  end
+  if vlc.sd.is_loaded(sdname) then
+    vlc.sd.remove(sdname)
+  else
+    vlc.sd.add(sdname)
   end
 elseif command == "fullscreen" then
   vlc.fullscreen()