Author: titmuss
Date: Mon Nov  3 06:04:46 2008
New Revision: 3254

URL: http://svn.slimdevices.com?rev=3254&root=Jive&view=rev
Log:
 [EMAIL PROTECTED] (orig r3244):  tom | 2008-10-30 17:00:57 +0000
 Support independent effect and music volume.
 [EMAIL PROTECTED] (orig r3245):  titmuss | 2008-10-30 17:07:49 +0000
 Bug: N/A
 Description:
 Clean up the player properites.
 
 
 [EMAIL PROTECTED] (orig r3247):  tom | 2008-10-30 20:22:18 +0000
 win32 compilation failed, moved var declaration to beginning of block
 [EMAIL PROTECTED] (orig r3248):  bklaas | 2008-10-31 04:17:40 +0000
 Bug: 8878
 Description: add party hat icon as a placeholder until official party mode 
icon is delivered
 
 [EMAIL PROTECTED] (orig r3249):  tom | 2008-10-31 16:37:21 +0000
 Bug 9832:
 Description: 
 Added support for fullscreen on/off (under Select Skin menu) - doesn't persist 
on restart
 [EMAIL PROTECTED] (orig r3250):  bklaas | 2008-10-31 16:59:06 +0000
 Bug: 9775
 Description: need to register setupSqueezeboxShow so setup w/an unconfigured 
receiver works
 [EMAIL PROTECTED] (orig r3251):  titmuss | 2008-10-31 23:26:32 +0000
 Bug: N/A
 Description:
 Fix crasher. It would appear with a very low latency buffer when cpu power 
saving was enabled alsa would 
 trip up and cause a spontaneous reboot.
 
 
 [EMAIL PROTECTED] (orig r3253):  bklaas | 2008-11-02 03:13:57 +0000
 Bug: 9813
 Description: updated artwork from Noah
 

Added:
    
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/icon_partyhat.png
   (with props)
Modified:
    7.4/trunk/   (props changed)
    
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/DefaultSkinApplet.lua
    
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/boom.png
    
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/controller.png
    
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/receiver.png
    
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/slimp3.png
    
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox.png
    
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox2.png
    
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/transporter.png
    
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SelectSkin/SelectSkinApplet.lua
    
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
    7.4/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
    7.4/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
    7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa.c
    7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
    7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
    
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/FullscreenSkinApplet.lua
    
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/boom.png
    
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/controller.png
    
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/receiver.png
    
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/slimp3.png
    
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox.png
    
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox2.png
    
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/transporter.png

Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Nov  3 06:04:46 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:3239
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3253
 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/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=3254&root=Jive&r1=3253&r2=3254&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
 Mon Nov  3 06:04:46 2008
@@ -56,6 +56,7 @@
 local WH_FILL                = jive.ui.WH_FILL
 
 local appletManager          = appletManager
+local jiveMain               = jiveMain
 
 
 module(..., Framework.constants)
@@ -99,7 +100,7 @@
 -- skin
 -- The meta arranges for this to be called to skin Jive.
 function skin(self, s)
-       Framework:setVideoMode(240, 320, 16, false)
+       Framework:setVideoMode(240, 320, 16, jiveMain:isFullscreen())
 
        local screenWidth, screenHeight = Framework:getScreenSize()
 
@@ -299,7 +300,7 @@
 
        -- FIXME, needs official artwork
        s.iconPlaylistModeON = _icon(41, screenHeight - 30, 
"icon_playlistMode_on.png")
-       s.iconPlaylistModePARTY = _icon(41, screenHeight - 30, 
"icon_repeat_off.png")
+       s.iconPlaylistModePARTY = _icon(41, screenHeight - 30, 
"icon_partyhat.png")
 
        -- shuffle off/shuffle album/shuffle playlist
        s.iconShuffleOFF = _icon(75, screenHeight - 30, "icon_shuffle_off.png")

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/boom.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/boom.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/controller.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/controller.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/receiver.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/receiver.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/slimp3.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/slimp3.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox2.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/squeezebox2.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/transporter.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/Icons/Players/transporter.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

Added: 
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/icon_partyhat.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/icon_partyhat.png?rev=3254&root=Jive&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/DefaultSkin/images/icon_partyhat.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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=3254&root=Jive&r1=3253&r2=3254&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
 Mon Nov  3 06:04:46 2008
@@ -28,6 +28,8 @@
 local Applet          = require("jive.Applet")
 local RadioButton     = require("jive.ui.RadioButton")
 local RadioGroup      = require("jive.ui.RadioGroup")
+local Checkbox      = require("jive.ui.Checkbox")
+
 local SimpleMenu      = require("jive.ui.SimpleMenu")
 local Window          = require("jive.ui.Window")
 local Framework       = require("jive.ui.Framework")
@@ -66,6 +68,17 @@
                        )
                })
        end
+       menu:addItem({
+               text = self:string("FULLSCREEN_MODE"),
+               icon = Checkbox(
+                       "checkbox", 
+                       function(object, isSelected)
+                               JiveMain:setFullscreen(isSelected)
+                               JiveMain:reloadSkin()
+                       end,
+                       JiveMain:isFullscreen()
+               )
+       })
 
        window:addWidget(menu)
 

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
--- 
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
 (original)
