Author: bklaas
Date: Fri May 14 07:42:33 2010
New Revision: 8769
URL: http://svn.slimdevices.com/jive?rev=8769&view=rev
Log:
r39...@daddymac-520 (orig r8761): bklaas | 2010-04-30 14:19:09 -0500
Bug: n/a
Description: add search to the list of potential shortcuts
r39...@daddymac-520 (orig r8763): ayoung | 2010-05-05 15:35:05 -0500
bug 15361: Can't play 24/48 or 24/96 flac without stutter and rebuffering
Implement outputThreshold
r39...@daddymac-520 (orig r8765): mherger | 2010-05-10 09:33:59 -0500
Bug: n/a
Description: remove some mis-translated strings
r39...@daddymac-520 (orig r8766): bklaas | 2010-05-10 14:19:07 -0500
Bug: 15827
Description: add Software Update menu item on media that contain firmware
files at top level of directory
Modified:
7.6/trunk/ (props changed)
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/ShortcutsApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/strings.txt
7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c
7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa_backend.c
7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Propchange: 7.6/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri May 14 07:42:33 2010
@@ -13,7 +13,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/fab4-skin:4552
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/private-branches/new-alsa:6567
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:8423
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8757
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.5/trunk:8766
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.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/ShortcutsApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/ShortcutsApplet.lua?rev=8769&r1=8768&r2=8769&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/ShortcutsApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/ShortcutsApplet.lua
Fri May 14 07:42:33 2010
@@ -90,6 +90,7 @@
-- ["8"] = {text = "8", offerOn = {"ir"},
weight = 90},
-- ["9"] = {text = "9", offerOn = {"ir"},
weight = 90},
["text_mode"] = {text =
self:string("SHORTCUTS_OUTPUT_TEXT_MODE", 6), offerOn = {"touch", "ir",
"keys"}, weight = 94},
+ ["go_search"] = {text =
self:string("SHORTCUTS_OUTPUT_SEARCH", 6), offerOn = {"touch", "ir", "keys"},
weight = 94},
}
if System:hasTouch() then
self.outputActionMap["power"] = {text =
self:string("SHORTCUTS_OUTPUT_POWER"), offerOn = {"touch", "touchPrimary",
"ir", "keys"}, weight = 60}
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/strings.txt
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/strings.txt?rev=8769&r1=8768&r2=8769&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/strings.txt
(original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/share/applets/Shortcuts/strings.txt
Fri May 14 07:42:33 2010
@@ -625,3 +625,18 @@
RU ÐадаÑÑ Ð¿ÑедÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ %s
SV Ställ in förinställning %s
+SHORTCUTS_OUTPUT_SEARCH
+ CS Vyhledat
+ DA Søg
+ DE Suchen
+ EN Search
+ ES Buscar
+ FI Etsi
+ FR Recherche
+ IT Ricerca
+ NL Zoeken
+ NO Søk
+ PL Szukaj
+ RU ÐоиÑк
+ SV Sök
+
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c?rev=8769&r1=8768&r2=8769&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c (original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode.c Fri May 14
07:42:33 2010
@@ -275,7 +275,6 @@
LOG_INFO(log_audio_decode, "init decoder %s", decoder->name);
decode_first_buffer = TRUE;
- // XXXX decode_set_output_threshold(output_threshold);
decode_output_set_transition(transition_type, transition_period);
decode_output_set_track_gain(replay_gain);
decode_set_track_polarity_inversion(polarity_inversion);
@@ -283,6 +282,7 @@
decoder_data = decoder->start(params, num_params);
decode_audio_lock();
+ decode_audio->output_threshold = output_threshold;
decode_output_begin();
decode_audio_unlock();
}
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa_backend.c
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa_backend.c?rev=8769&r1=8768&r2=8769&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa_backend.c
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_alsa_backend.c
Fri May 14 07:42:33 2010
@@ -277,7 +277,11 @@
decode_frames = BYTES_TO_SAMPLES(fifo_bytes_used(&decode_audio->fifo));
/* Should we start the audio now based on having enough decoded data? */
- if (decode_audio->state & DECODE_STATE_AUTOSTART && decode_frames >
(output_frames * (3 + state->period_count))) {
+ if (decode_audio->state & DECODE_STATE_AUTOSTART
+ && decode_frames > (output_frames * (3 +
state->period_count))
+ && decode_frames > (decode_audio->output_threshold *
state->pcm_sample_rate / 10)
+ )
+ {
decode_audio->state &= ~DECODE_STATE_AUTOSTART;
decode_audio->state |= DECODE_STATE_RUNNING;
}
Modified:
7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c?rev=8769&r1=8768&r2=8769&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
(original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
Fri May 14 07:42:33 2010
@@ -57,7 +57,11 @@
bytes_used = fifo_bytes_used(&decode_audio->fifo);
/* Should we start the audio now based on having enough decoded data? */
- if (decode_audio->state & DECODE_STATE_AUTOSTART && bytes_used >= len)
{
+ if (decode_audio->state & DECODE_STATE_AUTOSTART
+ && bytes_used >= len
+ && bytes_used >=
SAMPLES_TO_BYTES((u32_t)((decode_audio->output_threshold * stream_sample_rate)
/ 10))
+ )
+ {
decode_audio->state &= ~DECODE_STATE_AUTOSTART;
decode_audio->state |= DECODE_STATE_RUNNING;
}
Modified: 7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h?rev=8769&r1=8768&r2=8769&view=diff
==============================================================================
--- 7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h
(original)
+++ 7.6/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h Fri
May 14 07:42:33 2010
@@ -119,6 +119,8 @@
s32_t capture_lgain, capture_rgain;
u32_t set_sample_rate;
+ u32_t output_threshold; /* tenths of a second */
+
u32_t sync_elapsed_samples;
u32_t sync_elapsed_timestamp;
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt?rev=8769&r1=8768&r2=8769&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/strings.txt
Fri May 14 07:42:33 2010
@@ -696,18 +696,14 @@
POWER
#SLT: This is "power" as in "power supply"
CS NapájenÃ
- DA Tænd/sluk
- DE Ein/Aus
EN Power
ES Encendido
FI Virta
FR Mise sous tension
IT Accensione
NL Voeding
- NO Av/på
PL Zasilanie
RU ÐиÑание
- SV Av/på
MSP_VERSION
CS MSP verze\n%s
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua?rev=8769&r1=8768&r2=8769&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeApplet.lua
Fri May 14 07:42:33 2010
@@ -157,6 +157,29 @@
end
+function mmFindFirmware(self, devName)
+ local upgradePresent = false
+ local path = MEDIA_PATH .. devName .. "/"
+ local machine = System:getMachine()
+
+ local attrs = lfs.attributes(path)
+ if attrs and attrs.mode == "directory" then
+ for entry in lfs.dir(path) do
+ local url = "file:" .. path .. entry
+ local version = self:_firmwareVersion(url)
+
+ if version or entry == machine .. ".bin" then
+ log:info('Firmware update detected on ', path)
+ upgradePresent = true
+ break
+ end
+ end
+ end
+
+ return upgradePresent
+end
+
+
function _helpString(self, upgrade)
local helpString = upgrade.help
if not helpString then
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua?rev=8769&r1=8768&r2=8769&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/SetupFirmwareUpgrade/SetupFirmwareUpgradeMeta.lua
Fri May 14 07:42:33 2010
@@ -28,6 +28,7 @@
meta:registerService("firmwareUpgrade")
meta:registerService("showFirmwareUpgradeMenu")
meta:registerService("wasFirmwareUpgraded")
+ meta:registerService("mmFindFirmware")
-- check for firmware upgrades when we connect to a new player
-- we don't want the firmware upgrade applets always loaded so
@@ -38,6 +39,15 @@
function configureApplet(meta)
appletManager:callService("wasFirmwareUpgraded")
+ -- software update should be a media manager menu item when applicable
+ appletManager:callService("mmRegisterMenuItem",
+ {
+ serviceMethod = "showFirmwareUpgradeMenu",
+ menuText = meta:string("UPDATE"),
+ onlyIfTrue = "mmFindFirmware",
+ weight = 100, -- default is 50, so this
will put it at/near the bottom
+ }
+ )
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
