6 years agoFix drag & drop in playlist layout editor, filter editor etc. in non-english locales
Matěj Laitl [Sun, 29 Apr 2012 21:12:32 +0000 (23:12 +0200)]
Fix drag & drop in playlist layout editor, filter editor etc. in non-english locales

The implementation relies on custom mime-type specified in .ui files.
However, the strings weren't marked as non-translatable, so language
teams that decided to translate application/x-amarok-tag-token effectively
broke drag & drop for their users. (the blame goes to Amarok team, of

Myriam, more than 2-year-old bug fixed in a couple of hours, don't you
like your GSoC student? :-)

 * Fix drag & drop in playlist layout editor, filename layout editor,
   filter editor for non-english locales. (BR 215402)

BUG: 215402

6 years agoProofread German translation.
Frederik Schwarzer [Sun, 29 Apr 2012 21:15:55 +0000 (23:15 +0200)]
Proofread German translation.

6 years agoMPRIS2: Fix mpris:artUrl
Alex Merry [Sun, 29 Apr 2012 20:30:36 +0000 (21:30 +0100)]
MPRIS2: Fix mpris:artUrl

Some of the implementations of Meta::Album were implementing image(),
but not hasImage() or imageLocation(), meaning that covers would display
fine in Amarok, but wouldn't be given out over MPRIS2.

I'm fairly sure I haven't caught all the offenders, but it works for
local tracks, at least.

6 years agoRemove cruft from release_scripts/, update RELEASE_HOWTO
Matěj Laitl [Sun, 29 Apr 2012 17:16:39 +0000 (19:16 +0200)]
Remove cruft from release_scripts/, update RELEASE_HOWTO

...update RELEASE_HOWTO to mention that Amarok now uses the scripts
from the releaseme.git KDE project.

6 years agoAdd Czech translation of the Windows installer
Matěj Laitl [Sun, 29 Apr 2012 16:15:30 +0000 (18:15 +0200)]
Add Czech translation of the Windows installer

Okay, the translation is rather a "free" one. ;) Based on translation
by Vít Pelčák, thanks!

CCMAIL: Vít Pelčák <>

6 years agoAdded Brazilian Portuguese translation
André Marcelo Alvarenga [Sun, 29 Apr 2012 14:01:20 +0000 (11:01 -0300)]
Added Brazilian Portuguese translation

6 years agoDon't export FileType, compile it in each target that needs it
Matěj Laitl [Sun, 29 Apr 2012 13:16:37 +0000 (15:16 +0200)]
Don't export FileType, compile it in each target that needs it

As Patrick von Reth found out, classes in shared/ are (probably) not
meant to be exported - it breaks at least windows build.

IpodCollection needs the class, so it is added to its CMakeLists.

6 years agoMPRIS2: Try to keep the position up to date
Alex Merry [Sun, 29 Apr 2012 13:13:14 +0000 (14:13 +0100)]
MPRIS2: Try to keep the position up to date

Changing track means we are seeking back to 0

6 years agoUpdate Ukrainian translation for Windows installer
Yuri Chornoivan [Sun, 29 Apr 2012 12:58:25 +0000 (15:58 +0300)]
Update Ukrainian translation for Windows installer

6 years agofixed typo
Patrick von Reth [Sun, 29 Apr 2012 12:34:51 +0000 (14:34 +0200)]
fixed typo

6 years agoadded spanish translation
Patrick von Reth [Sun, 29 Apr 2012 12:21:18 +0000 (14:21 +0200)]
added spanish translation

thanks to Javier the translation was somewhere lost in my inbox

6 years agoadded another string, improved uninstall info
Patrick von Reth [Sun, 29 Apr 2012 12:16:47 +0000 (14:16 +0200)]
added another string, improved uninstall info

-added string VISITE_PROJECT_HOMEPAGE  "Visite project website"
which will be displayed on the finis page
-use an icon for the uninstall entry
display hompage and version and publisher in the software uninstall

6 years agofound a way to use the buildin translation for "Next >"
Patrick von Reth [Sun, 29 Apr 2012 11:42:41 +0000 (13:42 +0200)]
found a way to use the buildin translation for "Next >"

6 years agoIpodCollection: ensure directories exist when copying files
Matěj Laitl [Sun, 29 Apr 2012 11:34:41 +0000 (13:34 +0200)]
IpodCollection: ensure directories exist when copying files

 * When copying files to iPod, ensure target directories exist.

