diff -Nru clementine-1.2.3-1237/debian/changelog clementine-1.2.3-1241/debian/changelog --- clementine-1.2.3-1237/debian/changelog 2015-07-06 09:05:53.000000000 +0000 +++ clementine-1.2.3-1241/debian/changelog 2015-07-06 11:27:12.000000000 +0000 @@ -1,5 +1,5 @@ -clementine (1.2.3-1237-gef41ae3~precise) precise; urgency=low +clementine (1.2.3-1241-gfbe310b~precise) precise; urgency=low - * Version 1.2.3-1237-gef41ae3 + * Version 1.2.3-1241-gfbe310b - -- David Sansome Mon, 6 Jul 2015 09:05:53 +0000 + -- David Sansome Mon, 6 Jul 2015 11:27:12 +0000 diff -Nru clementine-1.2.3-1237/debian/rules clementine-1.2.3-1241/debian/rules --- clementine-1.2.3-1237/debian/rules 2015-07-06 09:05:53.000000000 +0000 +++ clementine-1.2.3-1241/debian/rules 2015-07-06 11:27:12.000000000 +0000 @@ -13,7 +13,7 @@ cd bin && cmake .. \ -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/clementine/usr \ -DBUNDLE_PROJECTM_PRESETS=OFF \ - -DFORCE_GIT_REVISION=1.2.3-1237-gef41ae3 + -DFORCE_GIT_REVISION=1.2.3-1241-gfbe310b touch configure-stamp build: build-stamp diff -Nru clementine-1.2.3-1237/dist/clementine.spec clementine-1.2.3-1241/dist/clementine.spec --- clementine-1.2.3-1237/dist/clementine.spec 2015-07-06 09:05:53.000000000 +0000 +++ clementine-1.2.3-1241/dist/clementine.spec 2015-07-06 11:27:12.000000000 +0000 @@ -1,12 +1,12 @@ Name: clementine Version: 1.2.3 -Release: 2.1237.gef41ae3.fc13 +Release: 2.1241.gfbe310b.fc13 Summary: A music player and library organiser Group: Applications/Multimedia License: GPLv3 URL: http://www.clementine-player.org/ -Source0: %{name}-1.2.3-1237-gef41ae3.tar.gz +Source0: %{name}-1.2.3-1241-gfbe310b.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils liblastfm-devel taglib-devel gettext @@ -56,7 +56,7 @@ * Queue manager %prep -%setup -q -n %{name}-1.2.3-1237-gef41ae3 +%setup -q -n %{name}-1.2.3-1241-gfbe310b %build @@ -92,4 +92,4 @@ %changelog * Mon Jul 06 2015 David Sansome - 1.2.3 -- Version 1.2.3-1237-gef41ae3 +- Version 1.2.3-1241-gfbe310b diff -Nru clementine-1.2.3-1237/dist/Info.plist clementine-1.2.3-1241/dist/Info.plist --- clementine-1.2.3-1237/dist/Info.plist 2015-07-06 09:05:53.000000000 +0000 +++ clementine-1.2.3-1241/dist/Info.plist 2015-07-06 11:27:12.000000000 +0000 @@ -9,7 +9,7 @@ CFBundleExecutable clementine CFBundleGetInfoString - Clementine 1.2.3-1237-gef41ae3 + Clementine 1.2.3-1241-gfbe310b CFBundleIconFile clementine CFBundleIdentifier @@ -17,15 +17,15 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString - 1.2.3-1237-gef41ae3 + 1.2.3-1241-gfbe310b CFBundleName Clementine CFBundlePackageType APPL CFBundleShortVersionString - 1.2.3-1237-gef41ae3 + 1.2.3-1241-gfbe310b CFBundleVersion - 4096.1.2.3.2.1237 + 4096.1.2.3.2.1241 CSResourcesFileMapped LSRequiresCarbon diff -Nru clementine-1.2.3-1237/dist/maketarball.sh clementine-1.2.3-1241/dist/maketarball.sh --- clementine-1.2.3-1237/dist/maketarball.sh 2015-07-06 09:05:53.000000000 +0000 +++ clementine-1.2.3-1241/dist/maketarball.sh 2015-07-06 11:27:12.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/bash name=clementine -version="1.2.3-1237-gef41ae3" +version="1.2.3-1241-gfbe310b" deb_dist="precise" root=$(cd "${0%/*}/.." && echo $PWD/${0##*/}) root=`dirname "$root"` diff -Nru clementine-1.2.3-1237/dist/windows/clementine.nsi clementine-1.2.3-1241/dist/windows/clementine.nsi --- clementine-1.2.3-1237/dist/windows/clementine.nsi 2015-07-06 09:05:53.000000000 +0000 +++ clementine-1.2.3-1241/dist/windows/clementine.nsi 2015-07-06 11:27:12.000000000 +0000 @@ -3,8 +3,8 @@ !define PRODUCT_PUBLISHER "Clementine" !define PRODUCT_VERSION_MAJOR 1 !define PRODUCT_VERSION_MINOR 2 -!define PRODUCT_DISPLAY_VERSION "1.2.3-1237-gef41ae3" -!define PRODUCT_DISPLAY_VERSION_SHORT "1.2.3-1237-gef41ae3" +!define PRODUCT_DISPLAY_VERSION "1.2.3-1241-gfbe310b" +!define PRODUCT_DISPLAY_VERSION_SHORT "1.2.3-1241-gfbe310b" !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.2.3-1237-gef41ae3.exe" +OutFile "${PRODUCT_NAME}Setup-1.2.3-1241-gfbe310b.exe" InstallDir "${PRODUCT_INSTALL_DIR}" ; Get the path where Clementine was installed previously and set it as default path diff -Nru clementine-1.2.3-1237/dist/windows/clementine-portable.nsi clementine-1.2.3-1241/dist/windows/clementine-portable.nsi --- clementine-1.2.3-1237/dist/windows/clementine-portable.nsi 2015-07-06 09:05:53.000000000 +0000 +++ clementine-1.2.3-1241/dist/windows/clementine-portable.nsi 2015-07-06 11:27:12.000000000 +0000 @@ -3,8 +3,8 @@ !define PRODUCT_PUBLISHER "Clementine" !define PRODUCT_VERSION_MAJOR 1 !define PRODUCT_VERSION_MINOR 2 -!define PRODUCT_DISPLAY_VERSION "1.2.3-1237-gef41ae3" -!define PRODUCT_DISPLAY_VERSION_SHORT "1.2.3-1237-gef41ae3" +!define PRODUCT_DISPLAY_VERSION "1.2.3-1241-gfbe310b" +!define PRODUCT_DISPLAY_VERSION_SHORT "1.2.3-1241-gfbe310b" !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.2.3-1237-gef41ae3.exe" +OutFile "${PRODUCT_NAME}Setup-1.2.3-1241-gfbe310b.exe" InstallDir "${PRODUCT_INSTALL_DIR}" ; Get the path where Clementine was installed previously and set it as default path diff -Nru clementine-1.2.3-1237/src/engines/gstenginepipeline.cpp clementine-1.2.3-1241/src/engines/gstenginepipeline.cpp --- clementine-1.2.3-1237/src/engines/gstenginepipeline.cpp 2015-07-06 09:05:51.000000000 +0000 +++ clementine-1.2.3-1241/src/engines/gstenginepipeline.cpp 2015-07-06 11:27:09.000000000 +0000 @@ -391,11 +391,10 @@ // add caps for mono, but only if requested if (mono_playback_) { - GstCaps* caps32 = gst_caps_new_simple("audio/x-raw", "format", - G_TYPE_STRING, "S32LE", nullptr); - gst_caps_set_simple(caps32, "channels", G_TYPE_INT, 1, nullptr); - gst_element_link_filtered(convert, audiosink_, caps32); - gst_caps_unref(caps32); + GstCaps* capsmono = gst_caps_new_simple("audio/x-raw", "channels", + G_TYPE_INT, 1, nullptr); + gst_element_link_filtered(convert, audiosink_, capsmono); + gst_caps_unref(capsmono); } else { gst_element_link(convert, audiosink_); } diff -Nru clementine-1.2.3-1237/src/widgets/osdpretty.cpp clementine-1.2.3-1241/src/widgets/osdpretty.cpp --- clementine-1.2.3-1237/src/widgets/osdpretty.cpp 2015-07-06 09:05:51.000000000 +0000 +++ clementine-1.2.3-1241/src/widgets/osdpretty.cpp 2015-07-06 11:27:09.000000000 +0000 @@ -317,8 +317,14 @@ int y = popup_pos_.y() < 0 ? geometry.bottom() - height() : geometry.top() + popup_pos_.y(); - move(qBound(0, x, geometry.right() - width()), - qBound(0, y, geometry.bottom() - height())); +#ifndef Q_OS_WIN32 + // windows needs negative coordinates for monitors + // to the left or above the primary + x = qBound(0, x, geometry.right() - width()); + y = qBound(0, y, geometry.bottom() - height()); +#endif + + move(x, y); // Create a mask for the actual area of the OSD QBitmap mask(size());