Author: titmuss
Date: Wed May 7 06:21:33 2008
New Revision: 2431
URL: http://svn.slimdevices.com?rev=2431&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2428): awy | 2008-05-07 13:14:51 +0100
Added variable auto-invoke based on local (400ms) or remote (2s) streams,
matching the SongScanner plugin for the player-UI
Modified:
7.2/trunk/ (props changed)
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Propchange: 7.2/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed May 7 06:21:33 2008
@@ -1,5 +1,5 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2409
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2420
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2428
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua?rev=2431&root=Jive&r1=2430&r2=2431&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
Wed May 7 06:21:33 2008
@@ -39,7 +39,8 @@
-- Tuning
local POSITION_STEP = 5
local POPUP_AUTOCLOSE_INTERVAL = 10000 -- close popup after this much
inactivity
-local POPUP_AUTOINVOKE_INTERVAL = 1300 -- invoke gotoTime after this much
inactivity
+local AUTOINVOKE_INTERVAL_LOCAL = 400 -- invoke gotoTime after this much
inactivity for local tracks
+local AUTOINVOKE_INTERVAL_REMOTE = 2000 -- and this much for remote
streams
local ACCELERATION_INTERVAL = 350 -- events faster than this cause
acceleration
local ACCELERATION_INTERVAL_SLOW = 200 -- but less so unless faster than this
@@ -118,6 +119,12 @@
self.displayTimer:restart()
+ if self.player:isRemote() then
+ self.autoinvokeTime = AUTOINVOKE_INTERVAL_REMOTE
+ else
+ self.autoinvokeTime = AUTOINVOKE_INTERVAL_LOCAL
+ end
+
_updateDisplay(self)
popup:showBriefly(POPUP_AUTOCLOSE_INTERVAL,
@@ -176,7 +183,8 @@
-- self.elapsed = self.player:gotoTime(new) or self.elapsed
self.elapsed = new
_updateDisplay(self)
- self.autoInvokeTimer:restart()
+
+ self.autoInvokeTimer:restart(self.autoinvokeTime)
end
@@ -195,7 +203,7 @@
obj.applet = applet
obj.lastUpdate = 0
obj.displayTimer = Timer(1000, function() _updateElapsedTime(obj) end)
- obj.autoInvokeTimer = Timer(POPUP_AUTOINVOKE_INTERVAL, function()
_gotoTime(obj) end, true)
+ obj.autoInvokeTimer = Timer(AUTOINVOKE_INTERVAL_LOCAL, function()
_gotoTime(obj) end, true)
obj.holdTimer = Timer(100, function() _updateSelectedTime(obj) end)
return obj
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=2431&root=Jive&r1=2430&r2=2431&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Wed May 7
06:21:33 2008
@@ -1010,6 +1010,11 @@
return self.trackDuration and self.state["can_seek"]
end
+-- isRemote
+function isRemote(self)
+ return self.state.remote
+end
+
-- mute
-- mutes or ummutes the player, returns a negitive value if the player is muted
function mute(self, mute)
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
