Commit by Daniel Faust on master :: rv2.5.0-358-gb8bccd9 amarok/src/context/applets/labels/LabelsApplet.cpp: (link)

Force an initial update of the labels applet

Commit by Sam Lade on master :: rv2.5.0-357-ge83b4d4 amarok/ (3 files in 2 dirs): (link)

Fix dynamic playlist album play bias with MetaProxy

If a partial album was loaded with MetaProxy (e.g., when the current
playlist is loaded after starting Amarok), the album play bias would
fail to continue the album due to Meta::Track and MetaProxy::Track being
unequal. Use a comparison function that ensures the comparison is
correct.

Commit by Matěj Laitl on master :: rv2.5.0-356-g71a6175 amarok/src/core-impl/collections/ipodcollection/support/IphoneMountPoint.cpp: (link)

IpodCollection: compatibility with ifuse 1.1.2

--uuid option changed to --udid in ifuse 1.1.2. Fortunately, the short
form, -u, is unchanged, whew...

Commit by Matěj Laitl on master :: rv2.5.0-355-gb1dfac7 amarok/ (3 files in 2 dirs): (link)

TranscodingJob: don't pass -n to ffmpeg, check file existence manually

BUGFIXES:
 * Transcoding: fix compatibility with libav's ffmpeg

BUG: 300551
FIXED-IN: 2.6
DIGEST: Bugfix

Commit by Matěj Laitl on master :: rv2.5.0-353-gac9b9bd amarok/src/browsers/CollectionTreeView.cpp: (link)

CollectionTreeView: fix memory leak

We check CollectionLocation for isWritable(), this is authoritative.

Commit by Matěj Laitl on master :: rv2.5.0-352-g57f6a38 amarok/src/core/collections/ (2 files): (link)

CollectionLocation: betters docs, remove resolved TODO

Commit by Sven Krohlas on master :: rv2.5.0-351-gc652bb4 amarok/src/images/ (7 files in 3 dirs): (link)

Amazon store: improved icons

As always created by Fabi. Thanks agein. :-)

>From his description of changes:
"OK Finally I'm ready. the emblem is now the same as the 16x16 Icon and all
icons are new with KDE Oxygen colors and the card Icon so you can see that
its a store attaches 3 pictures from amarok so you can see its eyefriendlier
on dark colors. so far - I Hope you like it and if something is wrong I will
fix it"

Note: I had to remove the icon cache at
  /var/tmp/kdecache-$USER/icon-cache.kcache
to make them show up. Maybe that trick is needed for you, too. ;-)

CCMAIL:fabidesu at googlemail dot com

Commit by Sven Krohlas on master :: rv2.5.0-350-gc5d4741 amarok/ (2 files in 2 dirs): (link)

Amazon store: try to show a sensible default in the country selection

If the user has not set a location we now try to guess one by asking
KLocale for the country setting. This is then being displayed as default
choice in the country selection dialog.

This does NOT yet save this determination or even use it to query the
service, as sending data to an internet service without explicit
consent from the user is a bad, bad thing. It just sets the default
value in the dialog the user still has to confirm.

Commit by Matěj Laitl on master :: rv2.5.0-349-gac63cc7 amarok/src/core/support/Components.h: (link)

Components.h: code style

Commit by Matěj Laitl on master :: rv2.5.0-348-g0a7f932 amarok/src/core-impl/collections/ipodcollection/jobs/IpodCopyTracksJob.cpp: (link)

IpodCollectionLocation: when looking for duplicate tracks, disregard genre

Genre is seldom used to differentiate between different tracks, ID3 v1
tags have a limited set of available genres so that may create false
negatives.

Commit by Matěj Laitl on master :: rv2.5.0-347-gee23644 amarok/src/core-impl/collections/db/sql/ (3 files): (link)

Don't show updating database dialog on the first run

...we already show enough dialogs when starting Amarok for the first
time. :-)

Commit by Matěj Laitl on master :: rv2.5.0-346-ga42c0da amarok/src/core-impl/collections/db/sql/ (DatabaseUpdater.h SqlCollection.cpp): (link)

Display a modal dialog when Amarok database is being updated

This should hopefully prevent users from killing it while the database
schema is being updated (or at least informing them that nasty things
would happen if Amarok is killed)

This can be tested using the following patch on top of this commit:

