[vlc-commits] lua: do not check for should_die (always false here)

Rémi Denis-Courmont git at videolan.org
Sun Mar 24 17:53:13 CET 2013


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Mar 24 18:51:35 2013 +0200| [fe3ca6c0450e72c19ebf6f6830085539eafd7a10] | committer: Rémi Denis-Courmont

lua: do not check for should_die (always false here)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fe3ca6c0450e72c19ebf6f6830085539eafd7a10
---

 share/lua/intf/cli.lua          |    2 +-
 share/lua/intf/dumpmeta.lua     |    4 ++--
 share/lua/intf/modules/host.lua |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/lua/intf/cli.lua b/share/lua/intf/cli.lua
index ffe3fed..3cd48f9 100644
--- a/share/lua/intf/cli.lua
+++ b/share/lua/intf/cli.lua
@@ -788,7 +788,7 @@ h:listen( config.hosts or config.host or "*console" )
 password = config.password or "admin"
 
 --[[ The main loop ]]
-while not vlc.misc.should_die() do
+while true do
     local write, read = h:accept_and_select()
 
     for _, client in pairs(write) do
diff --git a/share/lua/intf/dumpmeta.lua b/share/lua/intf/dumpmeta.lua
index 91f1295..8bada44 100644
--- a/share/lua/intf/dumpmeta.lua
+++ b/share/lua/intf/dumpmeta.lua
@@ -30,11 +30,11 @@ dumpmeta.lua: dump a file's meta data on stdout/stderr
 local item
 repeat
     item = vlc.input.item()
-until (item and item:is_preparsed()) or vlc.misc.should_die()
+until (item and item:is_preparsed())
 
 -- preparsing doesn't always provide all the information we want (like duration)
 repeat
-until item:stats()["demux_read_bytes"] > 0 or vlc.misc.should_die()
+until item:stats()["demux_read_bytes"] > 0
 
 vlc.msg.info("name: "..item:name())
 vlc.msg.info("uri: "..vlc.strings.decode_uri(item:uri()))
diff --git a/share/lua/intf/modules/host.lua b/share/lua/intf/modules/host.lua
index 6395a95..b840b32 100644
--- a/share/lua/intf/modules/host.lua
+++ b/share/lua/intf/modules/host.lua
@@ -38,7 +38,7 @@ Example use:
     --or h:listen( { "localhost:4212", "*console" } )
 
     -- The main loop
-    while not vlc.misc.should_die() do
+    while true do
         -- accept new connections and select active clients
         local write, read = h:accept_and_select()
 



More information about the vlc-commits mailing list