[vlc-commits] Lua: httprequests.lua -- formatting fixes

Akash Mehrotra git at videolan.org
Tue Aug 30 19:41:45 CEST 2011


vlc | branch: master | Akash Mehrotra <mehrotra.akash at gmail.com> | Tue Aug 30 19:33:41 2011 +0200| [02a2c3976bd30b2d895b89cd4c9485ccabd65a99] | committer: Jean-Baptiste Kempf

Lua: httprequests.lua -- formatting fixes

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

 share/lua/http/requests/README.txt      |    1 -
 share/lua/intf/modules/httprequests.lua |   20 ++++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/share/lua/http/requests/README.txt b/share/lua/http/requests/README.txt
index 8d21fe9..6afac17 100644
--- a/share/lua/http/requests/README.txt
+++ b/share/lua/http/requests/README.txt
@@ -128,7 +128,6 @@ Band 0: 60 Hz, 1: 170 Hz, 2: 310 Hz, 3: 600 Hz, 4: 1 kHz,
 
 <Display the list of presets available for the equalizer
 
-=======
 playlist.xml:
 =============
 < get the full playlist tree
diff --git a/share/lua/intf/modules/httprequests.lua b/share/lua/intf/modules/httprequests.lua
index 4ef10fe..cdc2324 100644
--- a/share/lua/intf/modules/httprequests.lua
+++ b/share/lua/intf/modules/httprequests.lua
@@ -31,10 +31,12 @@ local function stripslashes(s)
   return string.gsub(s,"\\(.)","%1")
 end
 
+--Round the number to the specified precision
 function round(what, precision)
   if what then return math.floor(what*math.pow(10,precision)+0.5) / math.pow(10,precision) else return "" end
 end
 
+--split text where it matches the delimiter
 function strsplit(text, delimiter)
 	local strfind = string.find
 	local strsub = string.sub
@@ -374,6 +376,7 @@ local aout = vlc.object.aout()
 		s.rate=1
 		s.subtitledelay=0
 	end
+
 	if vout then
 		s.fullscreen=vlc.var.get(vout,"fullscreen")
 		s.aspectratio=vlc.var.get(vout,"aspect-ratio");
@@ -381,6 +384,7 @@ local aout = vlc.object.aout()
 	else
 		s.fullscreen=0
 	end
+
 	if aout then
 		local filters=vlc.var.get(aout,"audio-filter")
 		local temp=strsplit(filters,":")
@@ -391,16 +395,19 @@ local aout = vlc.object.aout()
 			id=id+1
 		end
 	end
+
 	s.videoeffects={}
-		s.videoeffects.hue=round(vlc.config.get("hue"),2)
-		s.videoeffects.brightness=round(vlc.config.get("brightness"),2)
-		s.videoeffects.contrast=round(vlc.config.get("contrast"),2)
-		s.videoeffects.saturation=round(vlc.config.get("saturation"),2)
-		s.videoeffects.gamma=round(vlc.config.get("gamma"),2)
+	s.videoeffects.hue=round(vlc.config.get("hue"),2)
+	s.videoeffects.brightness=round(vlc.config.get("brightness"),2)
+	s.videoeffects.contrast=round(vlc.config.get("contrast"),2)
+	s.videoeffects.saturation=round(vlc.config.get("saturation"),2)
+	s.videoeffects.gamma=round(vlc.config.get("gamma"),2)
+
 	s.state=vlc.playlist.status()
 	s.random=vlc.var.get(playlist,"random")
 	s.loop=vlc.var.get(playlist,"loop")
 	s["repeat"]=vlc.var.get(playlist,"repeat")
+
         s.equalizer={}
 		s.equalizer.preamp=round(vlc.equalizer.preampget(),2)
 		s.equalizer.bands=vlc.equalizer.equalizerget()
@@ -432,10 +439,7 @@ local aout = vlc.object.aout()
         	local tag = string.gsub(k,"_","")
         s.stats[tag]=xmlString(v)
       end
-
-
 	end
-
 	return s
 end
 



More information about the vlc-commits mailing list