As suggested by avlas on my blog [1]

6 years agoSome changes to the handling of cover art reading and writing
Daniel Faust [Sun, 29 Apr 2012 09:51:38 +0000 (11:51 +0200)]
Some changes to the handling of cover art reading and writing

The maximum dimensions for embedded covers are now configurable.
When writing covers to files, all existing covers will be replaced.

FEATURE: 279493
REVIEW: 104513
GUI: New configuration option for the maximum cover size in the 'local collection' tab

6 years agoFix bug 272346, unable to set MySQL password to 'password'
Lachlan Dufton [Sun, 29 Apr 2012 09:05:37 +0000 (11:05 +0200)]
Fix bug 272346, unable to set MySQL password to 'password'

Praise Lachlan for spotting inconsistency between default value in .xml
file and in code.

BUG: 272346
REVIEW: 104751

6 years agoIpodCollection: rework iPhone identification to prevent false-positives
Matěj Laitl [Sat, 28 Apr 2012 20:33:32 +0000 (22:33 +0200)]
IpodCollection: rework iPhone identification to prevent false-positives

...false-positives that would otherwise appear once the change [1] is
merged into kdelibs. (should happen for 4.8.4)


CCBUG: 253671

6 years agoAdded possebility to create an offline installer
Patrick von Reth [Thu, 26 Apr 2012 18:14:55 +0000 (20:14 +0200)]
Added possebility to create an offline installer

The installer tests if the file to download exists in ./amarok
If it exists fetch and deletion of the file are skiped
So its possible to package the installer with all its sub-packages
on one CD/DVD

6 years agoAdded more translations provided by KDE i18n-doc <>
Patrick von Reth [Thu, 26 Apr 2012 18:08:59 +0000 (20:08 +0200)]
Added more translations provided by KDE i18n-doc <>

CCMAIL: KDE i18n-doc <>

6 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Thu, 26 Apr 2012 08:46:04 +0000 (10:46 +0200)]
SVN_SILENT made messages (.desktop file)

6 years agoUpdate radio stream URL.
Mark Kretschmann [Wed, 25 Apr 2012 14:27:10 +0000 (16:27 +0200)]
Update radio stream URL.

6 years agoAdded translations provided by the kde-i18n-doc, team thanks again
Patrick von Reth [Tue, 24 Apr 2012 22:07:16 +0000 (00:07 +0200)]
Added translations provided by the kde-i18n-doc, team thanks again

DIGEST: Added translations to the Amarok WIndows installer, screenshots

6 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Tue, 24 Apr 2012 14:52:25 +0000 (16:52 +0200)]
SVN_SILENT made messages (.desktop file)

6 years agoProofread German translation.
Frederik Schwarzer [Tue, 24 Apr 2012 14:14:49 +0000 (16:14 +0200)]
Proofread German translation.

The PAGE_LICENSE_SUBTEXT is still quite awkward. I would probably just
skip the part after the comma. Even in the original text, because it's
rather expressionless.

6 years agotranslate the shortcuts
Patrick von Reth [Tue, 24 Apr 2012 09:36:45 +0000 (11:36 +0200)]
translate the shortcuts

6 years agomade snore optional,add shortcut to language kcm
Patrick von Reth [Tue, 24 Apr 2012 09:11:00 +0000 (11:11 +0200)]
made snore optional,add shortcut to language kcm

6 years agosome small fixes
Patrick von Reth [Mon, 23 Apr 2012 21:37:28 +0000 (23:37 +0200)]
some small fixes

6 years agocleaning up
Patrick von Reth [Mon, 23 Apr 2012 16:57:09 +0000 (18:57 +0200)]
cleaning up

6 years agoadded comment
Patrick von Reth [Mon, 23 Apr 2012 16:25:49 +0000 (18:25 +0200)]
added comment

6 years agoadded all availible language packages
Patrick von Reth [Mon, 23 Apr 2012 16:23:54 +0000 (18:23 +0200)]
added all availible language packages

6 years agoadded all languages
Patrick von Reth [Mon, 23 Apr 2012 12:56:22 +0000 (14:56 +0200)]
added all languages

6 years agofixed typos added some languages
Patrick von Reth [Mon, 23 Apr 2012 12:31:48 +0000 (14:31 +0200)]
fixed typos added some languages

