Revert "luahttp: fix service discovery loading."

This reverts commit a9e4799e43b57739786acf23efaa65e1379887ea.

diff --git a/share/lua/http/dialogs/playlist b/share/lua/http/dialogs/playlist
index 01814cce87c77f552cf889ca140e89d474ed36df..cf3f58a2d0b17155a162efdf8ca21c353bcb3ccb 100644 (file)
--- a/share/lua/http/dialogs/playlist
+++ b/share/lua/http/dialogs/playlist
@@ -83,13 +83,7 @@ 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
-                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/>]])
+              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/>]])
             end
           ?>
           </div>

diff --git a/share/lua/http/js/functions.js b/share/lua/http/js/functions.js
index d75aa16e11e70330fc1dedae67eff0eb01838cfe..fc0ed9246aaed640fd10df3bc12918f1315a55ee 100644 (file)
--- 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, islua )
+function pl_sd( value )
 {
-    loadXMLDoc( 'requests/status.xml?command=pl_sd&val='+value+'&islua='+islua, parse_status );
+    loadXMLDoc( 'requests/status.xml?command=pl_sd&val='+value, parse_status );
 }
 
 /* misc actions */

diff --git a/share/lua/http/requests/status.xml b/share/lua/http/requests/status.xml
index 17c76df1d281483208d60300cc300ec19ba116da..f4fc486bd6b1ba2743957ff86c7a39da952f0429 100644 (file)
--- a/share/lua/http/requests/status.xml
+++ b/share/lua/http/requests/status.xml
@@ -79,15 +79,10 @@ elseif command == "pl_loop" then
 elseif command == "pl_repeat" then
   vlc.playlist.repeat_()
 elseif command == "pl_sd" then
-  if(_GET['islua'] == "1") then
-    sdname = "lua{sd='" .. val .. "'}"
+  if vlc.sd.is_loaded(val) then
+    vlc.sd.remove(val)
   else
-    sdname = val
-  end
-  if vlc.sd.is_loaded(sdname) then
-    vlc.sd.remove(sdname)
-  else
-    vlc.sd.add(sdname)
+    vlc.sd.add(val)
   end
 elseif command == "fullscreen" then
   vlc.fullscreen()