[Slim-Checkins] r10171 - in /branches/6.5/server: ./ Firmware/
Slim/Player/
titmuss at svn.slimdevices.com
titmuss at svn.slimdevices.com
Wed Oct 4 01:48:08 PDT 2006
Author: titmuss
Date: Wed Oct 4 01:47:59 2006
New Revision: 10171
URL: http://svn.slimdevices.com?rev=10171&view=rev
Log:
Squeezebox2/3 firmware 65 and Transporter firmware 19 merged from trunk.
Added:
branches/6.5/server/Firmware/squeezebox2_65.bin
- copied unchanged from r10170, trunk/server/Firmware/squeezebox2_65.bin
branches/6.5/server/Firmware/transporter_19.bin
- copied unchanged from r10170, trunk/server/Firmware/transporter_19.bin
Removed:
branches/6.5/server/Firmware/squeezebox2_64.bin
branches/6.5/server/Firmware/transporter_18.bin
Modified:
branches/6.5/server/Changelog6.html
branches/6.5/server/Firmware/squeezebox2.version
branches/6.5/server/Firmware/transporter.version
branches/6.5/server/Slim/Player/Client.pm
branches/6.5/server/Slim/Player/Squeezebox2.pm
branches/6.5/server/Slim/Player/Transporter.pm
Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10171&r1=10170&r2=10171&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Wed Oct 4 01:47:59 2006
@@ -1,7 +1,16 @@
<h2><a name="v6.5.1" id="v6.5.1"></a>Version 6.5.1 - 2006-MM-DD</h2>
<ul>
+ <li>Firmware 65 for Squeezebox2/3 and Firmware 19 for Transporter</li>
+ <ul>
+ <li>Gapless MP3 playback</li>
+ <li>Bug fixes</li>
+ </ul>
+ <br />
+
<li>Bug Fixes:
+ <ul>
+ <li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=1026">#1026</a> - Implement gapless playback for MP3</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=2985">#2985</a> - WMA transcoded to WAV truncated (not gapless)</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3044">#3044</a> - Lyrics do not display with line spacing correctly (again)</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3318">#3318</a> - MusicMagic: Songs with national chars get duplicated</li>
@@ -11,13 +20,18 @@
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4071">#4071</a> - Band Names in mp3 Tags don't always work</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4077">#4077</a> - CUE files YEAR and GENRE not always working</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4099">#4099</a> - Playlists with multiple radio streams don't display/load</li>
+ <li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4116">#4116</a> - "Rescan done" sent prematurely (before rescan is done!)</li>
+ <li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4122">#4122</a> - Current Settings -> Slimserver shows wrong server</li>
+ <li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4123">#4123</a> - "Turn Off DAC" formatted unusually</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4135">#4135</a> - WAV format files play incorrectly</li>
- <li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4116">#4116</a> - "Rescan done" sent prematurely (before rescan is done!)</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4132">#4132</a> - Upgrading softsqueeze can lead to garbled fonts</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4140">#4140</a> - Problem with the scanner parsing cue sheets in6.5b3</li>
+ <li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4141">#4141</a> - After using the remote the knob performs a demag cycle</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4142">#4142</a> - ExBrowse3 does not work with Safari</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4145">#4145</a> - Display station name instead of album name in overlay text visualizers on transporter second screen</li>
+ <li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4144">#4144</a> - Need volume control on player-only DAC mode</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4149">#4149</a> - Display buffering feedback on Now Playing screen even after IR</li>
+ <li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4152">#4152</a> - WPN802 firmware other than original release, Squeezebox fails to connect via wireless</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4156">#4156</a> - slimtray should install the service if it's not already installed when starting</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4159">#4159</a> - second screen needs to be blank when prompting for software update on transporter</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4168">#4168</a> - Live365 plugin fails in 6.5.0</li>
@@ -38,33 +52,34 @@
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4221">#4221</a> - 6.5 crashes on artist breadcrumb</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4228">#4228</a> - Fishbone skin status doesn't update from an empty playlist</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4237">#4237</a> - in Help > Internet Radio there is a dead link to Settings</li>
+ <li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4242">#4242</a> - changing the name of a player while it's playing audio causes a skip</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4245">#4245</a> - Pressing PLAY on top level browse pushes right</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4270">#4270</a> - Server Information on SB - two items muddled up</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4281">#4281</a> - Mix do not work with accented characters in filenames and paths</li>
- <ul>
+ </ul>
</ul>
<h2><a name="v6.5.0" id="v6.5.0"></a>Version 6.5.0 - 2006-09-19</h2>
<ul>
- <li>Firmware updates:
- <ul>
- <li>Firmware 18 for Transporter.
- <ul>
- <li>Flac 24/96 playback
- <li>Clock source: Internal clock, Word clock, Balanced AES/EBU, BNC S/PDIF, RCA S/PDIF, Optical S/PDIF (TOSLINK)
- <li>Digital output encoding: S/PDIF or AES/BEU
- <li>Digital inputs: Balanced AES/EBU, BNC S/PDIF, RCA S/PDIF, Optical S/PDIF (TOSLINK)
- <li>Support for two displays, including push and bump animations
- <li>Front panel support, including buttons and the knob
- <li>Setting for Word clock on S/PDIF outputs
- <li>Setting for Polarity inversion
- <li>Setting to power down DAC when off
- <li>Auto sensing 110V/230V power supply
- <li>RS232 interface
- <li>IR interface
- </ul>
- <li>Update to Firmware 64 for Squeezebox2/Squeezebox v3.
+ <li>Firmware updates:</li>
+ <ul>
+ <li>Firmware 18 for Transporter.</li>
+ <ul>
+ <li>Flac 24/96 playback</li>
+ <li>Clock source: Internal clock, Word clock, Balanced AES/EBU, BNC S/PDIF, RCA S/PDIF, Optical S/PDIF (TOSLINK)</li>
+ <li>Digital output encoding: S/PDIF or AES/BEU</li>
+ <li>Digital inputs: Balanced AES/EBU, BNC S/PDIF, RCA S/PDIF, Optical S/PDIF (TOSLINK)</li>
+ <li>Support for two displays, including push and bump animations</li>
+ <li>Front panel support, including buttons and the knob</li>
+ <li>Setting for Word clock on S/PDIF outputs</li>
+ <li>Setting for Polarity inversion</li>
+ <li>Setting to power down DAC when off</li>
+ <li>Auto sensing 110V/230V power supply</li>
+ <li>RS232 interface</li>
+ <li>IR interface</li>
+ </ul>
+ <li>Update to Firmware 64 for Squeezebox2/Squeezebox v3.</li>
<ul>
<li>Native Ogg support</li>
<li>Downsampling of 96kHz FLAC and WAV.</li>
Modified: branches/6.5/server/Firmware/squeezebox2.version
URL: http://svn.slimdevices.com/branches/6.5/server/Firmware/squeezebox2.version?rev=10171&r1=10170&r2=10171&view=diff
==============================================================================
--- branches/6.5/server/Firmware/squeezebox2.version (original)
+++ branches/6.5/server/Firmware/squeezebox2.version Wed Oct 4 01:47:59 2006
@@ -3,7 +3,7 @@
# from to
# from1..from2 to
-1..64 64
+1..65 65
# future versions may be downgraded to this one
-* 64
+* 65
Modified: branches/6.5/server/Firmware/transporter.version
URL: http://svn.slimdevices.com/branches/6.5/server/Firmware/transporter.version?rev=10171&r1=10170&r2=10171&view=diff
==============================================================================
--- branches/6.5/server/Firmware/transporter.version (original)
+++ branches/6.5/server/Firmware/transporter.version Wed Oct 4 01:47:59 2006
@@ -3,8 +3,8 @@
# from to
# from1..from2 to
-1..18 18
+1..19 19
# future versions may be downgraded to this one
-* 18
+* 19
Modified: branches/6.5/server/Slim/Player/Client.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Client.pm?rev=10171&r1=10170&r2=10171&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Client.pm (original)
+++ branches/6.5/server/Slim/Player/Client.pm Wed Oct 4 01:47:59 2006
@@ -174,6 +174,7 @@
$client->[110] = undef; # lastSong (last URL played in this play session - a play session ends when the player is stopped or a track is skipped)
$client->[111] = {}; # pipe sockets used for parent/child communication
$client->[112] = 0; # knobSync
+ $client->[113] = {}; # pendingPrefChanges
$clientHash{$id} = $client;
@@ -1680,4 +1681,9 @@
@_ ? ($r->[112] = shift) : $r->[112];
}
+sub pendingPrefChanges {
+ my $r = shift;
+ @_ ? ($r->[113] = shift) : $r->[113];
+}
+
1;
Modified: branches/6.5/server/Slim/Player/Squeezebox2.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Squeezebox2.pm?rev=10171&r1=10170&r2=10171&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Squeezebox2.pm (original)
+++ branches/6.5/server/Slim/Player/Squeezebox2.pm Wed Oct 4 01:47:59 2006
@@ -237,6 +237,13 @@
# values.
$client->songElapsedSeconds(0);
$client->outputBufferFullness(0);
+
+ # update pending pref changes in the firmware
+ foreach my $pref (keys %{$client->pendingPrefChanges()}) {
+
+ $client->setPlayerSetting($pref, $client->prefGet($pref));
+
+ }
}
sub songElapsedSeconds {
@@ -717,8 +724,19 @@
my $currpref = $pref_settings->{$pref};
- my $data = pack('C'.$currpref->{pack}, $currpref->{firmwareid}, $value);
- $client->sendFrame('setd', \$data);
+ if ($client->playmode() eq 'stop') {
+
+ my $data = pack('C'.$currpref->{pack}, $currpref->{firmwareid}, $value);
+ $client->sendFrame('setd', \$data);
+
+ }
+ else {
+
+ # we can't update the pref's while playing, cache this change for later
+ $::d_prefs && msg("setPlayerSeting pending change for $pref\n");
+ $client->pendingPrefChanges()->{$pref}++;
+
+ }
}
# Allow the firmware to update a pref in slimserver
Modified: branches/6.5/server/Slim/Player/Transporter.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Player/Transporter.pm?rev=10171&r1=10170&r2=10171&view=diff
==============================================================================
--- branches/6.5/server/Slim/Player/Transporter.pm (original)
+++ branches/6.5/server/Slim/Player/Transporter.pm Wed Oct 4 01:47:59 2006
@@ -249,33 +249,6 @@
return 'transporter';
}
-sub volume {
- my $client = shift;
- my $newvolume = shift;
-
- if (defined($newvolume) && Slim::Music::Info::isDigitalInput(Slim::Player::Playlist::song($client))) {
- my $volume = $client->Slim::Player::Client::volume($newvolume, @_);
-
- my $db = ($newvolume - 100)/2;
- my $newGain = 0;
-
- if ($db >= -48) {
- my $floatmult = 10 ** ($db/20);
- $newGain = int($floatmult * 255);
- }
-
- $newGain = 255 if ($newGain > 255);
-
- my $data = pack('NNCCNN', 0, 0, $client->prefGet("digitalVolumeControl"), 0, $newGain, $newGain);
- $client->sendFrame('audg', \$data);
-
- return $volume;
- }
- else {
- return $client->SUPER::volume($newvolume, @_);
- }
-}
-
sub hasDigitalIn {
return 1;
}
More information about the checkins
mailing list