6 years agoinclude language code in the translated language name
Patrick von Reth [Mon, 23 Apr 2012 10:30:06 +0000 (12:30 +0200)]
include language code in the translated language name

6 years agoadded windows installer scripts
Patrick von Reth [Mon, 23 Apr 2012 10:27:22 +0000 (12:27 +0200)]
added windows installer scripts

6 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Mon, 23 Apr 2012 08:05:38 +0000 (10:05 +0200)]
SVN_SILENT made messages (.desktop file)

6 years agoAdd taglib to the feature log
Andre Heinecke [Sun, 22 Apr 2012 13:33:31 +0000 (15:33 +0200)]
Add taglib to the feature log

    As taglib is searched also when the player is not built it was
    not displayed in the feature log. This could cause the warning
    that taglib is not available to be overlooked.

6 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Sat, 21 Apr 2012 09:18:00 +0000 (11:18 +0200)]
SVN_SILENT made messages (.desktop file)

6 years agoAdd PulseAudio status to diagnostic dialog
Sam Lade [Sat, 21 Apr 2012 00:01:45 +0000 (01:01 +0100)]
Add PulseAudio status to diagnostic dialog

6 years agoSVN_SILENT compile
Christoph Feck [Fri, 20 Apr 2012 11:37:12 +0000 (13:37 +0200)]
SVN_SILENT compile

6 years agoMPRIS2 compliance: do not use track ids that start with /org/mpris/
Alex Merry [Fri, 20 Apr 2012 01:04:04 +0000 (02:04 +0100)]
MPRIS2 compliance: do not use track ids that start with /org/mpris/

The spec says these are reserved.

6 years agoIpodCollection: fix crash that follows failure to mount iPhone
Matěj Laitl [Thu, 19 Apr 2012 11:01:05 +0000 (13:01 +0200)]
IpodCollection: fix crash that follows failure to mount iPhone

Thanks to avlas on my blog post [1] for reporting it.


6 years agoPartial revert of "fixed EXPORT macros -> windows build"
Matěj Laitl [Wed, 18 Apr 2012 22:07:24 +0000 (00:07 +0200)]
Partial revert of "fixed EXPORT macros -> windows build"

This reverts one part of commit 10e6f11f08e79b9d75e1bf25dff5c078c291e2a2.

Patrick, I exported FileType on purpose, iPod collection plugin doesn't
build without it. (if you're on Windows, you probably don't notice it as
libgpod depencency isn't perhaps present)

I left the other part of your commit (that fixed a bug introduced by me)
intact. I don't know which part of your commit fixed windows build, but
if you touch macros in FileType.h, please leave the class exported.


CCMAIL: Patrick von Reth <>

6 years agofixed EXPORT macros -> windows build
Patrick von Reth [Wed, 18 Apr 2012 19:18:16 +0000 (21:18 +0200)]
fixed EXPORT macros -> windows build

6 years agoFix placeholder (thanks to Freek de Kruijf for spotting)
Yuri Chornoivan [Wed, 18 Apr 2012 15:07:29 +0000 (18:07 +0300)]
Fix placeholder (thanks to Freek de Kruijf for spotting)

6 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Wed, 18 Apr 2012 07:31:27 +0000 (09:31 +0200)]
SVN_SILENT made messages (.desktop file)

6 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Tue, 17 Apr 2012 14:05:01 +0000 (16:05 +0200)]
SVN_SILENT made messages (.desktop file)

6 years agoIpodCollection: fix compilation failure with recent glib versions
Matěj Laitl [Mon, 16 Apr 2012 20:34:40 +0000 (22:34 +0200)]
IpodCollection: fix compilation failure with recent glib versions

Thanks go to Bernd Buschinski on for spotting and
reporting this.


6 years agoIpodCollection: fix typo in variable name
Matěj Laitl [Mon, 16 Apr 2012 20:02:11 +0000 (22:02 +0200)]
IpodCollection: fix typo in variable name

Thanks to dr_lepper for spotting this.

6 years agoClarify iPod requirements in README
Matěj Laitl [Mon, 16 Apr 2012 19:25:26 +0000 (21:25 +0200)]
Clarify iPod requirements in README

CCBUG: 298259

6 years agoFix issues with URL encoding and relative paths in playlist handling
Sam Lade [Mon, 16 Apr 2012 16:59:33 +0000 (17:59 +0100)]
Fix issues with URL encoding and relative paths in playlist handling

