diff -Nru clementine-1.3.1-223/debian/changelog clementine-1.3.1-228/debian/changelog
--- clementine-1.3.1-223/debian/changelog 2016-08-01 10:05:54.000000000 +0000
+++ clementine-1.3.1-228/debian/changelog 2016-08-28 10:45:25.000000000 +0000
@@ -1,5 +1,5 @@
-clementine (1.3.1-223-g0b5fb0c~xenial) xenial; urgency=low
+clementine (1.3.1-228-gd9b3a93~xenial) xenial; urgency=low
- * Version 1.3.1-223-g0b5fb0c
+ * Version 1.3.1-228-gd9b3a93
- -- David Sansome Mon, 1 Aug 2016 10:05:54 +0000
+ -- David Sansome Sun, 28 Aug 2016 10:45:25 +0000
diff -Nru clementine-1.3.1-223/debian/rules clementine-1.3.1-228/debian/rules
--- clementine-1.3.1-223/debian/rules 2016-08-01 10:05:54.000000000 +0000
+++ clementine-1.3.1-228/debian/rules 2016-08-28 10:45:25.000000000 +0000
@@ -13,7 +13,7 @@
cd bin && cmake .. \
-DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/clementine/usr \
-DBUNDLE_PROJECTM_PRESETS=OFF \
- -DFORCE_GIT_REVISION=1.3.1-223-g0b5fb0c
+ -DFORCE_GIT_REVISION=1.3.1-228-gd9b3a93
touch configure-stamp
build: build-stamp
diff -Nru clementine-1.3.1-223/dist/clementine.spec clementine-1.3.1-228/dist/clementine.spec
--- clementine-1.3.1-223/dist/clementine.spec 2016-08-01 10:05:54.000000000 +0000
+++ clementine-1.3.1-228/dist/clementine.spec 2016-08-28 10:45:25.000000000 +0000
@@ -1,12 +1,12 @@
Name: clementine
Version: 1.3.1
-Release: 2.223.g0b5fb0c%{?dist}
+Release: 2.228.gd9b3a93%{?dist}
Summary: A music player and library organiser
Group: Applications/Multimedia
License: GPLv3
URL: http://www.clementine-player.org/
-Source0: %{name}-1.3.1-223-g0b5fb0c.tar.xz
+Source0: %{name}-1.3.1-228-gd9b3a93.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils liblastfm-devel taglib-devel gettext
@@ -57,7 +57,7 @@
* Queue manager
%prep
-%setup -q -n %{name}-1.3.1-223-g0b5fb0c
+%setup -q -n %{name}-1.3.1-228-gd9b3a93
%build
@@ -92,5 +92,5 @@
%{_datadir}/icons/hicolor/scalable/apps/clementine.svg
%changelog
-* Mon Aug 01 2016 David Sansome - 1.3.1
-- Version 1.3.1-223-g0b5fb0c
+* Sun Aug 28 2016 David Sansome - 1.3.1
+- Version 1.3.1-228-gd9b3a93
diff -Nru clementine-1.3.1-223/dist/Info.plist clementine-1.3.1-228/dist/Info.plist
--- clementine-1.3.1-223/dist/Info.plist 2016-08-01 10:05:54.000000000 +0000
+++ clementine-1.3.1-228/dist/Info.plist 2016-08-28 10:45:25.000000000 +0000
@@ -9,7 +9,7 @@
CFBundleExecutable
clementine
CFBundleGetInfoString
- Clementine 1.3.1-223-g0b5fb0c
+ Clementine 1.3.1-228-gd9b3a93
CFBundleIconFile
clementine
CFBundleIdentifier
@@ -17,15 +17,15 @@
CFBundleInfoDictionaryVersion
6.0
CFBundleLongVersionString
- 1.3.1-223-g0b5fb0c
+ 1.3.1-228-gd9b3a93
CFBundleName
Clementine
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.3.1-223-g0b5fb0c
+ 1.3.1-228-gd9b3a93
CFBundleVersion
- 4096.1.3.1.2.223
+ 4096.1.3.1.2.228
CSResourcesFileMapped
LSRequiresCarbon
diff -Nru clementine-1.3.1-223/dist/maketarball.sh clementine-1.3.1-228/dist/maketarball.sh
--- clementine-1.3.1-223/dist/maketarball.sh 2016-08-01 10:05:54.000000000 +0000
+++ clementine-1.3.1-228/dist/maketarball.sh 2016-08-28 10:45:25.000000000 +0000
@@ -1,7 +1,7 @@
#!/bin/bash
name=clementine
-version="1.3.1-223-g0b5fb0c"
+version="1.3.1-228-gd9b3a93"
deb_dist="xenial"
root=$(cd "${0%/*}/.." && echo $PWD/${0##*/})
root=`dirname "$root"`
diff -Nru clementine-1.3.1-223/dist/windows/clementine.nsi clementine-1.3.1-228/dist/windows/clementine.nsi
--- clementine-1.3.1-223/dist/windows/clementine.nsi 2016-08-01 10:05:54.000000000 +0000
+++ clementine-1.3.1-228/dist/windows/clementine.nsi 2016-08-28 10:45:25.000000000 +0000
@@ -3,8 +3,8 @@
!define PRODUCT_PUBLISHER "Clementine"
!define PRODUCT_VERSION_MAJOR 1
!define PRODUCT_VERSION_MINOR 3
-!define PRODUCT_DISPLAY_VERSION "1.3.1-223-g0b5fb0c"
-!define PRODUCT_DISPLAY_VERSION_SHORT "1.3.1-223-g0b5fb0c"
+!define PRODUCT_DISPLAY_VERSION "1.3.1-228-gd9b3a93"
+!define PRODUCT_DISPLAY_VERSION_SHORT "1.3.1-228-gd9b3a93"
!define PRODUCT_WEB_SITE "http://www.clementine-player.org/"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -104,7 +104,7 @@
!insertmacro MUI_LANGUAGE "Esperanto"
Name "${PRODUCT_NAME}"
-OutFile "${PRODUCT_NAME}Setup-1.3.1-223-g0b5fb0c.exe"
+OutFile "${PRODUCT_NAME}Setup-1.3.1-228-gd9b3a93.exe"
InstallDir "${PRODUCT_INSTALL_DIR}"
; Get the path where Clementine was installed previously and set it as default path
diff -Nru clementine-1.3.1-223/dist/windows/clementine-portable.nsi clementine-1.3.1-228/dist/windows/clementine-portable.nsi
--- clementine-1.3.1-223/dist/windows/clementine-portable.nsi 2016-08-01 10:05:54.000000000 +0000
+++ clementine-1.3.1-228/dist/windows/clementine-portable.nsi 2016-08-28 10:45:25.000000000 +0000
@@ -3,8 +3,8 @@
!define PRODUCT_PUBLISHER "Clementine"
!define PRODUCT_VERSION_MAJOR 1
!define PRODUCT_VERSION_MINOR 3
-!define PRODUCT_DISPLAY_VERSION "1.3.1-223-g0b5fb0c"
-!define PRODUCT_DISPLAY_VERSION_SHORT "1.3.1-223-g0b5fb0c"
+!define PRODUCT_DISPLAY_VERSION "1.3.1-228-gd9b3a93"
+!define PRODUCT_DISPLAY_VERSION_SHORT "1.3.1-228-gd9b3a93"
!define PRODUCT_WEB_SITE "http://www.clementine-player.org/"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -104,7 +104,7 @@
!insertmacro MUI_LANGUAGE "Esperanto"
Name "${PRODUCT_NAME}"
-OutFile "${PRODUCT_NAME}Setup-1.3.1-223-g0b5fb0c.exe"
+OutFile "${PRODUCT_NAME}Setup-1.3.1-228-gd9b3a93.exe"
InstallDir "${PRODUCT_INSTALL_DIR}"
; Get the path where Clementine was installed previously and set it as default path
diff -Nru clementine-1.3.1-223/src/core/commandlineoptions.cpp clementine-1.3.1-228/src/core/commandlineoptions.cpp
--- clementine-1.3.1-223/src/core/commandlineoptions.cpp 2016-08-01 10:05:47.000000000 +0000
+++ clementine-1.3.1-228/src/core/commandlineoptions.cpp 2016-08-28 10:45:18.000000000 +0000
@@ -55,18 +55,19 @@
" --restart-or-previous %19\n"
"\n"
"%20:\n"
- " -a, --append %21\n"
- " -l, --load %22\n"
- " -k, --play-track %23\n"
+ " -c, --create %21\n"
+ " -a, --append %22\n"
+ " -l, --load %23\n"
+ " -k, --play-track %24\n"
"\n"
- "%24:\n"
- " -o, --show-osd %25\n"
- " -y, --toggle-pretty-osd %26\n"
- " -g, --language %27\n"
- " --quiet %28\n"
- " --verbose %29\n"
- " --log-levels %30\n"
- " --version %31\n";
+ "%25:\n"
+ " -o, --show-osd %26\n"
+ " -y, --toggle-pretty-osd %27\n"
+ " -g, --language %28\n"
+ " --quiet %29\n"
+ " --verbose %30\n"
+ " --log-levels %31\n"
+ " --version %32\n";
const char* CommandlineOptions::kVersionText = "Clementine %1";
@@ -123,6 +124,7 @@
{"seek-to", required_argument, 0, SeekTo},
{"seek-by", required_argument, 0, SeekBy},
{"restart-or-previous", no_argument, 0, RestartOrPrevious},
+ {"create", required_argument, 0, 'c'},
{"append", no_argument, 0, 'a'},
{"load", no_argument, 0, 'l'},
{"play-track", required_argument, 0, 'k'},
@@ -138,7 +140,7 @@
// Parse the arguments
bool ok = false;
forever {
- int c = getopt_long(argc_, argv_, "hptusqrfv:alk:oyg:", kOptions, nullptr);
+ int c = getopt_long(argc_, argv_, "hptusqrfv:c:alk:oyg:", kOptions, nullptr);
// End of the options
if (c == -1) break;
@@ -167,6 +169,7 @@
tr("Restart the track, or play the previous track if "
"within 8 seconds of start."),
tr("Playlist options"),
+ tr("Create a new playlist with files/URLs"),
tr("Append files/URLs to the playlist"),
tr("Loads files/URLs, replacing current playlist"),
tr("Play the th track in the playlist"))
@@ -203,6 +206,10 @@
case 'f':
player_action_ = Player_Next;
break;
+ case 'c':
+ url_list_action_ = UrlList_CreateNew;
+ playlist_name_ = QString(optarg);
+ break;
case 'a':
url_list_action_ = UrlList_Append;
break;
diff -Nru clementine-1.3.1-223/src/core/commandlineoptions.h clementine-1.3.1-228/src/core/commandlineoptions.h
--- clementine-1.3.1-223/src/core/commandlineoptions.h 2016-08-01 10:05:47.000000000 +0000
+++ clementine-1.3.1-228/src/core/commandlineoptions.h 2016-08-28 10:45:18.000000000 +0000
@@ -44,6 +44,7 @@
UrlList_Append = 0,
UrlList_Load = 1,
UrlList_None = 2,
+ UrlList_CreateNew = 3,
};
enum PlayerAction {
Player_None = 0,
@@ -74,6 +75,7 @@
QList urls() const { return urls_; }
QString language() const { return language_; }
QString log_levels() const { return log_levels_; }
+ QString playlist_name() const { return playlist_name_; }
QByteArray Serialize() const;
void Load(const QByteArray& serialized);
@@ -115,6 +117,7 @@
bool toggle_pretty_osd_;
QString language_;
QString log_levels_;
+ QString playlist_name_;
QList urls_;
};
diff -Nru clementine-1.3.1-223/src/library/librarymodel.cpp clementine-1.3.1-228/src/library/librarymodel.cpp
--- clementine-1.3.1-223/src/library/librarymodel.cpp 2016-08-01 10:05:47.000000000 +0000
+++ clementine-1.3.1-228/src/library/librarymodel.cpp 2016-08-28 10:45:18.000000000 +0000
@@ -537,9 +537,9 @@
QPixmapCache::insert(cache_key, QPixmap::fromImage(image));
}
- // if not already in the disk cache
+ // If we have a valid cover not already in the disk cache
std::unique_ptr cached_img(icon_cache_->data(QUrl(cache_key)));
- if (!cached_img) {
+ if (!cached_img && !image.isNull()) {
QNetworkCacheMetaData item_metadata;
item_metadata.setSaveToDisk(true);
item_metadata.setUrl(QUrl(cache_key));
diff -Nru clementine-1.3.1-223/src/playlist/playlist.cpp clementine-1.3.1-228/src/playlist/playlist.cpp
--- clementine-1.3.1-223/src/playlist/playlist.cpp 2016-08-01 10:05:47.000000000 +0000
+++ clementine-1.3.1-228/src/playlist/playlist.cpp 2016-08-28 10:45:18.000000000 +0000
@@ -1417,6 +1417,8 @@
undo_stack_->push(
new PlaylistUndoCommands::SortItems(this, column, order, new_items));
+
+ ReshuffleIndices();
}
void Playlist::ReOrderWithoutUndo(const PlaylistItemList& new_items) {
diff -Nru clementine-1.3.1-223/src/translations/da.po clementine-1.3.1-228/src/translations/da.po
--- clementine-1.3.1-223/src/translations/da.po 2016-08-01 10:05:47.000000000 +0000
+++ clementine-1.3.1-228/src/translations/da.po 2016-08-28 10:45:18.000000000 +0000
@@ -18,8 +18,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Clementine Music Player\n"
-"PO-Revision-Date: 2016-07-25 11:07+0000\n"
-"Last-Translator: Clementine Buildbot \n"
+"PO-Revision-Date: 2016-08-16 17:46+0000\n"
+"Last-Translator: Joe Hansen \n"
"Language-Team: Danish (http://www.transifex.com/davidsansome/clementine/language/da/)\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -88,7 +88,7 @@
#: widgets/equalizerslider.cpp:43
#, qt-format
msgid "%1 dB"
-msgstr ""
+msgstr "%1 dB"
#: core/utilities.cpp:120
#, qt-format
@@ -201,7 +201,7 @@
#: ../bin/src/ui_edittagdialog.h:728
msgid "&Grouping"
-msgstr ""
+msgstr "&Gruppering"
#: ../bin/src/ui_mainwindow.h:717
msgid "&Help"
@@ -214,7 +214,7 @@
#: playlist/playlistheader.cpp:33
msgid "&Hide..."
-msgstr "Skjul..."
+msgstr "Skjul ..."
#: playlist/playlistheader.cpp:47
msgid "&Left"
@@ -226,7 +226,7 @@
#: ../bin/src/ui_edittagdialog.h:731
msgid "&Lyrics"
-msgstr ""
+msgstr "&Sangtekster"
#: ../bin/src/ui_mainwindow.h:715
msgid "&Music"
@@ -238,7 +238,7 @@
#: ../bin/src/ui_mainwindow.h:716
msgid "&Playlist"
-msgstr "Spilleliste"
+msgstr "&Afspilningsliste"
#: ../bin/src/ui_mainwindow.h:662
msgid "&Quit"
@@ -266,7 +266,7 @@
#: ../bin/src/ui_edittagdialog.h:724
msgid "&Year"
-msgstr ""
+msgstr "&År"
#: ui/edittagdialog.cpp:50
msgid "(different across multiple songs)"
@@ -278,7 +278,7 @@
#: ui/about.cpp:84
msgid "...and all the Amarok contributors"
-msgstr "...og alle Amarok-bidragsyderne"
+msgstr "... og alle Amarok-bidragsyderne"
#: ../bin/src/ui_albumcovermanager.h:222 ../bin/src/ui_albumcovermanager.h:223
msgid "0"
@@ -341,7 +341,7 @@
"directly into the file each time they changed.
Please note it might "
"not work for every format and, as there is no standard for doing so, other "
"music players might not be able to read them.