<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/106366/">http://git.reviewboard.kde.org/r/106366/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/media/rb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Amarok.</div>
<div>By Daniel Stöckel.</div>
<p style="color: grey;"><i>Updated Sept. 8, 2012, 7:11 p.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Changes</h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Implement TrackProvider::possiblyContainesTrack and TrackProvider::trackForUrl for the DaapCollection.
This in theory fixes resuming play after an Amarok restart. In practice apparently the playableUrl is
restored from the playlist and passed to the CollectionManager for restoring. As the playable url starts
with http:// this is handled as a HttpStream and never will reach a DaapCollection.
Removing the check for http in the CollectionManager::trackForUrl method leads to the desired behavior
but, of course, breaks other stuff. I still did so in this patch for demonstration purposes.
If possible the uidUrl should be used when calling trackForUrl, but i am sure good reasons exist for not doing so...
P.S.: I wont be able to work on this until at least Thursday, as I am in an untrusted network right now.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">This simply sends a fake revision-number to the server.
Also appends the session-id field to the track URLs.
See: https://bugs.kde.org/show_bug.cgi?id=306351
See: https://bugs.kde.org/show_bug.cgi?id=306351</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">- Rhythmbox collections now correctly appear and play in Amarok.
- Validated that mt-daap collections are still working.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> (updated)</h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>src/core-impl/collections/daap/DaapCollection.h <span style="color: grey">(f8655ec)</span></li>
<li>src/core-impl/collections/daap/DaapCollection.cpp <span style="color: grey">(5d1bd9b)</span></li>
<li>src/core-impl/collections/daap/DaapMeta.h <span style="color: grey">(5278b57)</span></li>
<li>src/core-impl/collections/daap/DaapMeta.cpp <span style="color: grey">(a2429d7)</span></li>
<li>src/core-impl/collections/daap/daapreader/Reader.cpp <span style="color: grey">(b6196e1)</span></li>
<li>src/core-impl/collections/support/CollectionManager.cpp <span style="color: grey">(d196403)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/106366/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>