M3U: Correctly handle absolute file paths with ? in, and don't require
     Unix paths to detect absolute file paths.
M3U: Correctly save relative paths which do not start with ./
PLS: Load and save relative paths from the directory containing the
     playlist, not the playlist file itself.
XSPF: Avoid de-percent-encoding and reparsing URLs, so filenames with ?
      in are handled correctly.

6 years agomove the Free Music Charts script from playground/ to src/
Sven Krohlas [Mon, 16 Apr 2012 14:08:42 +0000 (16:08 +0200)]
move the Free Music Charts script from playground/ to src/

That feature is part of VLC by default and is going to be included in
Tomahawk soonish, too.

The script is very well tested, very popular and received a lot of
positive feedback during the last few years. So I don't see any reasons
not to include it. Don't prove me wrong. ;-)

Also there is a massive copyright debate going on in Germany and some
free music artists complained to me, that it is nearly impossible to get
attention for their music, as traditionial media are more or less dominated
by the large major labels. So let's help those artists. :)

DIGEST: Ship the Free Music Charts script with Amarok by default

6 years agoDo not show the missing Amazon location warning on startup if the service is hidden
Sven Krohlas [Mon, 16 Apr 2012 11:11:53 +0000 (13:11 +0200)]
Do not show the missing Amazon location warning on startup if the service is hidden

This is annoying for users who do not want or cannot use the store.


6 years agono longer show a message on init, as Amarok now inits services on startup
Sven Krohlas [Mon, 16 Apr 2012 10:47:15 +0000 (12:47 +0200)]
no longer show a message on init, as Amarok now inits services on startup

6 years agoFix typos.
Yuri Chornoivan [Mon, 16 Apr 2012 07:11:27 +0000 (10:11 +0300)]
Fix typos.

6 years agoMerge branch 'ipod-merge' that contains rewritten iPod collection
Matěj Laitl [Sun, 15 Apr 2012 15:30:01 +0000 (17:30 +0200)]
Merge branch 'ipod-merge' that contains rewritten iPod collection

* ipod-merge branch contains following commits:
  Add myself to contributors
  Complete iPod collection rewrite (also supports iPad, iPhone)
  Remove the "old" iPod collection soon to be replaced by the rewritten one
  Export MemoryMeta::Track, FileCollectionLocation and FileType

6 years agoAdd myself to contributors
Matěj Laitl [Sat, 21 Jan 2012 11:09:00 +0000 (12:09 +0100)]
Add myself to contributors

6 years agoComplete iPod collection rewrite (also supports iPad, iPhone)
Matěj Laitl [Sun, 15 Apr 2012 10:24:38 +0000 (12:24 +0200)]
Complete iPod collection rewrite (also supports iPad, iPhone)

This is a result of 3-month effort to make Amarok iPod-like device
support future-proof and less buggy by using more modern MemoryMeta
framework to manage tracks internally.

The new plugin still uses libgpod [1] to access the devices and
supports all devices supported by it. The newest models may need the
infamous library.

 * Small configuration dialog for iPods that shows troubleshooting information
   and allows to change iPod name.
 * Improved usability of iPod playlists: iPod collection automatically transfers
   tracks dropped to iPod playlists to iPod when it is needed.
 * Tracks can now be transcoded when transferring them to iPod.

 * optional libgpod dependency raised to 0.8.2 to support newest iPods.
 * Amarok now prevents accidental unmounting of iPods in (small) time-frames
   when iTunes database on iPod is not yet updated.
 * Amarok detects when iPod is to be ejected from system and gracefully
   disconnects it when it occurs.
 * Hitting the eject button on iPod collection ejects it also from the system.
 * iPod collection now detects whether iPod is safe to write and marks iPod
   as read-only if not. This prevents "iPod shows 0 tracks" problem.
 * Correct progress bar advancement when transferring tracks to iPod.
 * iPod Collection supports multiple simultaneous cancellable transfers.
 * Improved dialog to initialize iPod.

 * Detection and elimination of stale and orphaned iPod tracks now works
   correctly; users are notified about these when iPod is plugged in.
 * iPod playlists now work correctly.
 * Show correct error when transferring unsupported files to iPod.


FEATURE: 291722
FEATURE: 139454
FEATURE: 219963
BUG: 279797
BUG: 289304
BUG: 234876
DIGEST: Amarok's iPod support is completely rewritten fixing many bugs
        and adding features

