Author: richard
Date: Mon Mar 23 15:03:55 2009
New Revision: 4912
URL: http://svn.slimdevices.com/jive?rev=4912&view=rev
Log:
r4...@harrypotter (orig r4899): tom | 2009-03-23 16:06:17 +0000
Bug: 11439
Description:
Volume now uses acceleration
r4...@harrypotter (orig r4905): tom | 2009-03-23 19:35:41 +0000
Bug: 11440
Description:
offer "on top" framework widgets, with "not on top" being the default.
r4...@harrypotter (orig r4906): tom | 2009-03-23 19:39:12 +0000
Bug: 11440
Description:
code cleanup - removed extra tab
offer "on top" framework widgets, with "not on top" being the default.
r4...@harrypotter (orig r4911): richard | 2009-03-23 22:01:14 +0000
Bug: N/A
Description:
Don't use a read timeout when streaming, this could cause remote streams to
fail.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/DebugSkin/DebugSkinMeta.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Volume.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_window.c
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Mar 23 15:03:55 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:4842
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4894
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4911
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.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/DebugSkin/DebugSkinMeta.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/DebugSkin/DebugSkinMeta.lua?rev=4912&r1=4911&r2=4912&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/DebugSkin/DebugSkinMeta.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/DebugSkin/DebugSkinMeta.lua
Mon Mar 23 15:03:55 2009
@@ -76,7 +76,7 @@
_debugWidget(meta, screen, w)
end)
end)
- Framework:addWidget(meta.canvas)
+ Framework:addWidget(meta.canvas, true)
meta.mouseListener = Framework:addListener(EVENT_MOUSE_ALL,
function(event)
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Volume.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Volume.lua?rev=4912&r1=4911&r2=4912&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Volume.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Volume.lua
Mon Mar 23 15:03:55 2009
@@ -84,7 +84,9 @@
Icon("volumeMax")
}))
- popup:addListener(ACTION | EVENT_KEY_ALL,
+ popup:focusWidget(nil)
+
+ popup:addListener(ACTION | EVENT_KEY_ALL | EVENT_SCROLL,
function(event)
return self:event(event)
end)
@@ -189,7 +191,19 @@
local type = event:getType()
- if type == ACTION then
+ if type == EVENT_SCROLL then
+ local scroll = event:getScroll()
+
+ if scroll > 0 then
+ self.delta = 1
+ elseif scroll < 0 then
+ self.delta = -1
+ else
+ self.delta = 0
+ end
+ _updateVolume(self)
+
+ elseif type == ACTION then
local action = event:getAction()
if action == "volume_up" then
self.delta = 1
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua?rev=4912&r1=4911&r2=4912&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/audio/Playback.lua
Mon Mar 23 15:03:55 2009
@@ -36,7 +36,8 @@
local TCP_CLOSE_LOCAL_TIMEOUT = 4
-local STREAM_READ_TIMEOUT = 30
+-- Do NOT set a read timeout, the stream may be paused indefinately
+local STREAM_READ_TIMEOUT = 0
local STREAM_WRITE_TIMEOUT = 5
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua?rev=4912&r1=4911&r2=4912&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/Framework.lua
Mon Mar 23 15:03:55 2009
@@ -89,6 +89,7 @@
-- initial global state
windowStack = {}
widgets = {} -- global widgets
+onTopWidgets = {} -- global "on top" widgets
globalListeners = {} -- global listeners
unusedListeners = {} -- unused listeners
animations = {} -- active widget animations
@@ -373,16 +374,20 @@
--[[
-=head2 jive.ui.Framework:addWidget(widget)
-
-Add a global widget I<widget> to the screen. The global widgets are shown on
all windows.
-
-=cut
---]]
-function addWidget(self, widget)
+=head2 jive.ui.Framework:addWidget(widget, onTop)
+
+Add a global widget I<widget> to the screen. The global widgets are shown on
all windows. If onTop is set, the widget will be drawn after all other widgets.
+
+=cut
+--]]
+function addWidget(self, widget, onTop)
_assert(oo.instanceof(widget, Widget))
- widgets[#widgets + 1] = widget
+ if onTop then
+ onTopWidgets[#onTopWidgets + 1] = widget
+ else
+ widgets[#widgets + 1] = widget
+ end
widget:dispatchNewEvent(EVENT_SHOW)
self:reDraw(nil)
@@ -401,6 +406,7 @@
_assert(oo.instanceof(widget, Widget))
table.delete(widgets, widget)
+ table.delete(onTopWidgets, widget)
widget:dispatchNewEvent(EVENT_HIDE)
self:reDraw(nil)
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_window.c
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_window.c?rev=4912&r1=4911&r2=4912&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_window.c
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_window.c Mon Mar
23 15:03:55 2009
@@ -133,19 +133,6 @@
* 1: widget
* 2: closure
*/
-
- // window widgets
- lua_getfield(L, 1, "widgets");
- lua_pushnil(L);
- while (lua_next(L, -2) != 0) {
- lua_pushvalue(L, 2);
- lua_pushvalue(L, -2);
- lua_call(L, 1, 1);
-
- r = r | luaL_optinteger(L, -1, 0);
- lua_pop(L, 2);
- }
- lua_pop(L, 1);
lua_getfield(L, 1, "showFrameworkWidgets");
if (lua_toboolean(L, -1)) {
@@ -157,13 +144,40 @@
lua_pushvalue(L, 2);
lua_pushvalue(L, -2);
lua_call(L, 1, 1);
-
+
r = r | luaL_optinteger(L, -1, 0);
lua_pop(L, 2);
}
lua_pop(L, 2);
}
lua_pop(L, 1);
+
+ // window widgets
+ lua_getfield(L, 1, "widgets");
+ lua_pushnil(L);
+ while (lua_next(L, -2) != 0) {
+ lua_pushvalue(L, 2);
+ lua_pushvalue(L, -2);
+ lua_call(L, 1, 1);
+
+ r = r | luaL_optinteger(L, -1, 0);
+ lua_pop(L, 2);
+ }
+ lua_pop(L, 1);
+
+ // global "on top" widgets
+ jiveL_getframework(L);
+ lua_getfield(L, -1, "onTopWidgets");
+ lua_pushnil(L);
+ while (lua_next(L, -2) != 0) {
+ lua_pushvalue(L, 2);
+ lua_pushvalue(L, -2);
+ lua_call(L, 1, 1);
+
+ r = r | luaL_optinteger(L, -1, 0);
+ lua_pop(L, 2);
+ }
+ lua_pop(L, 2);
lua_pushinteger(L, r);
return 1;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
