Author: titmuss
Date: Wed Oct 15 08:23:13 2008
New Revision: 3139
URL: http://svn.slimdevices.com?rev=3139&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r3129): bklaas | 2008-10-14 22:16:14 +0100
Bug: n/a
Description: add progress bar back to FullscreenSkin applet
split elapsed and remaining for NowPlaying into different elements of the skin
so they can be laid out differently
use existing sliderBar and sliderBackground defined earlier in the skin,
rather than redundant progressBar and progressBackground
[EMAIL PROTECTED] (orig r3131): titmuss | 2008-10-14 22:48:57 +0100
Bug: N/A
Description:
Fix cpu alignment fault.
[EMAIL PROTECTED] (orig r3134): awy | 2008-10-15 13:07:21 +0100
Handle start-jiffies.
Use ms interval rather than bytes for pause-for so that same code can be
reused for start-jiffies, when the current frame-rate is not yet known.
[EMAIL PROTECTED] (orig r3135): bklaas | 2008-10-15 14:22:20 +0100
Bug: n/a
Description: Working left arrow on NowPlaying and current playlist windows in
FullscreenSkin without affecting DefaultSkin
Layout fix for title bar in NowPlaying
[EMAIL PROTECTED] (orig r3136): bklaas | 2008-10-15 14:31:47 +0100
Bug: 9679
Description: this workaround exposes the "pulsating" artwork bug, which is an
improvement over the full crash without it.
[EMAIL PROTECTED] (orig r3137): bklaas | 2008-10-15 14:44:18 +0100
Bug: n/a
Description: allow optional duration parameter (in milliseconds) to be sent by
showBriefly from SC
[EMAIL PROTECTED] (orig r3138): bklaas | 2008-10-15 15:30:26 +0100
Bug: 9679
Description: fixed, or at least worked around, "pulsating" artwork issue in
fullscreen skin by fixing icon.h and icon.w at 125 pixels
layout tweaks for NowPlaying screen
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi.ko
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h
7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Oct 15 08:23:13 2008
@@ -2,7 +2,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
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/trunk:3126
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3138
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/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi.ko
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeos/poky/meta-squeezeos/packages/marvell-88W8686/files/gspi.ko?rev=3139&root=Jive&r1=3138&r2=3139&view=diff
==============================================================================
Binary files - no diff available.
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua?rev=3139&root=Jive&r1=3138&r2=3139&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
Wed Oct 15 08:23:13 2008
@@ -339,8 +339,8 @@
s.title.position = LAYOUT_NORTH
s.title.bgImg = titleBox
--FIXME: bug 8866
- --s.title.order = { "back", "text" }
- s.title.order = { "text" }
+ s.title.order = { "back", "text" }
+ --s.title.order = { "text" }
s.title.text = {}
s.title.text.padding = { 10, 8, 8, 8 }
s.title.text.align = "top-left"
@@ -1578,7 +1578,7 @@
s.ssnptitle.border = { 4, 4, 4, 0 }
s.ssnptitle.position = LAYOUT_NORTH
s.ssnptitle.bgImg = nptitleBox
- s.ssnptitle.order = { "title", "playlist" }
+ s.ssnptitle.order = { "text", "playlist" }
s.ssnptitle.text = {}
s.ssnptitle.text.w = WH_FILL
s.ssnptitle.text.padding = { 10, 7, 10, 9 }
@@ -1643,36 +1643,27 @@
s.browsenpartwork = _uses(s.ssnpartwork, browsenpartwork)
-- Progress bar
- local progressBackground =
- Tile:loadHTiles({
- imgpath ..
"Screen_Formats/Song_Progress_Bar/SP_Bar_Remote/rem_progbar_bkgrd_l.png",
- imgpath ..
"Screen_Formats/Song_Progress_Bar/SP_Bar_Remote/rem_progbar_bkgrd.png",
- imgpath ..
"Screen_Formats/Song_Progress_Bar/SP_Bar_Remote/rem_progbar_bkgrd_r.png",
- })
-
- local progressBar =
- Tile:loadHTiles({
- imgpath ..
"Screen_Formats/Song_Progress_Bar/SP_Bar_Remote/rem_progbar_fill_l.png",
- imgpath ..
"Screen_Formats/Song_Progress_Bar/SP_Bar_Remote/rem_progbar_fill.png",
- imgpath ..
"Screen_Formats/Song_Progress_Bar/SP_Bar_Remote/rem_progbar_fill_r.png",
- })
-
s.ssprogress = {}
s.ssprogress.position = LAYOUT_SOUTH
s.ssprogress.order = { "elapsed", "slider", "remain" }
- s.ssprogress.text = {}
- s.ssprogress.text.w = 50
+
+ s.ssprogress.remain = {}
+ s.ssprogress.remain.w = 50
s.ssprogress.padding = { 8, 0, 8, 5 }
- s.ssprogress.text.padding = { 8, 0, 0, 5 }
- s.ssprogress.text.font = Font:load(fontpath .. "FreeSansBold.ttf", 12)
- s.ssprogress.text.fg = { 0xe7,0xe7, 0xe7 }
- s.ssprogress.text.sh = { 0x37, 0x37, 0x37 }
+ s.ssprogress.remain.padding = { 8, 0, 0, 5 }
+ s.ssprogress.remain.font = Font:load(fontpath .. "FreeSansBold.ttf", 12)
+ s.ssprogress.remain.fg = { 0xe7,0xe7, 0xe7 }
+ s.ssprogress.remain.sh = { 0x37, 0x37, 0x37 }
+ s.ssprogress.elapsed = _uses(s.ssprogress.remain)
-- browse has different positioning than ss windowStyle
s.browseprogress = _uses(s.ssprogress,
{
padding = { 8, 0, 8, 25 },
- text = {
+ elapsed = {
+ padding = { 8, 0, 0, 25 }
+ },
+ remain = {
padding = { 8, 0, 0, 25 }
}
}
@@ -1680,8 +1671,8 @@
s.ssprogressB = {}
s.ssprogressB.horizontal = 1
- s.ssprogressB.bgImg = progressBackground
- s.ssprogressB.img = progressBar
+ s.ssprogressB.bgImg = sliderBackground
+ s.ssprogressB.img = sliderBar
s.ssprogressB.position = LAYOUT_SOUTH
s.ssprogressB.padding = { 0, 0, 0, 5 }
@@ -1695,19 +1686,19 @@
s.ssprogressNB = {}
s.ssprogressNB.position = LAYOUT_SOUTH
s.ssprogressNB.order = { "elapsed" }
- s.ssprogressNB.text = {}
- s.ssprogressNB.text.w = WH_FILL
- s.ssprogressNB.text.align = "center"
+ s.ssprogressNB.elapsed = {}
+ s.ssprogressNB.elapsed.w = WH_FILL
+ s.ssprogressNB.elapsed.align = "center"
s.ssprogressNB.padding = { 0, 0, 0, 5 }
- s.ssprogressNB.text.padding = { 0, 0, 0, 5 }
- s.ssprogressNB.text.font = Font:load(fontpath .. "FreeSansBold.ttf", 12)
- s.ssprogressNB.text.fg = { 0xe7, 0xe7, 0xe7 }
- s.ssprogressNB.text.sh = { 0x37, 0x37, 0x37 }
+ s.ssprogressNB.elapsed.padding = { 0, 0, 0, 5 }
+ s.ssprogressNB.elapsed.font = Font:load(fontpath .. "FreeSansBold.ttf",
12)
+ s.ssprogressNB.elapsed.fg = { 0xe7, 0xe7, 0xe7 }
+ s.ssprogressNB.elapsed.sh = { 0x37, 0x37, 0x37 }
s.browseprogressNB = _uses(s.ssprogressNB,
{
padding = { 0, 0, 0, 25 },
- text = {
+ elapsed = {
padding = { 0, 0, 0, 25 },
}
}
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua?rev=3139&root=Jive&r1=3138&r2=3139&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
Wed Oct 15 08:23:13 2008
@@ -10,6 +10,7 @@
local Font = require("jive.ui.Font")
local Framework = require("jive.ui.Framework")
local Icon = require("jive.ui.Icon")
+local Button = require("jive.ui.Button")
local Choice = require("jive.ui.Choice")
local Label = require("jive.ui.Label")
local Group = require("jive.ui.Group")
@@ -148,17 +149,17 @@
-- hide this window if the player is turned off
if not power then
if self['browse'] and self['browse'].window then
- self['browse'].titleGroup:setWidgetValue("title",
self:string(modeTokens['off']))
+ self['browse'].titleGroup:setWidgetValue("text",
self:string(modeTokens['off']))
end
if self['ss'] and self['ss'].window then
- self['ss'].titleGroup:setWidgetValue("title",
self:string(modeTokens['off']))
+ self['ss'].titleGroup:setWidgetValue("text",
self:string(modeTokens['off']))
end
else
if self['browse'] and self['browse'].window then
- self['browse'].titleGroup:setWidgetValue("title",
self:string(modeTokens[mode]))
+ self['browse'].titleGroup:setWidgetValue("text",
self:string(modeTokens[mode]))
end
if self['ss'] and self['ss'].window then
- self['ss'].titleGroup:setWidgetValue("title",
self:string(modeTokens[mode]))
+ self['ss'].titleGroup:setWidgetValue("text",
self:string(modeTokens[mode]))
end
end
end
@@ -385,7 +386,7 @@
token = 'off'
end
if ws.titleGroup then
- ws.titleGroup:setWidgetValue("title",
self:string(modeTokens[token]))
+ ws.titleGroup:setWidgetValue("text",
self:string(modeTokens[token]))
end
end
@@ -465,15 +466,24 @@
progress = "progress",
progressNB = "progressNB",
npartwork = "npartwork"
- }
+ }
+
for k, v in pairs(components) do
local new = windowStyle .. v
components[k] = new
end
+
self[windowStyle].titleGroup = Group(components.nptitle, {
- title = Label("text",
self:string("SCREENSAVER_NOWPLAYING")),
- playlist = Label("playlist", "")
- })
+ back = Button(
+ Icon("back"),
+ function()
+
window:dispatchNewEvent(EVENT_KEY_PRESS, KEY_BACK)
+ return EVENT_CONSUME
+ end
+ ),
+ text = Label("text", self:string("SCREENSAVER_NOWPLAYING")),
+ playlist = Label("playlist", "")
+ })
self[windowStyle].trackGroup = Group(components.nptrack, {
@@ -486,9 +496,9 @@
self[windowStyle].progressSlider:addTimer(1000, function()
self:_updatePosition() end)
self[windowStyle].progressGroup = Group(components.progress, {
- elapsed = Label("text", ""),
+ elapsed = Label("elapsed", ""),
slider =
self[windowStyle].progressSlider,
- remain = Label("text", "")
+ remain = Label("remain", "")
})
else
self[windowStyle].progressGroup = Group(components.progressNB, {
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinApplet.lua?rev=3139&root=Jive&r1=3138&r2=3139&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinApplet.lua
Wed Oct 15 08:23:13 2008
@@ -18,7 +18,7 @@
-- stuff we use
-local pairs = pairs
+local pairs, type = pairs, type
local table = require("table")
@@ -81,7 +81,6 @@
return window
end
-
--[[
=head1 LICENSE
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=3139&root=Jive&r1=3138&r2=3139&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Wed Oct 15 08:23:13 2008
@@ -2066,7 +2066,6 @@
if not _player:isPowerOn() then
_statusStep.window:setTitle(_string(modeTokens['off']))
- _statusStep.window:setTitleStyle("currentplaylisttitle")
end
if playlistSize == 0 then
@@ -2132,7 +2131,6 @@
if not power then
if step.window then
step.window:setTitle(_string("SLIMBROWSER_OFF"))
-
step.window:setTitleStyle("currentplaylisttitle")
end
else
if step.window then
@@ -2140,7 +2138,6 @@
step.window:replace(emptyStep.window,
Window.transitionFadeIn)
end
step.window:setTitle(_string(modeTokens[mode]))
-
step.window:setTitleStyle("currentplaylisttitle")
end
end
end
@@ -2158,8 +2155,7 @@
token = 'off'
end
- local newTitleWidget = Group('currentplaylisttitle', { text =
Label("text", _string(modeTokens[token])), icon = Icon("icon") })
- step.window:setTitleWidget(newTitleWidget)
+ step.window:setTitle(_string(modeTokens[token]))
end
@@ -2312,7 +2308,8 @@
window = {
["menuStyle"] = "album",
}
- }
+ },
+ 'currentplaylist'
),
_statusSink
)
@@ -2333,7 +2330,6 @@
if not _player:isPowerOn() then
if _statusStep.window then
_statusStep.window:setTitle(_string("SLIMBROWSER_OFF"))
- _statusStep.window:setTitleStyle("currentplaylisttitle")
end
end
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=3139&root=Jive&r1=3138&r2=3139&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Wed Oct 15
08:23:13 2008
@@ -918,7 +918,8 @@
s.artIcon:setValue(nil)
s.textarea:setValue(textValue)
end
- s.window:showBriefly(3000, nil, Window.transitionPushPopupUp,
Window.transitionPushPopupDown)
+ local duration = display['duration'] or 3000
+ s.window:showBriefly(duration, nil,
Window.transitionPushPopupUp, Window.transitionPushPopupDown)
end
end
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c?rev=3139&root=Jive&r1=3138&r2=3139&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c Wed Oct 15
08:23:13 2008
@@ -36,7 +36,7 @@
bool_t decode_first_buffer = FALSE;
u32_t current_sample_rate = 44100;
size_t skip_ahead_bytes = 0;
-size_t add_silence_bytes = 0;
+int add_silence_ms = 0;
/* decoder fifo used to store decoded samples */
@@ -76,16 +76,22 @@
static void decode_resume_handler(void) {
- Uint32 start_jiffies;
-
- start_jiffies = mqueue_read_u32(&decode_mqueue);
+ int start_interval;
+
+ start_interval = mqueue_read_u32(&decode_mqueue) - SDL_GetTicks();
mqueue_read_complete(&decode_mqueue);
-
- DEBUG_TRACE("decode_resume_handler start_jiffies=%d", start_jiffies);
+
+ if (start_interval < 0) {
+ start_interval = 0;
+ }
+
+ DEBUG_TRACE("decode_resume_handler start_interval=%d", start_interval);
fifo_lock(&decode_fifo);
- // XXXX handle start_jiffies
+ if (start_interval) {
+ add_silence_ms = start_interval;
+ }
if (decoder) {
current_decoder_state |= DECODE_STATE_RUNNING;
@@ -111,7 +117,7 @@
DEBUG_TRACE("decode_pause_handler interval=%d", interval);
if (interval) {
- add_silence_bytes = SAMPLES_TO_BYTES((u32_t)((interval *
current_sample_rate) / 1000));
+ add_silence_ms = interval;
} else {
current_decoder_state &= ~DECODE_STATE_RUNNING;
current_audio_state &= ~DECODE_STATE_RUNNING;
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c?rev=3139&root=Jive&r1=3138&r2=3139&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c Wed
Oct 15 08:23:13 2008
@@ -61,13 +61,15 @@
return;
}
- if (add_silence_bytes) {
- add_bytes = add_silence_bytes;
+ if (add_silence_ms) {
+ add_bytes = SAMPLES_TO_BYTES((u32_t)((add_silence_ms *
current_sample_rate) / 1000));
if (add_bytes > len) add_bytes = len;
memset(outputBuffer, 0, add_bytes);
outputBuffer += add_bytes;
len -= add_bytes;
- add_silence_bytes -= add_bytes;
+ add_silence_ms -= (BYTES_TO_SAMPLES(add_bytes) * 1000) /
current_sample_rate;
+ if (add_silence_ms < 2)
+ add_silence_ms = 0;
if (!len) return;
}
Modified:
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c?rev=3139&root=Jive&r1=3138&r2=3139&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
Wed Oct 15 08:23:13 2008
@@ -64,13 +64,15 @@
fifo_lock(&decode_fifo);
- if (add_silence_bytes) {
- add_bytes = add_silence_bytes;
+ if (add_silence_ms) {
+ add_bytes = SAMPLES_TO_BYTES((u32_t)((add_silence_ms *
current_sample_rate) / 1000));
if (add_bytes > len) add_bytes = len;
memset(outputArray, 0, add_bytes);
outputArray += add_bytes;
len -= add_bytes;
- add_silence_bytes -= add_bytes;
+ add_silence_ms -= (BYTES_TO_SAMPLES(add_bytes) * 1000) /
current_sample_rate;
+ if (add_silence_ms < 2)
+ add_silence_ms = 0;
if (!len) {
fifo_unlock(&decode_fifo);
return paContinue;
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h?rev=3139&root=Jive&r1=3138&r2=3139&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h Wed
Oct 15 08:23:13 2008
@@ -123,7 +123,7 @@
extern bool_t decode_first_buffer;
extern u32_t current_sample_rate;
extern size_t skip_ahead_bytes;
-extern size_t add_silence_bytes;
+extern int add_silence_ms;
/* The fifo used to store decoded samples */
extern u8_t decode_fifo_buf[DECODE_FIFO_SIZE];
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c?rev=3139&root=Jive&r1=3138&r2=3139&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/ui/jive_window.c Wed Oct 15
08:23:13 2008
@@ -73,6 +73,7 @@
/* stack is:
* 1: widget
*/
+ int safty = 5;
WindowWidget *peer = jive_getpeer(L, 1, &windowPeerMeta);
@@ -90,7 +91,7 @@
}
lua_pop(L, 1);
- while (peer->w.child_origin != jive_origin) {
+ while (peer->w.child_origin != jive_origin && --safty > 0) {
#if 0
/* debugging */
jive_getmethod(L, 1, "dump");
Modified:
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua?rev=3139&root=Jive&r1=3138&r2=3139&view=diff
==============================================================================
---
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
(original)
+++
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
Wed Oct 15 08:23:13 2008
@@ -69,6 +69,7 @@
local sndpath = "applets/FullscreenSkin/sounds/"
local fontpath = "fonts/"
local FONT_NAME = "FreeSans"
+local FIXED_FONT_NAME = "FreeMono"
local BOLD_PREFIX = "Bold"
-- define a local function to make it easier to create icons.
@@ -933,11 +934,12 @@
s.albumitem.text.fg = TEXT_COLOR
s.albumitem.text.sh = TEXT_SH_COLOR
s.albumitem.icon = {}
- s.albumitem.icon.h = WH_FILL
+ s.albumitem.icon.h = 125
+ s.albumitem.icon.w = 125
s.albumitem.icon.align = "left"
--FIXME, this path likely needs changing
s.albumitem.icon.img = Surface:loadImage(imgpath ..
"menu_album_noartwork_125.png")
- s.albumitem.icon.padding = 0
+ s.albumitem.icon.padding = { 0, 5, 0, 0}
-- checked albummenu item
s.albumchecked =
@@ -1424,8 +1426,6 @@
-- one for the Screensaver windowStyle (ss), one for the browse
windowStyle (browse)
-- a lot of it can be recycled from one to the other
- local npimgpath = "applets/NowPlaying/"
-
local screenWidth, screenHeight = Framework:getScreenSize()
local TEXT_COLOR = { 0xE7, 0xE7, 0xE7 }
@@ -1436,7 +1436,25 @@
-- Title
- s.ssnptitle = _uses(s.title)
+ --s.ssnptitle = _uses(s.minititle)
+
+ -- Title
+ s.ssnptitle = {}
+
+ setmetatable(s.ssnptitle, { __index = s.title })
+
+ s.ssnptitle.order = { "back", "text", "playlist" }
+
+ s.ssnptitle.back = {}
+ s.ssnptitle.back.img = Surface:loadImage(imgpath ..
"pointer_selector_L.png")
+ s.ssnptitle.back.align = "left"
+
+ s.ssnptitle.playlist = {}
+ s.ssnptitle.playlist.padding = TITLE_PADDING
+ s.ssnptitle.playlist.font = _font(26)
+ s.ssnptitle.playlist.fg = TEXT_COLOR_BLACK
+ s.ssnptitle.playlist.text = {}
+ s.ssnptitle.playlist.text.align = "top-right"
-- nptitle style is the same for both windowStyles
s.browsenptitle = _uses(s.ssnptitle)
@@ -1446,7 +1464,7 @@
s.ssnptrack.border = { 4, 0, 4, 0 }
s.ssnptrack.text = {}
s.ssnptrack.text.w = WH_FILL
- s.ssnptrack.text.padding = { 20, 10, 20, 10 }
+ s.ssnptrack.text.padding = { 20, 0, 20, 0 }
s.ssnptrack.text.align = "center"
s.ssnptrack.text.font = _font(TRACK_FONT_SIZE)
s.ssnptrack.text.lineHeight = TRACK_FONT_SIZE + 4
@@ -1514,78 +1532,50 @@
--]]
---[[ leave this around in case it can be re-engineered for the
"mouse-toast-controls"
-- Progress bar
- local progressBackground =
- Tile:loadHTiles({
- npimgpath .. "progressbar_bkgrd_l.png",
- npimgpath .. "progressbar_bkgrd.png",
- npimgpath .. "progressbar_bkgrd_r.png",
- })
-
- local progressBar =
- Tile:loadHTiles({
- npimgpath .. "progressbar_fill_l.png",
- npimgpath .. "progressbar_fill.png",
- npimgpath .. "progressbar_fill_r.png",
- })
-
s.ssprogress = {}
s.ssprogress.position = LAYOUT_SOUTH
s.ssprogress.order = { "elapsed", "slider", "remain" }
- s.ssprogress.text = {}
- s.ssprogress.text.w = 50
- s.ssprogress.padding = { 0, 0, 0, 5 }
- s.ssprogress.text.padding = { 8, 0, 8, 5 }
- s.ssprogress.text.font = Font:load(fontpath .. "FreeSansBold.ttf", 12)
- s.ssprogress.text.fg = { 0xe7,0xe7, 0xe7 }
- s.ssprogress.text.sh = { 0x37, 0x37, 0x37 }
+ s.ssprogress.remain = {}
+ s.ssprogress.remain.w = 200
+ --s.ssprogress.text.w = 100
+
+ s.ssprogress.padding = { 25, 0, 25, 60 }
+ s.ssprogress.remain.padding = { 35, 0, 8, 60 }
+ s.ssprogress.remain.font = _boldfont(24)
+ s.ssprogress.remain.fg = { 0xe7,0xe7, 0xe7 }
+ s.ssprogress.remain.sh = { 0x37, 0x37, 0x37 }
+
+ s.ssprogress.elapsed = _uses(s.ssprogress.remain, {
+ padding = { 100, 0, 8, 60 }
+ })
-- browse has different positioning than ss windowStyle
- s.browseprogress = _uses(s.ssprogress,
- {
- padding = { 0, 0, 0, 25 },
- text = {
- padding = { 8, 0, 8, 25 },
- }
- }
- )
+ s.browseprogress = _uses(s.ssprogress)
s.ssprogressB = {}
s.ssprogressB.horizontal = 1
- s.ssprogressB.bgImg = progressBackground
- s.ssprogressB.img = progressBar
+ s.ssprogressB.bgImg = sliderBackground
+ s.ssprogressB.img = sliderBar
s.ssprogressB.position = LAYOUT_SOUTH
- s.ssprogressB.padding = { 0, 0, 0, 5 }
-
- s.browseprogressB = _uses(s.ssprogressB,
- {
- padding = { 0, 0, 0, 25 }
- }
- )
+ s.ssprogressB.padding = { 0, 0, 0, 60 }
+
+ s.browseprogressB = _uses(s.ssprogressB)
-- special style for when there shouldn't be a progress bar (e.g.,
internet radio streams)
s.ssprogressNB = {}
s.ssprogressNB.position = LAYOUT_SOUTH
s.ssprogressNB.order = { "elapsed" }
- s.ssprogressNB.text = {}
- s.ssprogressNB.text.w = WH_FILL
- s.ssprogressNB.text.align = "center"
- s.ssprogressNB.padding = { 0, 0, 0, 5 }
- s.ssprogressNB.text.padding = { 0, 0, 0, 5 }
- s.ssprogressNB.text.font = Font:load(fontpath .. "FreeSansBold.ttf", 12)
- s.ssprogressNB.text.fg = { 0xe7, 0xe7, 0xe7 }
- s.ssprogressNB.text.sh = { 0x37, 0x37, 0x37 }
-
- s.browseprogressNB = _uses(s.ssprogressNB,
- {
- padding = { 0, 0, 0, 25 },
- text = {
- padding = { 0, 0, 0, 25 },
- }
- }
- )
---]]
+ s.ssprogressNB.elapsed = {}
+ s.ssprogressNB.elapsed.w = WH_FILL
+ s.ssprogressNB.elapsed.align = "center"
+ s.ssprogressNB.padding = { 0, 0, 0, 25 }
+ s.ssprogressNB.elapsed.padding = { 0, 0, 0, 25 }
+ s.ssprogressNB.elapsed.font = _boldfont(24)
+ s.ssprogressNB.elapsed.fg = { 0xe7, 0xe7, 0xe7 }
+ s.ssprogressNB.elapsed.sh = { 0x37, 0x37, 0x37 }
+
+ s.browseprogressNB = _uses(s.ssprogressNB)
-- background style should start at x,y = 0,0
s.iconbg = {}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