6 years agoFileCollectionLocation: don't show error when deleting non-existent files
Matěj Laitl [Mon, 19 Mar 2012 15:52:34 +0000 (16:52 +0100)]
FileCollectionLocation: don't show error when deleting non-existent files

This is needed for yet-to-be-merged iPod collection rewrite that moves
(not copies) files when re-adding orphaned files to iPod database.

6 years agoRemove the "old" iPod collection soon to be replaced by the rewritten one
Matěj Laitl [Sat, 14 Apr 2012 21:49:24 +0000 (23:49 +0200)]
Remove the "old" iPod collection soon to be replaced by the rewritten one

6 years agoPrevent crashes related to wrong usage of CollectionLocation::prepareCopy()
Matěj Laitl [Sun, 15 Apr 2012 14:56:49 +0000 (16:56 +0200)]
Prevent crashes related to wrong usage of CollectionLocation::prepareCopy()

...and prepareMove(). The crash could have been reproduces by dragging
files that originated in 2 different collections to iPod and then twice
hitting Cancel in the "Transcode" dialog.

Also prevent wrong usage in future by better documenting
CollectionLocation methods.

6 years agoExport MemoryMeta::Track, FileCollectionLocation and FileType
Matěj Laitl [Sun, 11 Mar 2012 20:18:33 +0000 (21:18 +0100)]
Export MemoryMeta::Track, FileCollectionLocation and FileType

These will be needed soon by IpodCollection rewrite, make it in
a separate commit so that the ipod rewrite commit will touch only
iPod-related things.

6 years agoFix invalid assertion in PlaylistBrowserView::slotActivated()
Matěj Laitl [Thu, 12 Apr 2012 19:05:47 +0000 (21:05 +0200)]
Fix invalid assertion in PlaylistBrowserView::slotActivated()

The code assumed that if the item action list is non-empty, its first
action must be "appendAction". This is not true, for example for root
items (PlaylistProviders) that can have custom actions.

We now don't activate any action in slotActivated() if the first action
is not named "appendAction".

CCMAIL: Bart Cerneels <>

6 years agoavoid code duplication in user playlists; fixes to playlist browser
Matěj Laitl [Sun, 4 Mar 2012 15:40:30 +0000 (16:40 +0100)]
avoid code duplication in user playlists; fixes to playlist browser

UserPlaylistProvider subclasses now need not to provide their own
delete playlist, rename playlist and remove track from playlist
actions, these are provided by base class now.

Rename playlist action is changed to be an in-line rename, plus
PrettyTreeView is modified to assure that an item that is going to be
edited has its parents expanded.

Inline renaming is additionally made more robust in order not to rename
a different playlist with the same name.

Renaming of playlists from is model is changed to go though PlaylistManager
and respective Provider - providers may want to do more that just call

6 years agoPlaylist browser: normalize connect() calls
Matěj Laitl [Wed, 11 Apr 2012 09:46:01 +0000 (11:46 +0200)]
Playlist browser: normalize connect() calls

Also remove one duplicate connect call.

6 years agodistinguish between mp4, m4a, m4v types in Amarok::FileType
Matěj Laitl [Tue, 3 Apr 2012 16:57:02 +0000 (18:57 +0200)]
distinguish between mp4, m4a, m4v types in Amarok::FileType

iPod Collection (the new one) needs to distinguish somehow between
MPEG-4 audio and video files; to make this generic, least bad approach
it probably to use Meta::Track:type().

MetaFile::Track's type() is okay, as it just returns lowercased file
extension. SqlTrack stores file type in db as numeric index to the
Amarok::FileType enum, which currently has just one generic entry for
MP4 files.

This patch extends Amarok::FileType with M4a and M4v values and
TagHelper to try to detect more specific MP4 file format. (currently
just file extension based, can be extended in future) Users will need
to do a full rescan for Local Collection to pick up more specialised
file types.

I'm running this through review board as there seems no general
agreement on Meta::Track:type() semantics. (Speaking of which, I'd be
most satisfied if it returned (the most specific) mime-type represented
using dedicated class that would support mimetype hierarchy)

BUG: 268238
REVIEW: 104481

6 years agoMake DiagnosticDialog non-modal and changelog
Bart Cerneels [Wed, 4 Apr 2012 12:26:13 +0000 (14:26 +0200)]
Make DiagnosticDialog non-modal and changelog

DIGEST:Amarok gets a diagnostics dialog to easy bug reporting.

