Author: titmuss
Date: Sat Jan 10 14:47:34 2009
New Revision: 3759
URL: http://svn.slimdevices.com?rev=3759&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3750): bklaas | 2009-01-09 21:01:55 +0000
Bug: n/a
Description: interfaceTable is a key,value table, not an array. Use pairs
instead of ipairs to access
r3...@harrypotter (orig r3755): richard | 2009-01-10 21:02:23 +0000
Bug: N/A
Description:
Minor fix to blank screen applet, to always restore the brightness to the
correct setting.
r3...@harrypotter (orig r3758): titmuss | 2009-01-10 22:46:19 +0000
r3...@harrypotter (orig r3747): mherger | 2009-01-09 13:38:39 +0000
Bug: 10499
Description: fix song scanner's time format to use hours (hh::mm::ss) on SP
r3...@harrypotter (orig r3753): adrian | 2009-01-09 23:11:07 +0000
Bug: N/A
Description: avoid crashing if trying to load a non image file as an image
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_tile.c
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Jan 10 14:47:34 2009
@@ -3,8 +3,8 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
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:3729
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3740
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3753
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:3758
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/BlankScreen/BlankScreenApplet.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua?rev=3759&root=Jive&r1=3758&r2=3759&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/BlankScreen/BlankScreenApplet.lua
Sat Jan 10 14:47:34 2009
@@ -44,9 +44,6 @@
self.bg = Surface:newRGBA(self.sw, self.sh)
self.bg:filledRectangle(0, 0, self.sw, self.sh, 0x000000FF)
- -- store existing brightness levels in self
- self.brightness = appletManager:callService("getBrightness")
-
self.bgicon = Icon("background", self.bg)
self.window:addWidget(self.bgicon)
@@ -55,9 +52,10 @@
function(event)
local type = event:getType()
if type == EVENT_WINDOW_ACTIVE then
- _brightness(0)
+ self:_getBrightness()
+ self:_setBrightness(0)
else
- _brightness(self.brightness)
+ self:_setBrightness(self.brightness)
end
return EVENT_UNUSED
end,
@@ -85,7 +83,12 @@
self.window:show(Window.transitionFadeIn)
end
-function _brightness(brightness)
+function _getBrightness(self)
+ -- store existing brightness levels in self
+ self.brightness = appletManager:callService("getBrightness")
+end
+
+function _setBrightness(self, brightness)
appletManager:callService("setBrightness", brightness)
end
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=3759&root=Jive&r1=3758&r2=3759&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Sat Jan 10 14:47:34 2009
@@ -802,9 +802,9 @@
s.scannerGroup.text = {}
s.scannerGroup.text.fg = TEXT_COLOR
s.scannerGroup.text.font = FONT_13px
- s.scannerGroup.text.w = 55
- -- s.scannerGroup.padding = { 0, 0, 0, 0 }
- s.scannerGroup.text.padding = { 8, 0, 0, 0}
+ s.scannerGroup.text.w = 60
+ s.scannerGroup.text.align = "right"
+ s.scannerGroup.text.padding = { 0, 0, 4, 0}
s.scannerPopup = {}
s.scannerPopup.x = 0
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua?rev=3759&root=Jive&r1=3758&r2=3759&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/Scanner.lua
Sat Jan 10 14:47:34 2009
@@ -48,10 +48,15 @@
module(..., oo.class)
local function _secondsToString(seconds)
- local min = math.floor(seconds / 60)
- local sec = math.floor(seconds - (min*60))
-
- return string.format("%d:%02d", min, sec)
+ local hrs = math.floor(seconds / 3600 )
+ local mins = math.floor((seconds % 3600) / 60)
+ local secs = seconds % 60
+
+ if hrs > 0 then
+ return string.format("%d:%02d:%02d", hrs, mins, secs)
+ end
+
+ return string.format("%d:%02d", mins, secs)
end
local function _updateDisplay(self)
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_tile.c
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_tile.c?rev=3759&root=Jive&r1=3758&r2=3759&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_tile.c (original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_tile.c Sat Jan
10 14:47:34 2009
@@ -55,6 +55,9 @@
tmp = IMG_Load(fullpath);
if (!tmp) {
fprintf(stderr, "Error in jive_file_load_image: %s\n",
IMG_GetError());
+ free(fullpath);
+ free(tile);
+ return NULL;
}
else {
if (tmp->format->Amask) {
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua?rev=3759&root=Jive&r1=3758&r2=3759&view=diff
==============================================================================
---
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
(original)
+++
7.4/branches/pango/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
Sat Jan 10 14:47:34 2009
@@ -131,8 +131,8 @@
log:debug('scanning /proc/net/dev for interfaces...')
- for i, v in ipairs(interfaceTable) do
- if i then
+ for interface, _ in pairs(interfaceTable) do
+ if interface then
return interfaceTable
end
end
@@ -141,6 +141,7 @@
local f = io.popen("cat /proc/net/dev")
if f == nil then
+ log:error('`cat /proc/net/dev` produced no results')
return interfaces
end
@@ -181,10 +182,10 @@
self:interfaces()
- for _, v in ipairs(interfaceTable) do
- if self:isWireless(v) then
- log:debug('Wireless interface found: ', v)
- return v
+ for interface, _ in pairs(interfaceTable) do
+ if self:isWireless(interface) then
+ log:debug('Wireless interface found: ', interface)
+ return interface
end
end
@@ -208,9 +209,9 @@
self:interfaces()
- for _, v in ipairs(interfaceTable) do
- if not self:isWireless(v) then
- return v
+ for interface, _ in pairs(interfaceTable) do
+ if not self:isWireless(interface) then
+ return interface
end
end
return false
@@ -246,9 +247,10 @@
if line == nil then
break
end
+
local doesWireless = string.match(line, "^(%w+)%s+")
if interface == doesWireless then
- interfaceTable[interface]['isWireless'] = true
+ interfaceTable[interface] = { isWireless = true }
f:close()
return true
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
