Author: titmuss
Date: Thu Jul 17 00:59:38 2008
New Revision: 2705
URL: http://svn.slimdevices.com?rev=2705&root=Jive&view=rev
Log:
[EMAIL PROTECTED] (orig r2696): bklaas | 2008-07-14 23:21:51 +0100
Bug: 8719
Description: use slimbrowser service "goHome" for the KEY_HOME handler in
ScreensaversApplet
[EMAIL PROTECTED] (orig r2697): bklaas | 2008-07-14 23:35:57 +0100
Bug: 8718
Description: don't consume KEY_PRESS in NowPlaying so the ScreenSaver applet
will also pick up the event and restart its timer
[EMAIL PROTECTED] (orig r2699): titmuss | 2008-07-15 12:14:18 +0100
Bug: 6684
Description:
Allow udap setup for TR and SB. This was added in SB3 fw 98 and TR fw 46.
[EMAIL PROTECTED] (orig r2704): titmuss | 2008-07-17 08:57:38 +0100
Bug: N/A
Description:
Another attempt at a portable fix for echo in Makefile.am.
Modified:
7.2/trunk/ (props changed)
7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am
7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
7.2/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Propchange: 7.2/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jul 17 00:59:38 2008
@@ -1,6 +1,6 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.0/trunk:2502
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/branches/discovery-refactor:2596
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2692
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2704
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/Makefile.am
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am?rev=2705&root=Jive&r1=2704&r2=2705&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.am Thu Jul 17 00:59:38 2008
@@ -26,9 +26,9 @@
src/version.h: FORCE
@echo '/* This file is automatically generated */' > src/version.h
- @echo -n '#define JIVE_VERSION "' >> src/version.h
- @echo -n `cat ../squeezeplay.version` >> src/version.h
- @echo -n ' r' >> src/version.h
+ @echo ${ECHO_N} '#define JIVE_VERSION "'${ECHO_C} >> src/version.h
+ @echo ${ECHO_N} `cat ../squeezeplay.version`${ECHO_C} >> src/version.h
+ @echo ${ECHO_N} ' r'${ECHO_C} >> src/version.h
@svnversion -n .. >> src/version.h
@echo '"' >> src/version.h
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in?rev=2705&root=Jive&r1=2704&r2=2705&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in (original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/Makefile.in Thu Jul 17 00:59:38 2008
@@ -2380,9 +2380,9 @@
src/version.h: FORCE
@echo '/* This file is automatically generated */' > src/version.h
- @echo -n '#define JIVE_VERSION "' >> src/version.h
- @echo -n `cat ../squeezeplay.version` >> src/version.h
- @echo -n ' r' >> src/version.h
+ @echo ${ECHO_N} '#define JIVE_VERSION "'${ECHO_C} >> src/version.h
+ @echo ${ECHO_N} `cat ../squeezeplay.version`${ECHO_C} >> src/version.h
+ @echo ${ECHO_N} ' r'${ECHO_C} >> src/version.h
@svnversion -n .. >> src/version.h
@echo '"' >> src/version.h
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua?rev=2705&root=Jive&r1=2704&r2=2705&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/NowPlaying/NowPlayingApplet.lua
Thu Jul 17 00:59:38 2008
@@ -409,7 +409,6 @@
if (keyPress == KEY_BACK and windowStyle == 'browse')
then
-- back to Home
appletManager:callService("goHome")
- return EVENT_CONSUME
elseif (keyPress == KEY_GO) then
if playlistSize == 1 then
@@ -419,7 +418,6 @@
-- show playlist
appletManager:callService("showPlaylist")
end
- return EVENT_CONSUME
end
return EVENT_UNUSED
end
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua?rev=2705&root=Jive&r1=2704&r2=2705&view=diff
==============================================================================
---
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
(original)
+++
7.2/trunk/squeezeplay/src/squeezeplay/share/applets/ScreenSavers/ScreenSaversApplet.lua
Thu Jul 17 00:59:38 2008
@@ -236,12 +236,7 @@
-- make sure when exiting a screensaver we
-- really go home.
if keycode == KEY_HOME then
- local windowStack =
Framework.windowStack
- Framework:playSound("JUMP")
- while #windowStack > 1 do
- windowStack[#windowStack -
1]:hide(Window.transitionNone)
- end
-
+ appletManager:callService("goHome")
return EVENT_CONSUME
end
end
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=2705&root=Jive&r1=2704&r2=2705&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 Thu Jul 17
00:59:38 2008
@@ -1138,7 +1138,9 @@
-- returns true if this player supports udap setup
function canUdap(self)
- return self.info.model == "receiver"
+ return self.info.model == "squeezebox2"
+ or self.info.model == "receiver"
+ or self.info.model == "transporter"
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