After seeing it implemented in Tomahawk we blatently copied it.
Patch provided by Andrzej Hunt implementing a Junior Job listed

6 years agoDiagnostics Dialog for Amarok.
Andrzej J. R. Hunt [Tue, 3 Apr 2012 18:46:32 +0000 (20:46 +0200)]
Diagnostics Dialog for Amarok.
FEATURE: 296415
REVIEW: 104449

6 years agoProxy load tracks from SQL playlists.
Bart Cerneels [Tue, 20 Mar 2012 11:04:23 +0000 (12:04 +0100)]
Proxy load tracks from SQL playlists.

6 years agoProxy load tracks from SQL playlists.
Bart Cerneels [Tue, 20 Mar 2012 11:04:23 +0000 (12:04 +0100)]
Proxy load tracks from SQL playlists.

6 years agoProperly save and load relative paths and urls.
Bart Cerneels [Tue, 20 Mar 2012 10:50:24 +0000 (11:50 +0100)]
Properly save and load relative paths and urls.

6 years agoProxy load PLS playlist.
Bart Cerneels [Tue, 20 Mar 2012 10:16:11 +0000 (11:16 +0100)]
Proxy load PLS playlist.

6 years agoProxy load M3U tracks with proper title and artist
Bart Cerneels [Tue, 20 Mar 2012 10:15:24 +0000 (11:15 +0100)]
Proxy load M3U tracks with proper title and artist

6 years agoGet rid of lines disconnecting removed slots.
Bart Cerneels [Tue, 20 Mar 2012 10:14:27 +0000 (11:14 +0100)]
Get rid of lines disconnecting removed slots.

6 years agoFix style.
Bart Cerneels [Fri, 9 Mar 2012 10:30:34 +0000 (11:30 +0100)]
Fix style.

6 years agoLoad all tracks from XSPF using MetaProxy.
Bart Cerneels [Sat, 17 Apr 2010 21:05:19 +0000 (23:05 +0200)]
Load all tracks from XSPF using MetaProxy.

Added a worker that does the actual trackForUrl call and subscribes to
trackProviderAdded signal as needed.

TODO: make CollectionManager emit sane signals. Each addition of a
collection should also add a TrackProvider. No confusion about signals.

6 years agoDon't assert on empty actions list.
Bart Cerneels [Mon, 2 Apr 2012 08:35:17 +0000 (10:35 +0200)]
Don't assert on empty actions list.

No actions is a valid case. Example: provider root items.

6 years agoForgot changelog.
Bart Cerneels [Mon, 2 Apr 2012 07:43:43 +0000 (09:43 +0200)]
Forgot changelog.

6 years agoImprove activate (double click) handling, fix bug.
Bart Cerneels [Mon, 2 Apr 2012 07:40:51 +0000 (09:40 +0200)]
Improve activate (double click) handling, fix bug.


6 years agoPrevent merging tracks with same title but different track (disc) numbers
Alexey Neyman [Fri, 30 Mar 2012 16:36:55 +0000 (18:36 +0200)]
Prevent merging tracks with same title but different track (disc) numbers

This is done by adding trackNumber and discNumber attributes to
TrackKey class and updating its methods accordingly.

Patch by Alexey Neyman <>, thanks!

REVIEW: 104423

6 years agoAbility to move track position bookmarks, better AmarokUrl method name
Jasneet Bhatti [Sun, 25 Mar 2012 12:03:07 +0000 (14:03 +0200)]
Ability to move track position bookmarks, better AmarokUrl method name

 * Ability to move track position bookmarks by dragging; patch by
   Jasneet Bhatti. (BR 214721)

Big thanks to Jasneet for the patch and great cooperation on the review

FEATURE: 214721
REVIEW: 104307

6 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Sun, 25 Mar 2012 09:00:40 +0000 (11:00 +0200)]
SVN_SILENT made messages (.desktop file)

6 years agoFree Music Charts script, Version 1.5.0
Sven Krohlas [Fri, 23 Mar 2012 12:34:28 +0000 (13:34 +0100)]
Free Music Charts script, Version 1.5.0

The Amazon MP3 Store is now directly integrated into the script, check
the Info applet. This requires at least Amarok 2.5.0 to work.

Btw, the charts will be back in a few weeks with a new moderator.

6 years agoUpdate source location for taglib
Myriam Schweingruber [Tue, 20 Mar 2012 20:10:25 +0000 (21:10 +0100)]
Update source location for taglib