+++ 
7.4/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxMeta.lua
 Mon Nov  3 06:04:46 2008
@@ -18,6 +18,7 @@
 
 function registerApplet(meta)
        meta:registerService("startSqueezeboxSetup")
+       meta:registerService("setupSqueezeboxShow")
        meta:registerService("setupAdhocShow")
 end
 

Modified: 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/share/jive/JiveMain.lua Mon Nov  3 
06:04:46 2008
@@ -124,6 +124,7 @@
 }
 
 local _defaultSkin
+local _fullscreen
 
 -- bring us to the home menu
 local function _homeHandler(event)
@@ -358,6 +359,15 @@
 end
 
 
+function JiveMain:isFullscreen()
+       return _fullscreen
+end
+
+function JiveMain:setFullscreen(fullscreen)
+       _fullscreen = fullscreen
+end
+
+
 function JiveMain:setSelectedSkin(appletName, reload)
        log:warn(appletName)
        if _loadSkin(self, appletName, false) then

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=3254&root=Jive&r1=3253&r2=3254&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 Mon Nov  3 
06:04:46 2008
@@ -80,10 +80,31 @@
 
 
 local DEVICE_IDS = {
+       [2] = "squeezebox",
+       [3] = "softsqueeze",
        [4] = "squeezebox2",
        [5] = "transporter",
+       [6] = "softsqueeze3",
        [7] = "receiver",
+       [8] = "squeezeslave",
+       [9] = "controller",
        [10] = "boom",
+       [11] = "softboom",
+       [12] = "squeezeplay",
+}
+
+local DEVICE_TYPE = {
+       [ "squeezebox" ] = "ip2k",
+       [ "softsqueeze" ] = "softsqueeze",
+       [ "squeezebox2" ] = "ip3k",
+       [ "transporter" ] = "ip3k",
+       [ "softsqueeze3" ] = "softsqueeze",
+       [ "receiver" ] = "ip3k",
+       [ "squeezeslave" ] = "squeezeslave",
+       [ "controller" ] = "squeezeplay",
+       [ "boom" ] = "ip3k",
+       [ "softboom" ] = "softsqueeze",
+       [ "squeezeplay" ] = "squeezeplay",
 }
 
 
@@ -661,11 +682,8 @@
 =cut
 --]]
 function getMacAddress(self)
-       if self.info.model == "squeezebox2"
-               or self.info.model == "receiver"
-               or self.info.model == "transporter" 
-               or self.info.model == "boom" then
-
+       if DEVICE_TYPE[self.info.model] == "ip3k"
+          or DEVICE_TYPE[self.info.model] == "squeezeplay" then
                return string.gsub(self.id, "[^%x]", "")
        end
 
@@ -1164,19 +1182,15 @@
 
 -- returns true if this player supports udap setup
 function canUdap(self)
-       return self.info.model == "squeezebox2"
-               or self.info.model == "receiver"
-               or self.info.model == "transporter"
-               or self.info.model == "boom"
+       return DEVICE_TYPE[self.info.model] == "ip3k"
+          or DEVICE_TYPE[self.info.model] == "squeezeplay"
 end
 
 
 -- returns true if this player can connect to another server
 function canConnectToServer(self)
-       return self.info.model == "squeezebox2"
-               or self.info.model == "receiver"
-               or self.info.model == "transporter"
-               or self.info.model == "boom"
+       return DEVICE_TYPE[self.info.model] == "ip3k"
+          or DEVICE_TYPE[self.info.model] == "squeezeplay"
 end
 
 

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=3254&root=Jive&r1=3253&r2=3254&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 Mon 
Nov  3 06:04:46 2008
@@ -30,7 +30,7 @@
 //static char *device = "plughw:0,0";
 
 static snd_output_t *output;
-static snd_pcm_t *handle;
+static snd_pcm_t *handle = NULL;
 static snd_pcm_hw_params_t *hwparams;
 
 static snd_pcm_sframes_t period_size;
