Author: ayoung
Date: Fri Jul 2 03:04:26 2010
New Revision: 8924
URL: http://svn.slimdevices.com/jive?rev=8924&view=rev
Log:
Get rid of party and playlist modes,
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua?rev=8924&r1=8923&r2=8924&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/QVGAbaseSkin/QVGAbaseSkinApplet.lua
Fri Jul 2 03:04:26 2010
@@ -2294,14 +2294,6 @@
img = false,
})
- -- XXX: these two can probably be removed after party mode is fully
dead and buried
- s.button_playlist_mode_ON = _uses(s._button_repeat, {
- img = false,
- })
- s.button_playlist_mode_PARTY = _uses(s._button_repeat, {
- img = false,
- })
-
s._button_shuffle = _uses(s._iconbar_icon)
s.button_shuffle_OFF = _uses(s._button_shuffle, {
img = false,
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua?rev=8924&r1=8923&r2=8924&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/SlimBrowser/SlimBrowserApplet.lua
Fri Jul 2 03:04:26 2010
@@ -1733,6 +1733,7 @@
["play"] = "playAction",
["play-hold"] = "playHoldAction",
["add"] = "addAction",
+ ["go"] = "goAction",
}
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=8924&r1=8923&r2=8924&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Fri Jul 2
03:04:26 2010
@@ -1148,16 +1148,8 @@
iconbar:setAlarm('OFF')
end
- -- set the playlist mode (nil, 0=off, 1=playlist, 2=party)
- if self.state['playlist mode'] and
- ( self.state['playlist mode'] == 'disabled' or
self.state['playlist mode'] == 'off' or self.state['playlist mode'] ==
json.null )
- then
- iconbar:setPlaylistMode('off')
- iconbar:setRepeat(self.state["playlist repeat"])
- else
- iconbar:setRepeat(0)
- iconbar:setPlaylistMode(self.state["playlist mode"])
- end
+ iconbar:setRepeat(0)
+ iconbar:setPlaylistMode(nil)
--[[ useful for layout skinning debug, set all modes to show
icons
iconbar:setPlaymode('play')
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