Taglib has apparently moved to github without notice

6 years agoFix setting mpris:trackid for PendingTrack
Sam Lade [Mon, 19 Mar 2012 16:54:10 +0000 (16:54 +0000)]
Fix setting mpris:trackid for PendingTrack

Removes a QString::arg Argument missing error from debug log and
xsession-errors. Returns a consistent, though equally useless, value for

6 years agoPrevent crash on very quick drag and release of tracks
Sam Lade [Sun, 18 Mar 2012 13:30:38 +0000 (13:30 +0000)]
Prevent crash on very quick drag and release of tracks


6 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Sun, 18 Mar 2012 09:09:21 +0000 (10:09 +0100)]
SVN_SILENT made messages (.desktop file)

6 years agoPrevent occasional corruption on multi-byte characters in tags
Sam Lade [Sat, 17 Mar 2012 21:39:56 +0000 (21:39 +0000)]
Prevent occasional corruption on multi-byte characters in tags

XML from scan was buffered as a QString, which might occasionally be fed
part of a multi-byte character, causing invalid UTF characters. Buffer
as a QByteArray instead and convert only complete sections to QStrings
to avoid this.
Thanks to Alexey Neyman for the patch!


6 years agoMerge branch 'transcoding' into master
Matěj Laitl [Fri, 16 Mar 2012 20:08:54 +0000 (21:08 +0100)]
Merge branch 'transcoding' into master

* transcoding:
  Rework transcoding: remember encoder, transcode on move, cleaner code
  Transcoding::Property: remove NUMERIC, LIST, TEXT types
  CollectionLocation: display source dialog in next mainloop iteration


6 years agoRework transcoding: remember encoder, transcode on move, cleaner code
Matěj Laitl [Sat, 21 Jan 2012 00:13:36 +0000 (01:13 +0100)]
Rework transcoding: remember encoder, transcode on move, cleaner code

This is a major rework of transcoding feature that brings following
user-visible changes to Amarok:
 * Amarok can remember preferred transcoding configuration per each
   collection that supports transcoding. Therefore, the "Use default
   configuration" work-around can go away and the "Transcode or copy?"
   dialog can (and is) be one-step now. This preference can be changed
   in configuration.
 * Transcoding is now supported even during the move operation. No
   worries, only successfully transcoded tracks are removed from their
   original location.
 * Only formats playable on the target collection are offered. Already
   used & tested in yet-to-be-merged iPod collection rewrite.
 * The "Organize Tracks" dialog title and progress bar operation name
   now more verbosely describe actual operation to prevent user
 * Double-transcode when ripping audio CDs that caused failures is
   avoided. (ChangeLog entry for this was miscredited to my earilier

Technically, following changes are made:
 * many methods that accepted optional TranscodingConfiguration now
   either have it mandatory or not at all.
 * TranscodingConfiguration's NULL_CODEC was splitted to JUST_COPY and
   INVALID along with convenience methods isValid() and isJustCopy().
   This simplifies logic in many methods.
 * CollectionLocation::prepare{Copy,Move}() now don't have optional
   TranscodingConfiguration parameter. Depending on target collection,
   CollectionLocation determines it automatically or asks user in
   showSourceDialog() (overridable). AudioCdCollectionLocation already
   overrides it.
 * Collections that support transcoding now should expose
   TranscodeCapability which is used to a) indicate that transcoding
   is supported; b) query which file formats are playable on target
   collection; c) read & save & unset preferred transcoding parameters.

Why the hell the new Capability?

Many Amarok devs dislike the concept of capabilities[1]. Why the hell I
introduced the new one? In ideal world Amarok would be able to transcode
everything regardless of the target collection. This is however not
doable witch current copyUrlToCollection() design - target collection
needs to do non-trivial things such as re-reading file tags, accounting
for different file name and space requirements etc. See my comments in
[1]. We therefore need a way for target collection to indicate it
supports transcoding (in order not to fool user). Some collection
locations such as TrashCollectionLocation should even intentionally
disallow transcoding. Additionally, we want to be able to query
supported destination file formats, to save preferred transcoding
paremeters etc.

I simply didn't want to pollute already over-crowded CollectionLocation
with three more methods used by only a few subclasses. On the other
hand, TranscodeCapability is not the central idea of this patch and I
can factor it into CollectionLocation should there be a voice supporting