@@ -173,8 +173,8 @@
 static int pcm_open() {
        int err, dir;
        snd_pcm_uframes_t size;
-#define BUFFER_SIZE (8291 / 4)
-#define PERIOD_SIZE (BUFFER_SIZE / 8)
+#define BUFFER_SIZE 8192 /*(8291 / 4)*/
+#define PERIOD_SIZE (BUFFER_SIZE / 4) /*(BUFFER_SIZE / 8)*/
 
        /* Close existing pcm (if any) */
        if (handle) {

Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c 
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c Mon Nov 
 3 06:04:46 2008
@@ -165,9 +165,11 @@
                 data[3] < 0xff && data[4] < 0xff &&
                 data[6] < 0x80 && data[7] < 0x80 && data[8] < 0x80 && data[9] 
< 0x80)
         {
-                DEBUG_TRACE("ID3v2 tag detected");
+                u32_t size;
+                               
+                               DEBUG_TRACE("ID3v2 tag detected");
                 
-                u32_t size = 10 + (data[6]<<21) + (data[7]<<14) + (data[8]<<7) 
+ data[9];
+                size = 10 + (data[6]<<21) + (data[7]<<14) + (data[8]<<7) + 
data[9];
                 if (data[5] & ID3_TAG_FLAG_FOOTERPRESENT) {
                         size += 10;
                 }

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=3254&root=Jive&r1=3253&r2=3254&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 
Mon Nov  3 06:04:46 2008
@@ -9,6 +9,7 @@
 #include "common.h"
 
 #include "audio/fifo.h"
+#include "audio/fixed_math.h"
 #include "audio/mqueue.h"
 #include "audio/decode/decode.h"
 #include "audio/decode/decode_priv.h"
@@ -25,6 +26,8 @@
 /* Stream sample rate */
 static bool_t change_sample_rate;
 static u32_t stream_sample_rate;
+
+static fft_fixed lgain, rgain;
 
 
 static void decode_portaudio_openstream(void);
@@ -57,9 +60,7 @@
                memset(outputArray, 0, len);
 
                /* mix in sound effects */
-               decode_sample_mix(outputArray, len);
-
-               return paContinue;
+               goto mixin_effects;
        }
 
        fifo_lock(&decode_fifo);
@@ -74,8 +75,7 @@
                if (add_silence_ms < 2)
                        add_silence_ms = 0;
                if (!len) {
-                       fifo_unlock(&decode_fifo);
-                       return paContinue;
+                       goto unlock_mixin_effects;
                }
        }
 
@@ -96,8 +96,7 @@
                current_audio_state |= DECODE_STATE_UNDERRUN;
                memset(outputArray, 0, len);
 
-               fifo_unlock(&decode_fifo);
-               return paContinue;
+               goto unlock_mixin_effects;
        }
 
        if (bytes_used < len) {
@@ -128,7 +127,8 @@
        }
 
        while (bytes_used) {
-               size_t wrap, bytes_write;
+               size_t wrap, bytes_write, samples_write;
+               sample_t *output_ptr, *decode_ptr;
 
                wrap = fifo_bytes_until_rptr_wrap(&decode_fifo);
 
@@ -137,7 +137,15 @@
                        bytes_write = wrap;
                }
 
-               memcpy(outputArray, decode_fifo_buf + decode_fifo.rptr, 
bytes_write);
+               samples_write = BYTES_TO_SAMPLES(bytes_write);
+
+               output_ptr = (sample_t *)outputArray;
+               decode_ptr = (sample_t *)(decode_fifo_buf + decode_fifo.rptr);
+               while (samples_write--) {
+                       *(output_ptr++) = fixed_mul(lgain, *(decode_ptr++));
+                       *(output_ptr++) = fixed_mul(rgain, *(decode_ptr++));
+               }
+
                fifo_rptr_incby(&decode_fifo, bytes_write);
                decode_elapsed_samples += BYTES_TO_SAMPLES(bytes_write);
 
@@ -148,12 +156,15 @@
        reached_start_point = decode_check_start_point();
        if (reached_start_point && current_sample_rate != stream_sample_rate) {
                change_sample_rate = true;
-
-               fifo_unlock(&decode_fifo);
-               return paComplete;
-       }
-
+       }
+
+ unlock_mixin_effects:
        fifo_unlock(&decode_fifo);
+
+ mixin_effects:
+       /* mix in sound effects */
+       decode_sample_mix(outputBuffer, SAMPLES_TO_BYTES(framesPerBuffer));
+
        return paContinue;
 }
 
@@ -299,9 +310,10 @@
 }
 
 
-static void decode_portaudio_gain(s32_t lgain, s32_t rgain)
+static void decode_portaudio_gain(s32_t left_gain, s32_t right_gain)
 {
-       printf("fixme gain %d,%d\n", lgain, rgain);
+       lgain = left_gain;
+       rgain = right_gain;
 }
 
 

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=3254&root=Jive&r1=3253&r2=3254&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
 Mon Nov  3 06:04:46 2008
@@ -58,6 +58,7 @@
 local WH_FILL                = jive.ui.WH_FILL
 
 local appletManager          = appletManager
+local jiveMain               = jiveMain
 
 
 module(...)
@@ -115,8 +116,8 @@
 -- skin
 -- The meta arranges for this to be called to skin Jive.
 function skin(self, s)
-       Framework:setVideoMode(800, 600, 32, false)
-
+       Framework:setVideoMode(800, 600, 32, jiveMain:isFullscreen())
+       
        local screenWidth, screenHeight = Framework:getScreenSize()
 
        -- Images and Tiles

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/boom.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/boom.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/controller.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/controller.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/receiver.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/receiver.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/slimp3.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/slimp3.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox2.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/squeezebox2.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/transporter.png
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/FullscreenSkin/images/Icons/Players/transporter.png?rev=3254&root=Jive&r1=3253&r2=3254&view=diff
==============================================================================
Binary files - no diff available.

_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins

Reply via email to