> diff --git a/src/core-impl/collections/db/sql/SqlCollection.cpp b/src/core-impl/collections/db/sql/SqlCollection.cpp
> index 018ee07..5518ba6 100644
> --- a/src/core-impl/collections/db/sql/SqlCollection.cpp
> +++ b/src/core-impl/collections/db/sql/SqlCollection.cpp
> @@ -129,6 +129,8 @@ public:
> } //namespace Collections
>
> using namespace Collections;
> +#include <QThread> // TESTING
> +class MyThread : public QThread { public: using QThread::sleep; }; // TESTING
>
> SqlCollection::SqlCollection( const QString &id, const QString &prettyName, SqlStorage* storage )
> : DatabaseCollection( id, prettyName )
> @@ -154,7 +156,7 @@ SqlCollection::SqlCollection( const QString &id, const QString &prettyName, SqlS
> // is initialized or its handlers may try to insert
> // into the database before it's created/updated!
> DatabaseUpdater updater( this );
> - if( updater.needsUpdate() )
> + if( updater.needsUpdate() || true /* TESTING */ )
> {
> KDialog dialog( 0, Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint );
> QLabel label( i18n( "Updating Amarok database schema. Please don't terminate "
> @@ -170,6 +172,7 @@ SqlCollection::SqlCollection( const QString &id, const QString &prettyName, SqlS
> kapp->processEvents();
>
> updater.update();
> + MyThread::sleep( 10 ); /* TESTING */
>
> dialog.hide();
> kapp->processEvents();

Commit by Matěj Laitl on master :: rv2.5.0-345-g8897823 amarok/src/core-impl/collections/upnpcollection/UpnpCache.cpp: (link)

UpnpCollection: remove unused method

Commit by Matěj Laitl on master :: rv2.5.0-344-g2401afa amarok/src/context/scriptengine/javascript/qtgui/rect.cpp: (link)

scriptengine: remove unused function

Commit by Matěj Laitl on master :: rv2.5.0-343-g9b42d57 amarok/src/core-impl/meta/proxy/MetaProxy_p.h: (link)

MetaProxy: don't crash when d->realTrack->artist() is null

This happened to me today when I removed some tracks from collection
while they were in playlist proxied by MetaProxy.

Commit by Sven Krohlas on master :: rv2.5.0-342-ge967c82 amarok/src/core/support/Amarok.cpp: (link)

deprecated_warnings--;

Should fix

/home/sven/amarok/src/core/support/Amarok.cpp: In function ‘QString Amarok::verboseTimeSince(const QDateTime&)’:
/home/sven/amarok/src/core/support/Amarok.cpp:60:76: warning: ‘virtual QString KCalendarSystem::yearString(const QDate&, KCalendarSystem::StringFormat) const’ is deprecated (declared at /usr/include/KDE/../kcalendarsystem.h:959) [-Wdeprecated-declarations]

The replacement is available since KDE 4.6, our current minimum requirement.

http://api.kde.org/4.x-api/kdelibs-apidocs/kdecore/html/classKCalendarSystem.html#a8eddca5bec00fab07bfb5a4a94860beb
http://api.kde.org/4.x-api/kdelibs-apidocs/kdecore/html/classKCalendarSystem.html#a11b23f2448d707193e722bb17a5f73a0

I hopefully translated the format correctly. ^^

Commit by Sven Krohlas on master :: rv2.5.0-341-g2bbabf4 amarok/ (5 files in 2 dirs): (link)

AmazonCollection: return references instead of pointers

As suggested by strohel.

Commit by Sven Krohlas on master :: rv2.5.0-340-g600b7ae amarok/ChangeLog: (link)

ChangeLog: year++;

It's 2012 now. ^^

Commit by Sven Krohlas on master :: rv2.5.0-339-g32f7e98 amarok/ (2 files in 2 dirs): (link)

Amazon store: improved album search

When loading the details of an album we no longer rely on a simple
search by name but load the correct album explicitly using its ASIN.

The results contain wrong infos about the artists, this will be fixed
on the api side soonish.

Commit by Matěj Laitl on master :: rv2.5.0-354-g5bf3f7b amarok/ (5 files in 3 dirs): (link)

DB: change lyrics table: text url -> integer url pointing to the urls table

I believe that the old lyrics table structure was more or less a mistake:
TABLE lyrics (
    id INTEGER PRIMARY KEY, -- actually never used in code
    url VARBINARY(324), -- actually a rpath from urls table
    lyrics TEXT
)

Apart from data duplication and non-conformity to the "update anomaly"
requirement of the database design, there was additional problem that rpath
itself is not unique. The (deviceId, rpath) is.

This change makes the lyrics table look more sane:
TABLE lyrics (
    url INTEGER PRIMARY KEY, -- points to url.id column
    lyrics TEXT
)

with an effort to transition existing entries. The transition of 5000
lyrics entries takes 16s on my 2.5 GHz Core i5 (one core used), so it
should be acceptable.

This is the first time I'm changing db structure, I'd be glad to
receive thorough review, namely of the update13to14() method and
especially the duplicate-removing query. This is critical because
database-corrupting fault would leave many Amarok users in a state
where they would need to drop their database to make Amarok working
again.

ChangeLog of the unrelated iPod fix is updated because DB_VERSION bump
triggers full collection rescan as far as it is documented.

BUG: 242350
FIXED-IN: 2.6
REVIEW: 104966