v2 patch version: gui string changes as suggested by Bart & Teo


FEATURE: 280526
FEATURE: 264681
CCBUG: 291722
BUG: 263775
REVIEW: 104213
DIGEST: Feature: much improved transcoding

6 years agoSwitch back to ogg streams for Jamendo, they work.
Bart Cerneels [Thu, 15 Mar 2012 11:02:34 +0000 (12:02 +0100)]
Switch back to ogg streams for Jamendo, they work.

NOTE: since jamendo has many track options, we should use multi-source.
Can also be used to avoid transcoding.

BUG: 296000

6 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Mon, 12 Mar 2012 08:31:17 +0000 (09:31 +0100)]
SVN_SILENT made messages (.desktop file)

6 years agoThe code was wrong, the first parameter after the text in a i18ncp call needs> to...
Yuri Chornoivan [Fri, 9 Mar 2012 19:07:36 +0000 (21:07 +0200)]
The code was wrong, the first parameter after the text in a i18ncp call needs> to be the count.

6 years agoTranscoding::Property: remove NUMERIC, LIST, TEXT types
Matěj Laitl [Fri, 27 Jan 2012 14:32:28 +0000 (15:32 +0100)]
Transcoding::Property: remove NUMERIC, LIST, TEXT types

These types were not used since Teo reworked all encoders to use the
TRADEOFF type. Remove them and associated code to make codebase cleaner
so that new code doesn't need to introduce case statements in switches
that will be never used, thus error-prone.

Individual types can be resurrected from this commit if there is a need
for them in future.

6 years agoCollectionLocation: display source dialog in next mainloop iteration
Matěj Laitl [Mon, 5 Mar 2012 23:36:37 +0000 (00:36 +0100)]
CollectionLocation: display source dialog in next mainloop iteration

This is to make CollectionLocation::prepareCopy/Move() return fast as
it advertises and not after several seconds when a modal dialog is

6 years agoBetter "Really delete/trash/move" dialogs, include track title and artist
Matěj Laitl [Thu, 8 Mar 2012 21:36:40 +0000 (22:36 +0100)]
Better "Really delete/trash/move" dialogs, include track title and artist

This patch is heavily based on Ryan McCoskrie's <>
work in the review request, cleaned up and mover further by me.

BUG: 263693
REVIEW: 102236

6 years agoSVN_SILENT made messages (.desktop file)
Script Kiddy [Sun, 4 Mar 2012 08:18:34 +0000 (09:18 +0100)]
SVN_SILENT made messages (.desktop file)

6 years agoMemoryMeta::MapChanger optimisation: reduce album cover reads
Matěj Laitl [Fri, 10 Feb 2012 23:01:07 +0000 (00:01 +0100)]
MemoryMeta::MapChanger optimisation: reduce album cover reads

Now we read album image from underlying album only when there is not
yet an album image in MemoryMeta album. This should reduce album image
reads when there are multiple tracks in the same album.

6 years agoMemoryMeta::TrackChanger: don't call track->album() all the time
Matěj Laitl [Wed, 8 Feb 2012 16:23:08 +0000 (17:23 +0100)]
MemoryMeta::TrackChanger: don't call track->album() all the time

...but rather cache it in Meta::AlbumPtr trackAlbum. The previous was
both dangerous (we did not hold a reference) and potentially slow.

6 years agoAllow saving of file playlists with a dot in name
Matěj Laitl [Sat, 3 Mar 2012 15:03:29 +0000 (16:03 +0100)]
Allow saving of file playlists with a dot in name

 * Playlists with a dot in name can now be saved to Playlist Files on Disk.

BUG: 290318

6 years agoPlaylist browser: drag & drop and plugged playlists cleanups
Matěj Laitl [Sat, 3 Mar 2012 14:55:40 +0000 (15:55 +0100)]
Playlist browser: drag & drop and plugged playlists cleanups

This change fixes a couple of bugs:
 * it is now possible to drop tracks & playlists to playlist providers
   in Saved Playlists
 * When a new empty playlist provider appears or disappears when Amarok is
   running, the view is correctly updated.

  * "Crop playlist" functionality implemented using drag & drop.

  * Drag & drop of tracks and playlists to Saved Playlists works in all cases.

  * iPod playlists now appear even when plugged in while Amarok is running.

FEATURE: 267729
FEATURE: 211811
BUG: 289303
CCBUG: 239950