diff --git a/3rdparty/qocoa/CMakeLists.txt b/3rdparty/qocoa/CMakeLists.txt
index b3b7fa4aa..62766b3be 100644
--- a/3rdparty/qocoa/CMakeLists.txt
+++ b/3rdparty/qocoa/CMakeLists.txt
@@ -1,3 +1,6 @@
+cmake_minimum_required(VERSION 2.8.11)
+set(CMAKE_CXX_STANDARD 11)
+
set(SOURCES)
set(HEADERS
@@ -26,7 +29,5 @@ else()
qt5_add_resources(RESOURCES_SOURCES ${RESOURCES})
endif()
-add_library(Qocoa STATIC
- ${SOURCES} ${MOC_SOURCES} ${RESOURCES_SOURCES}
-)
+add_library(Qocoa STATIC ${SOURCES} ${MOC_SOURCES} ${RESOURCES_SOURCES})
target_link_libraries(Qocoa ${QT_LIBRARIES})
diff --git a/3rdparty/qtsingleapplication/CMakeLists.txt b/3rdparty/qtsingleapplication/CMakeLists.txt
index e7639b3f6..e3336e603 100644
--- a/3rdparty/qtsingleapplication/CMakeLists.txt
+++ b/3rdparty/qtsingleapplication/CMakeLists.txt
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 2.8.11)
+set(CMAKE_CXX_STANDARD 11)
set(SINGLEAPP-SOURCES
qtlocalpeer.cpp
diff --git a/3rdparty/qtwin/CMakeLists.txt b/3rdparty/qtwin/CMakeLists.txt
index 9122be354..1c2f27676 100644
--- a/3rdparty/qtwin/CMakeLists.txt
+++ b/3rdparty/qtwin/CMakeLists.txt
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 2.8.11)
+set(CMAKE_CXX_STANDARD 11)
set(QTWIN-SOURCES
qtwin.cpp
diff --git a/3rdparty/qxt/CMakeLists.txt b/3rdparty/qxt/CMakeLists.txt
index 9f56983c3..8fd9220ae 100644
--- a/3rdparty/qxt/CMakeLists.txt
+++ b/3rdparty/qxt/CMakeLists.txt
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 2.8.11)
+set(CMAKE_CXX_STANDARD 11)
set(QXT-SOURCES
qxtglobal.cpp
diff --git a/3rdparty/sha2/CMakeLists.txt b/3rdparty/sha2/CMakeLists.txt
index 6b86048d1..b4e0cf16e 100644
--- a/3rdparty/sha2/CMakeLists.txt
+++ b/3rdparty/sha2/CMakeLists.txt
@@ -1,3 +1,4 @@
cmake_minimum_required(VERSION 2.8.11)
+set(CMAKE_CXX_STANDARD 11)
add_library(sha2 STATIC sha2.cpp)
diff --git a/3rdparty/taglib/CMakeLists.txt b/3rdparty/taglib/CMakeLists.txt
index c6c741ee6..1ee3e8576 100644
--- a/3rdparty/taglib/CMakeLists.txt
+++ b/3rdparty/taglib/CMakeLists.txt
@@ -1,3 +1,5 @@
+cmake_minimum_required(VERSION 2.8.11)
+set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-non-virtual-dtor")
set(TAGLIB_SOVERSION_CURRENT 17)
diff --git a/3rdparty/utf8-cpp/CMakeLists.txt b/3rdparty/utf8-cpp/CMakeLists.txt
index 851745b4c..e438780c8 100644
--- a/3rdparty/utf8-cpp/CMakeLists.txt
+++ b/3rdparty/utf8-cpp/CMakeLists.txt
@@ -1 +1,2 @@
cmake_minimum_required(VERSION 2.8.11)
+set(CMAKE_CXX_STANDARD 11)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f49280251..fd451d965 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,9 +29,19 @@ include(cmake/Summary.cmake)
include(cmake/OptionalSource.cmake)
include(cmake/Rpm.cmake)
-#set(CMAKE_BUILD_TYPE Debug)
+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+ set(LINUX 1)
+endif()
+if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
+ set(FREEBSD 1)
+endif()
+if (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+ set(OPENBSD 1)
+endif()
+set(CMAKE_CXX_STANDARD 11)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+#set(CMAKE_BUILD_TYPE Debug)
if(${CMAKE_BUILD_TYPE} MATCHES "Release")
add_definitions(-DNDEBUG)
@@ -42,11 +52,11 @@ endif(${CMAKE_BUILD_TYPE} MATCHES "Release")
if (CMAKE_CXX_COMPILER MATCHES ".*clang")
set(CMAKE_COMPILER_IS_CLANGXX 1)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-uninitialized")
-endif ()
+endif()
if (APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --stdlib=libc++")
-endif ()
+endif(APPLE)
find_program(CCACHE_EXECUTABLE NAMES ccache)
if (CCACHE_EXECUTABLE)
@@ -57,10 +67,6 @@ endif ()
find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5 PATHS ${QT_BINARY_DIR} NO_DEFAULT_PATH)
find_program(QT_LCONVERT_EXECUTABLE NAMES lconvert lconvert-qt5)
-if (UNIX AND NOT APPLE)
- set(LINUX 1)
-endif (UNIX AND NOT APPLE)
-
find_package(PkgConfig REQUIRED)
pkg_check_modules(GLIB REQUIRED glib-2.0)
pkg_check_modules(GIO REQUIRED gio-2.0)
@@ -72,7 +78,12 @@ find_package(Protobuf REQUIRED)
find_library(PROTOBUF_STATIC_LIBRARY libprotobuf.a libprotobuf)
if(LINUX)
find_package(ALSA REQUIRED)
+else(LINUX)
+ find_package(ALSA)
endif(LINUX)
+if(ALSA_FOUND)
+ set(HAVE_ALSA ON)
+endif()
find_package(X11)
pkg_check_modules(GSTREAMER gstreamer-1.0)
pkg_check_modules(GSTREAMER_BASE gstreamer-base-1.0)
@@ -95,9 +106,9 @@ pkg_check_modules(IMOBILEDEVICE libimobiledevice-1.0)
pkg_check_modules(USBMUXD libusbmuxd)
pkg_check_modules(PLIST libplist)
-if (WIN32)
+if(WIN32)
find_package(ZLIB REQUIRED)
-endif (WIN32)
+endif(WIN32)
# QT
set(QT_MIN_VERSION 5.6.0)
@@ -223,7 +234,7 @@ optional_component(LIBGPOD ON "Devices: iPod classic support"
optional_component(GIO ON "Devices: GIO device backend"
DEPENDS "libgio" GIO_FOUND
- DEPENDS "Linux or Windows" "NOT APPLE"
+ DEPENDS "Unix or Windows" "NOT APPLE"
)
optional_component(IMOBILEDEVICE ON "Devices: iPod Touch, iPhone, iPad support"
@@ -242,7 +253,7 @@ optional_component(LIBLASTFM ON "Last.fm support"
)
optional_component(DBUS ON "D-Bus support"
- DEPENDS "Linux" LINUX
+ DEPENDS "Unix" "NOT APPLE"
)
optional_component(DEVICEKIT ON "Devices: DeviceKit backend"
@@ -326,6 +337,7 @@ else (USE_SYSTEM_QXT)
endif (USE_SYSTEM_QXT)
# Qocoa
+set(QOCOA_LIBRARIES Qocoa)
add_subdirectory(3rdparty/qocoa)
#if(IMOBILEDEVICE_FOUND AND PLIST_FOUND)
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 25145dd18..6e6bf7c15 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -3,7 +3,7 @@ set(STRAWBERRY_VERSION_MINOR 1)
set(STRAWBERRY_VERSION_PATCH 3)
#set(STRAWBERRY_VERSION_PRERELEASE rc1)
-set(INCLUDE_GIT_REVISION OFF)
+set(INCLUDE_GIT_REVISION ON)
set(majorminorpatch "${STRAWBERRY_VERSION_MAJOR}.${STRAWBERRY_VERSION_MINOR}.${STRAWBERRY_VERSION_PATCH}")
diff --git a/data/data.qrc b/data/data.qrc
index 82dce9556..386868118 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -1,583 +1,480 @@
-
schema/schema.sql
schema/device-schema.sql
-
style/mainwindow.css
style/statusview.css
-
- misc/blank.ttf
misc/playing_tooltip.txt
-
pictures/strawberry.png
- pictures/strawbs-transparent.png
-
+ pictures/strawbs-transparent.png
pictures/noalbumart.png
pictures/nomusic.png
pictures/musicbrainz.png
pictures/tiny-play.png
pictures/tiny-pause.png
- pictures/spinner.gif
-
+ pictures/spinner.gif
pictures/volumeslider-gradient.png
pictures/volumeslider-handle_glow.png
pictures/volumeslider-handle.png
pictures/volumeslider-inset.png
-
pictures/currenttrack_play.png
pictures/currenttrack_pause.png
pictures/currenttrack_bar_left.png
pictures/currenttrack_bar_mid.png
pictures/currenttrack_bar_right.png
-
pictures/osd_background.png
pictures/osd_shadow_corner.png
pictures/osd_shadow_edge.png
-
-icons/full/albums.png
-icons/full/alsa.png
-icons/full/application-exit.png
-icons/full/applications-internet.png
-icons/full/bluetooth.png
-icons/full/cdcase.png
-icons/full/cd.png
-icons/full/configure.png
-icons/full/device-ipod-nano.png
-icons/full/device-ipod.png
-icons/full/device-phone.png
-icons/full/device.png
-icons/full/device-usb-drive.png
-icons/full/device-usb-flash.png
-icons/full/dialog-error.png
-icons/full/dialog-information.png
-icons/full/dialog-ok-apply.png
-icons/full/dialog-password.png
-icons/full/dialog-warning.png
-icons/full/document-download.png
-icons/full/document-new.png
-icons/full/document-open-folder.png
-icons/full/document-open.png
-icons/full/document-save.png
-icons/full/document-search.png
-icons/full/download.png
-icons/full/edit-clear-list.png
-icons/full/edit-clear-locationbar-ltr.png
-icons/full/edit-copy.png
-icons/full/edit-delete.png
-icons/full/edit-find.png
-icons/full/edit-redo.png
-icons/full/edit-rename.png
-icons/full/edit-undo.png
-icons/full/electrocompaniet.png
-icons/full/equalizer.png
-icons/full/folder-new.png
-icons/full/folder.png
-icons/full/folder-sound.png
-icons/full/footsteps.png
-icons/full/go-down.png
-icons/full/go-home.png
-icons/full/go-jump.png
-icons/full/go-next.png
-icons/full/go-previous.png
-icons/full/go-up.png
-icons/full/gstreamer.png
-icons/full/guitar.png
-icons/full/headset.png
-icons/full/help-hint.png
-icons/full/intel.png
-icons/full/jack.png
-icons/full/keyboard.png
-icons/full/list-add.png
-icons/full/list-remove.png
-icons/full/mcintosh-player.png
-icons/full/mcintosh.png
-icons/full/mcintosh-text.png
-icons/full/media-eject.png
-icons/full/media-forward.png
-icons/full/media-pause.png
-icons/full/media-playlist-repeat.png
-icons/full/media-playlist-shuffle.png
-icons/full/media-play.png
-icons/full/media-rewind.png
-icons/full/media-stop.png
-icons/full/nvidia.png
-icons/full/play2.png
-icons/full/pulseaudio.png
-icons/full/realtek.png
-icons/full/search.png
-icons/full/soundcard2.png
-icons/full/soundcard.png
-icons/full/speaker.png
-icons/full/star-grey.png
-icons/full/star.png
-icons/full/strawberry-panel-grey.png
-icons/full/strawberry-panel.png
-icons/full/strawberry.png
-icons/full/strawberry.svg
-icons/full/tools-wizard.png
-icons/full/view-choose.png
-icons/full/view-fullscreen.png
-icons/full/view-media-lyrics.png
-icons/full/view-media-playlist.png
-icons/full/view-media-visualization.png
-icons/full/view-refresh.png
-icons/full/vinyl.png
-icons/full/vlc.png
-icons/full/xine.png
-icons/full/zoom-in.png
-icons/full/zoom-out.png
-icons/128x128/albums.png
-icons/128x128/alsa.png
-icons/128x128/application-exit.png
-icons/128x128/applications-internet.png
-icons/128x128/bluetooth.png
-icons/128x128/cdcase.png
-icons/128x128/cd.png
-icons/128x128/configure.png
-icons/128x128/device-ipod-nano.png
-icons/128x128/device-ipod.png
-icons/128x128/device-phone.png
-icons/128x128/device.png
-icons/128x128/device-usb-drive.png
-icons/128x128/device-usb-flash.png
-icons/128x128/dialog-error.png
-icons/128x128/dialog-information.png
-icons/128x128/dialog-ok-apply.png
-icons/128x128/dialog-password.png
-icons/128x128/dialog-warning.png
-icons/128x128/document-download.png
-icons/128x128/document-new.png
-icons/128x128/document-open-folder.png
-icons/128x128/document-open.png
-icons/128x128/document-save.png
-icons/128x128/document-search.png
-icons/128x128/download.png
-icons/128x128/edit-clear-list.png
-icons/128x128/edit-clear-locationbar-ltr.png
-icons/128x128/edit-copy.png
-icons/128x128/edit-delete.png
-icons/128x128/edit-find.png
-icons/128x128/edit-redo.png
-icons/128x128/edit-rename.png
-icons/128x128/edit-undo.png
-icons/128x128/electrocompaniet.png
-icons/128x128/equalizer.png
-icons/128x128/folder-new.png
-icons/128x128/folder.png
-icons/128x128/folder-sound.png
-icons/128x128/footsteps.png
-icons/128x128/go-down.png
-icons/128x128/go-home.png
-icons/128x128/go-jump.png
-icons/128x128/go-next.png
-icons/128x128/go-previous.png
-icons/128x128/go-up.png
-icons/128x128/gstreamer.png
-icons/128x128/guitar.png
-icons/128x128/headset.png
-icons/128x128/help-hint.png
-icons/128x128/intel.png
-icons/128x128/jack.png
-icons/128x128/keyboard.png
-icons/128x128/list-add.png
-icons/128x128/list-remove.png
-icons/128x128/mcintosh-player.png
-icons/128x128/mcintosh-text.png
-icons/128x128/media-eject.png
-icons/128x128/media-forward.png
-icons/128x128/media-pause.png
-icons/128x128/media-play.png
-icons/128x128/media-rewind.png
-icons/128x128/media-stop.png
-icons/128x128/nvidia.png
-icons/128x128/play2.png
-icons/128x128/realtek.png
-icons/128x128/search.png
-icons/128x128/soundcard2.png
-icons/128x128/soundcard.png
-icons/128x128/speaker.png
-icons/128x128/star-grey.png
-icons/128x128/star.png
-icons/128x128/strawberry-panel-grey.png
-icons/128x128/strawberry-panel.png
-icons/128x128/strawberry.png
-icons/128x128/strawberry.svg
-icons/128x128/tools-wizard.png
-icons/128x128/view-choose.png
-icons/128x128/view-fullscreen.png
-icons/128x128/view-media-lyrics.png
-icons/128x128/view-media-playlist.png
-icons/128x128/view-media-visualization.png
-icons/128x128/view-refresh.png
-icons/128x128/vinyl.png
-icons/128x128/vlc.png
-icons/128x128/xine.png
-icons/128x128/zoom-in.png
-icons/128x128/zoom-out.png
-icons/64x64/albums.png
-icons/64x64/alsa.png
-icons/64x64/application-exit.png
-icons/64x64/applications-internet.png
-icons/64x64/bluetooth.png
-icons/64x64/cdcase.png
-icons/64x64/cd.png
-icons/64x64/configure.png
-icons/64x64/device-ipod-nano.png
-icons/64x64/device-ipod.png
-icons/64x64/device-phone.png
-icons/64x64/device.png
-icons/64x64/device-usb-drive.png
-icons/64x64/device-usb-flash.png
-icons/64x64/dialog-error.png
-icons/64x64/dialog-information.png
-icons/64x64/dialog-ok-apply.png
-icons/64x64/dialog-password.png
-icons/64x64/dialog-warning.png
-icons/64x64/document-download.png
-icons/64x64/document-new.png
-icons/64x64/document-open-folder.png
-icons/64x64/document-open.png
-icons/64x64/document-save.png
-icons/64x64/document-search.png
-icons/64x64/download.png
-icons/64x64/edit-clear-list.png
-icons/64x64/edit-clear-locationbar-ltr.png
-icons/64x64/edit-copy.png
-icons/64x64/edit-delete.png
-icons/64x64/edit-find.png
-icons/64x64/edit-redo.png
-icons/64x64/edit-rename.png
-icons/64x64/edit-undo.png
-icons/64x64/electrocompaniet.png
-icons/64x64/equalizer.png
-icons/64x64/folder-new.png
-icons/64x64/folder.png
-icons/64x64/folder-sound.png
-icons/64x64/footsteps.png
-icons/64x64/go-down.png
-icons/64x64/go-home.png
-icons/64x64/go-jump.png
-icons/64x64/go-next.png
-icons/64x64/go-previous.png
-icons/64x64/go-up.png
-icons/64x64/gstreamer.png
-icons/64x64/guitar.png
-icons/64x64/headset.png
-icons/64x64/help-hint.png
-icons/64x64/intel.png
-icons/64x64/jack.png
-icons/64x64/keyboard.png
-icons/64x64/list-add.png
-icons/64x64/list-remove.png
-icons/64x64/mcintosh-player.png
-icons/64x64/mcintosh-text.png
-icons/64x64/media-eject.png
-icons/64x64/media-forward.png
-icons/64x64/media-pause.png
-icons/64x64/media-play.png
-icons/64x64/media-rewind.png
-icons/64x64/media-stop.png
-icons/64x64/nvidia.png
-icons/64x64/play2.png
-icons/64x64/pulseaudio.png
-icons/64x64/realtek.png
-icons/64x64/search.png
-icons/64x64/soundcard2.png
-icons/64x64/soundcard.png
-icons/64x64/speaker.png
-icons/64x64/star-grey.png
-icons/64x64/star.png
-icons/64x64/strawberry-panel-grey.png
-icons/64x64/strawberry-panel.png
-icons/64x64/strawberry.png
-icons/64x64/tools-wizard.png
-icons/64x64/view-choose.png
-icons/64x64/view-fullscreen.png
-icons/64x64/view-media-lyrics.png
-icons/64x64/view-media-playlist.png
-icons/64x64/view-media-visualization.png
-icons/64x64/view-refresh.png
-icons/64x64/vinyl.png
-icons/64x64/vlc.png
-icons/64x64/xine.png
-icons/64x64/zoom-in.png
-icons/64x64/zoom-out.png
-icons/48x48/albums.png
-icons/48x48/alsa.png
-icons/48x48/application-exit.png
-icons/48x48/applications-internet.png
-icons/48x48/bluetooth.png
-icons/48x48/cdcase.png
-icons/48x48/cd.png
-icons/48x48/configure.png
-icons/48x48/device-ipod-nano.png
-icons/48x48/device-ipod.png
-icons/48x48/device-phone.png
-icons/48x48/device.png
-icons/48x48/device-usb-drive.png
-icons/48x48/device-usb-flash.png
-icons/48x48/dialog-error.png
-icons/48x48/dialog-information.png
-icons/48x48/dialog-ok-apply.png
-icons/48x48/dialog-password.png
-icons/48x48/dialog-warning.png
-icons/48x48/document-download.png
-icons/48x48/document-new.png
-icons/48x48/document-open-folder.png
-icons/48x48/document-open.png
-icons/48x48/document-save.png
-icons/48x48/document-search.png
-icons/48x48/download.png
-icons/48x48/edit-clear-list.png
-icons/48x48/edit-clear-locationbar-ltr.png
-icons/48x48/edit-copy.png
-icons/48x48/edit-delete.png
-icons/48x48/edit-find.png
-icons/48x48/edit-redo.png
-icons/48x48/edit-rename.png
-icons/48x48/edit-undo.png
-icons/48x48/electrocompaniet.png
-icons/48x48/equalizer.png
-icons/48x48/folder-new.png
-icons/48x48/folder.png
-icons/48x48/folder-sound.png
-icons/48x48/footsteps.png
-icons/48x48/go-down.png
-icons/48x48/go-home.png
-icons/48x48/go-jump.png
-icons/48x48/go-next.png
-icons/48x48/go-previous.png
-icons/48x48/go-up.png
-icons/48x48/gstreamer.png
-icons/48x48/guitar.png
-icons/48x48/headset.png
-icons/48x48/help-hint.png
-icons/48x48/intel.png
-icons/48x48/jack.png
-icons/48x48/keyboard.png
-icons/48x48/list-add.png
-icons/48x48/list-remove.png
-icons/48x48/mcintosh-player.png
-icons/48x48/mcintosh.png
-icons/48x48/mcintosh-text.png
-icons/48x48/media-eject.png
-icons/48x48/media-forward.png
-icons/48x48/media-pause.png
-icons/48x48/media-playlist-repeat.png
-icons/48x48/media-playlist-shuffle.png
-icons/48x48/media-play.png
-icons/48x48/media-rewind.png
-icons/48x48/media-stop.png
-icons/48x48/nvidia.png
-icons/48x48/play2.png
-icons/48x48/pulseaudio.png
-icons/48x48/realtek.png
-icons/48x48/search.png
-icons/48x48/soundcard2.png
-icons/48x48/soundcard.png
-icons/48x48/speaker.png
-icons/48x48/star-grey.png
-icons/48x48/star.png
-icons/48x48/strawberry-panel-grey.png
-icons/48x48/strawberry-panel.png
-icons/48x48/strawberry.png
-icons/48x48/tools-wizard.png
-icons/48x48/view-choose.png
-icons/48x48/view-fullscreen.png
-icons/48x48/view-media-lyrics.png
-icons/48x48/view-media-playlist.png
-icons/48x48/view-media-visualization.png
-icons/48x48/view-refresh.png
-icons/48x48/vinyl.png
-icons/48x48/vlc.png
-icons/48x48/xine.png
-icons/48x48/zoom-in.png
-icons/48x48/zoom-out.png
-icons/32x32/albums.png
-icons/32x32/alsa.png
-icons/32x32/application-exit.png
-icons/32x32/applications-internet.png
-icons/32x32/bluetooth.png
-icons/32x32/cdcase.png
-icons/32x32/cd.png
-icons/32x32/configure.png
-icons/32x32/device-ipod-nano.png
-icons/32x32/device-ipod.png
-icons/32x32/device-phone.png
-icons/32x32/device.png
-icons/32x32/device-usb-drive.png
-icons/32x32/device-usb-flash.png
-icons/32x32/dialog-error.png
-icons/32x32/dialog-information.png
-icons/32x32/dialog-ok-apply.png
-icons/32x32/dialog-password.png
-icons/32x32/dialog-warning.png
-icons/32x32/document-download.png
-icons/32x32/document-new.png
-icons/32x32/document-open-folder.png
-icons/32x32/document-open.png
-icons/32x32/document-save.png
-icons/32x32/document-search.png
-icons/32x32/download.png
-icons/32x32/edit-clear-list.png
-icons/32x32/edit-clear-locationbar-ltr.png
-icons/32x32/edit-copy.png
-icons/32x32/edit-delete.png
-icons/32x32/edit-find.png
-icons/32x32/edit-redo.png
-icons/32x32/edit-rename.png
-icons/32x32/edit-undo.png
-icons/32x32/electrocompaniet.png
-icons/32x32/equalizer.png
-icons/32x32/folder-new.png
-icons/32x32/folder.png
-icons/32x32/folder-sound.png
-icons/32x32/footsteps.png
-icons/32x32/go-down.png
-icons/32x32/go-home.png
-icons/32x32/go-jump.png
-icons/32x32/go-next.png
-icons/32x32/go-previous.png
-icons/32x32/go-up.png
-icons/32x32/gstreamer.png
-icons/32x32/guitar.png
-icons/32x32/headset.png
-icons/32x32/help-hint.png
-icons/32x32/intel.png
-icons/32x32/jack.png
-icons/32x32/keyboard.png
-icons/32x32/list-add.png
-icons/32x32/list-remove.png
-icons/32x32/mcintosh-player.png
-icons/32x32/mcintosh.png
-icons/32x32/mcintosh-text.png
-icons/32x32/media-eject.png
-icons/32x32/media-forward.png
-icons/32x32/media-pause.png
-icons/32x32/media-playlist-repeat.png
-icons/32x32/media-playlist-shuffle.png
-icons/32x32/media-play.png
-icons/32x32/media-rewind.png
-icons/32x32/media-stop.png
-icons/32x32/nvidia.png
-icons/32x32/play2.png
-icons/32x32/pulseaudio.png
-icons/32x32/realtek.png
-icons/32x32/search.png
-icons/32x32/soundcard2.png
-icons/32x32/soundcard.png
-icons/32x32/speaker.png
-icons/32x32/star-grey.png
-icons/32x32/star.png
-icons/32x32/strawberry-panel-grey.png
-icons/32x32/strawberry-panel.png
-icons/32x32/strawberry.png
-icons/32x32/strawberry.svg
-icons/32x32/tools-wizard.png
-icons/32x32/view-choose.png
-icons/32x32/view-fullscreen.png
-icons/32x32/view-media-lyrics.png
-icons/32x32/view-media-playlist.png
-icons/32x32/view-media-visualization.png
-icons/32x32/view-refresh.png
-icons/32x32/vinyl.png
-icons/32x32/vlc.png
-icons/32x32/xine.png
-icons/32x32/zoom-in.png
-icons/32x32/zoom-out.png
-icons/22x22/albums.png
-icons/22x22/alsa.png
-icons/22x22/application-exit.png
-icons/22x22/applications-internet.png
-icons/22x22/bluetooth.png
-icons/22x22/cdcase.png
-icons/22x22/cd.png
-icons/22x22/configure.png
-icons/22x22/device-ipod-nano.png
-icons/22x22/device-ipod.png
-icons/22x22/device-phone.png
-icons/22x22/device.png
-icons/22x22/device-usb-drive.png
-icons/22x22/device-usb-flash.png
-icons/22x22/dialog-error.png
-icons/22x22/dialog-information.png
-icons/22x22/dialog-ok-apply.png
-icons/22x22/dialog-password.png
-icons/22x22/dialog-warning.png
-icons/22x22/document-download.png
-icons/22x22/document-new.png
-icons/22x22/document-open-folder.png
-icons/22x22/document-open.png
-icons/22x22/document-save.png
-icons/22x22/document-search.png
-icons/22x22/download.png
-icons/22x22/edit-clear-list.png
-icons/22x22/edit-clear-locationbar-ltr.png
-icons/22x22/edit-copy.png
-icons/22x22/edit-delete.png
-icons/22x22/edit-find.png
-icons/22x22/edit-redo.png
-icons/22x22/edit-rename.png
-icons/22x22/edit-undo.png
-icons/22x22/electrocompaniet.png
-icons/22x22/equalizer.png
-icons/22x22/folder-new.png
-icons/22x22/folder.png
-icons/22x22/folder-sound.png
-icons/22x22/footsteps.png
-icons/22x22/go-down.png
-icons/22x22/go-home.png
-icons/22x22/go-jump.png
-icons/22x22/go-next.png
-icons/22x22/go-previous.png
-icons/22x22/go-up.png
-icons/22x22/gstreamer.png
-icons/22x22/guitar.png
-icons/22x22/headset.png
-icons/22x22/help-hint.png
-icons/22x22/intel.png
-icons/22x22/jack.png
-icons/22x22/keyboard.png
-icons/22x22/list-add.png
-icons/22x22/list-remove.png
-icons/22x22/mcintosh-player.png
-icons/22x22/mcintosh.png
-icons/22x22/mcintosh-text.png
-icons/22x22/media-eject.png
-icons/22x22/media-forward.png
-icons/22x22/media-pause.png
-icons/22x22/media-playlist-repeat.png
-icons/22x22/media-playlist-shuffle.png
-icons/22x22/media-play.png
-icons/22x22/media-rewind.png
-icons/22x22/media-stop.png
-icons/22x22/nvidia.png
-icons/22x22/play2.png
-icons/22x22/pulseaudio.png
-icons/22x22/realtek.png
-icons/22x22/search.png
-icons/22x22/soundcard2.png
-icons/22x22/soundcard.png
-icons/22x22/speaker.png
-icons/22x22/star-grey.png
-icons/22x22/star.png
-icons/22x22/strawberry-panel-grey.png
-icons/22x22/strawberry-panel.png
-icons/22x22/strawberry.png
-icons/22x22/strawberry.svg
-icons/22x22/tools-wizard.png
-icons/22x22/view-choose.png
-icons/22x22/view-fullscreen.png
-icons/22x22/view-media-lyrics.png
-icons/22x22/view-media-playlist.png
-icons/22x22/view-media-visualization.png
-icons/22x22/view-refresh.png
-icons/22x22/vinyl.png
-icons/22x22/vlc.png
-icons/22x22/xine.png
-icons/22x22/zoom-in.png
-icons/22x22/zoom-out.png
-
+ icons/128x128/albums.png
+ icons/128x128/alsa.png
+ icons/128x128/application-exit.png
+ icons/128x128/applications-internet.png
+ icons/128x128/bluetooth.png
+ icons/128x128/cdcase.png
+ icons/128x128/cd.png
+ icons/128x128/configure.png
+ icons/128x128/device-ipod-nano.png
+ icons/128x128/device-ipod.png
+ icons/128x128/device-phone.png
+ icons/128x128/device.png
+ icons/128x128/device-usb-drive.png
+ icons/128x128/device-usb-flash.png
+ icons/128x128/dialog-error.png
+ icons/128x128/dialog-information.png
+ icons/128x128/dialog-ok-apply.png
+ icons/128x128/dialog-password.png
+ icons/128x128/dialog-warning.png
+ icons/128x128/document-download.png
+ icons/128x128/document-new.png
+ icons/128x128/document-open-folder.png
+ icons/128x128/document-open.png
+ icons/128x128/document-save.png
+ icons/128x128/document-search.png
+ icons/128x128/download.png
+ icons/128x128/edit-clear-list.png
+ icons/128x128/edit-clear-locationbar-ltr.png
+ icons/128x128/edit-copy.png
+ icons/128x128/edit-delete.png
+ icons/128x128/edit-find.png
+ icons/128x128/edit-redo.png
+ icons/128x128/edit-rename.png
+ icons/128x128/edit-undo.png
+ icons/128x128/electrocompaniet.png
+ icons/128x128/equalizer.png
+ icons/128x128/folder-new.png
+ icons/128x128/folder.png
+ icons/128x128/folder-sound.png
+ icons/128x128/footsteps.png
+ icons/128x128/go-down.png
+ icons/128x128/go-home.png
+ icons/128x128/go-jump.png
+ icons/128x128/go-next.png
+ icons/128x128/go-previous.png
+ icons/128x128/go-up.png
+ icons/128x128/gstreamer.png
+ icons/128x128/guitar.png
+ icons/128x128/headset.png
+ icons/128x128/help-hint.png
+ icons/128x128/intel.png
+ icons/128x128/jack.png
+ icons/128x128/keyboard.png
+ icons/128x128/list-add.png
+ icons/128x128/list-remove.png
+ icons/128x128/mcintosh-player.png
+ icons/128x128/mcintosh-text.png
+ icons/128x128/media-eject.png
+ icons/128x128/media-forward.png
+ icons/128x128/media-pause.png
+ icons/128x128/media-play.png
+ icons/128x128/media-rewind.png
+ icons/128x128/media-stop.png
+ icons/128x128/nvidia.png
+ icons/128x128/play2.png
+ icons/128x128/realtek.png
+ icons/128x128/search.png
+ icons/128x128/soundcard2.png
+ icons/128x128/soundcard.png
+ icons/128x128/speaker.png
+ icons/128x128/star-grey.png
+ icons/128x128/star.png
+ icons/128x128/strawberry-panel-grey.png
+ icons/128x128/strawberry-panel.png
+ icons/128x128/strawberry.png
+ icons/128x128/strawberry.svg
+ icons/128x128/tools-wizard.png
+ icons/128x128/view-choose.png
+ icons/128x128/view-fullscreen.png
+ icons/128x128/view-media-lyrics.png
+ icons/128x128/view-media-playlist.png
+ icons/128x128/view-media-visualization.png
+ icons/128x128/view-refresh.png
+ icons/128x128/vinyl.png
+ icons/128x128/vlc.png
+ icons/128x128/xine.png
+ icons/128x128/zoom-in.png
+ icons/128x128/zoom-out.png
+ icons/64x64/albums.png
+ icons/64x64/alsa.png
+ icons/64x64/application-exit.png
+ icons/64x64/applications-internet.png
+ icons/64x64/bluetooth.png
+ icons/64x64/cdcase.png
+ icons/64x64/cd.png
+ icons/64x64/configure.png
+ icons/64x64/device-ipod-nano.png
+ icons/64x64/device-ipod.png
+ icons/64x64/device-phone.png
+ icons/64x64/device.png
+ icons/64x64/device-usb-drive.png
+ icons/64x64/device-usb-flash.png
+ icons/64x64/dialog-error.png
+ icons/64x64/dialog-information.png
+ icons/64x64/dialog-ok-apply.png
+ icons/64x64/dialog-password.png
+ icons/64x64/dialog-warning.png
+ icons/64x64/document-download.png
+ icons/64x64/document-new.png
+ icons/64x64/document-open-folder.png
+ icons/64x64/document-open.png
+ icons/64x64/document-save.png
+ icons/64x64/document-search.png
+ icons/64x64/download.png
+ icons/64x64/edit-clear-list.png
+ icons/64x64/edit-clear-locationbar-ltr.png
+ icons/64x64/edit-copy.png
+ icons/64x64/edit-delete.png
+ icons/64x64/edit-find.png
+ icons/64x64/edit-redo.png
+ icons/64x64/edit-rename.png
+ icons/64x64/edit-undo.png
+ icons/64x64/electrocompaniet.png
+ icons/64x64/equalizer.png
+ icons/64x64/folder-new.png
+ icons/64x64/folder.png
+ icons/64x64/folder-sound.png
+ icons/64x64/footsteps.png
+ icons/64x64/go-down.png
+ icons/64x64/go-home.png
+ icons/64x64/go-jump.png
+ icons/64x64/go-next.png
+ icons/64x64/go-previous.png
+ icons/64x64/go-up.png
+ icons/64x64/gstreamer.png
+ icons/64x64/guitar.png
+ icons/64x64/headset.png
+ icons/64x64/help-hint.png
+ icons/64x64/intel.png
+ icons/64x64/jack.png
+ icons/64x64/keyboard.png
+ icons/64x64/list-add.png
+ icons/64x64/list-remove.png
+ icons/64x64/mcintosh-player.png
+ icons/64x64/mcintosh-text.png
+ icons/64x64/media-eject.png
+ icons/64x64/media-forward.png
+ icons/64x64/media-pause.png
+ icons/64x64/media-play.png
+ icons/64x64/media-rewind.png
+ icons/64x64/media-stop.png
+ icons/64x64/nvidia.png
+ icons/64x64/play2.png
+ icons/64x64/pulseaudio.png
+ icons/64x64/realtek.png
+ icons/64x64/search.png
+ icons/64x64/soundcard2.png
+ icons/64x64/soundcard.png
+ icons/64x64/speaker.png
+ icons/64x64/star-grey.png
+ icons/64x64/star.png
+ icons/64x64/strawberry-panel-grey.png
+ icons/64x64/strawberry-panel.png
+ icons/64x64/strawberry.png
+ icons/64x64/tools-wizard.png
+ icons/64x64/view-choose.png
+ icons/64x64/view-fullscreen.png
+ icons/64x64/view-media-lyrics.png
+ icons/64x64/view-media-playlist.png
+ icons/64x64/view-media-visualization.png
+ icons/64x64/view-refresh.png
+ icons/64x64/vinyl.png
+ icons/64x64/vlc.png
+ icons/64x64/xine.png
+ icons/64x64/zoom-in.png
+ icons/64x64/zoom-out.png
+ icons/48x48/albums.png
+ icons/48x48/alsa.png
+ icons/48x48/application-exit.png
+ icons/48x48/applications-internet.png
+ icons/48x48/bluetooth.png
+ icons/48x48/cdcase.png
+ icons/48x48/cd.png
+ icons/48x48/configure.png
+ icons/48x48/device-ipod-nano.png
+ icons/48x48/device-ipod.png
+ icons/48x48/device-phone.png
+ icons/48x48/device.png
+ icons/48x48/device-usb-drive.png
+ icons/48x48/device-usb-flash.png
+ icons/48x48/dialog-error.png
+ icons/48x48/dialog-information.png
+ icons/48x48/dialog-ok-apply.png
+ icons/48x48/dialog-password.png
+ icons/48x48/dialog-warning.png
+ icons/48x48/document-download.png
+ icons/48x48/document-new.png
+ icons/48x48/document-open-folder.png
+ icons/48x48/document-open.png
+ icons/48x48/document-save.png
+ icons/48x48/document-search.png
+ icons/48x48/download.png
+ icons/48x48/edit-clear-list.png
+ icons/48x48/edit-clear-locationbar-ltr.png
+ icons/48x48/edit-copy.png
+ icons/48x48/edit-delete.png
+ icons/48x48/edit-find.png
+ icons/48x48/edit-redo.png
+ icons/48x48/edit-rename.png
+ icons/48x48/edit-undo.png
+ icons/48x48/electrocompaniet.png
+ icons/48x48/equalizer.png
+ icons/48x48/folder-new.png
+ icons/48x48/folder.png
+ icons/48x48/folder-sound.png
+ icons/48x48/footsteps.png
+ icons/48x48/go-down.png
+ icons/48x48/go-home.png
+ icons/48x48/go-jump.png
+ icons/48x48/go-next.png
+ icons/48x48/go-previous.png
+ icons/48x48/go-up.png
+ icons/48x48/gstreamer.png
+ icons/48x48/guitar.png
+ icons/48x48/headset.png
+ icons/48x48/help-hint.png
+ icons/48x48/intel.png
+ icons/48x48/jack.png
+ icons/48x48/keyboard.png
+ icons/48x48/list-add.png
+ icons/48x48/list-remove.png
+ icons/48x48/mcintosh-player.png
+ icons/48x48/mcintosh.png
+ icons/48x48/mcintosh-text.png
+ icons/48x48/media-eject.png
+ icons/48x48/media-forward.png
+ icons/48x48/media-pause.png
+ icons/48x48/media-playlist-repeat.png
+ icons/48x48/media-playlist-shuffle.png
+ icons/48x48/media-play.png
+ icons/48x48/media-rewind.png
+ icons/48x48/media-stop.png
+ icons/48x48/nvidia.png
+ icons/48x48/play2.png
+ icons/48x48/pulseaudio.png
+ icons/48x48/realtek.png
+ icons/48x48/search.png
+ icons/48x48/soundcard2.png
+ icons/48x48/soundcard.png
+ icons/48x48/speaker.png
+ icons/48x48/star-grey.png
+ icons/48x48/star.png
+ icons/48x48/strawberry-panel-grey.png
+ icons/48x48/strawberry-panel.png
+ icons/48x48/strawberry.png
+ icons/48x48/tools-wizard.png
+ icons/48x48/view-choose.png
+ icons/48x48/view-fullscreen.png
+ icons/48x48/view-media-lyrics.png
+ icons/48x48/view-media-playlist.png
+ icons/48x48/view-media-visualization.png
+ icons/48x48/view-refresh.png
+ icons/48x48/vinyl.png
+ icons/48x48/vlc.png
+ icons/48x48/xine.png
+ icons/48x48/zoom-in.png
+ icons/48x48/zoom-out.png
+ icons/32x32/albums.png
+ icons/32x32/alsa.png
+ icons/32x32/application-exit.png
+ icons/32x32/applications-internet.png
+ icons/32x32/bluetooth.png
+ icons/32x32/cdcase.png
+ icons/32x32/cd.png
+ icons/32x32/configure.png
+ icons/32x32/device-ipod-nano.png
+ icons/32x32/device-ipod.png
+ icons/32x32/device-phone.png
+ icons/32x32/device.png
+ icons/32x32/device-usb-drive.png
+ icons/32x32/device-usb-flash.png
+ icons/32x32/dialog-error.png
+ icons/32x32/dialog-information.png
+ icons/32x32/dialog-ok-apply.png
+ icons/32x32/dialog-password.png
+ icons/32x32/dialog-warning.png
+ icons/32x32/document-download.png
+ icons/32x32/document-new.png
+ icons/32x32/document-open-folder.png
+ icons/32x32/document-open.png
+ icons/32x32/document-save.png
+ icons/32x32/document-search.png
+ icons/32x32/download.png
+ icons/32x32/edit-clear-list.png
+ icons/32x32/edit-clear-locationbar-ltr.png
+ icons/32x32/edit-copy.png
+ icons/32x32/edit-delete.png
+ icons/32x32/edit-find.png
+ icons/32x32/edit-redo.png
+ icons/32x32/edit-rename.png
+ icons/32x32/edit-undo.png
+ icons/32x32/electrocompaniet.png
+ icons/32x32/equalizer.png
+ icons/32x32/folder-new.png
+ icons/32x32/folder.png
+ icons/32x32/folder-sound.png
+ icons/32x32/footsteps.png
+ icons/32x32/go-down.png
+ icons/32x32/go-home.png
+ icons/32x32/go-jump.png
+ icons/32x32/go-next.png
+ icons/32x32/go-previous.png
+ icons/32x32/go-up.png
+ icons/32x32/gstreamer.png
+ icons/32x32/guitar.png
+ icons/32x32/headset.png
+ icons/32x32/help-hint.png
+ icons/32x32/intel.png
+ icons/32x32/jack.png
+ icons/32x32/keyboard.png
+ icons/32x32/list-add.png
+ icons/32x32/list-remove.png
+ icons/32x32/mcintosh-player.png
+ icons/32x32/mcintosh.png
+ icons/32x32/mcintosh-text.png
+ icons/32x32/media-eject.png
+ icons/32x32/media-forward.png
+ icons/32x32/media-pause.png
+ icons/32x32/media-playlist-repeat.png
+ icons/32x32/media-playlist-shuffle.png
+ icons/32x32/media-play.png
+ icons/32x32/media-rewind.png
+ icons/32x32/media-stop.png
+ icons/32x32/nvidia.png
+ icons/32x32/play2.png
+ icons/32x32/pulseaudio.png
+ icons/32x32/realtek.png
+ icons/32x32/search.png
+ icons/32x32/soundcard2.png
+ icons/32x32/soundcard.png
+ icons/32x32/speaker.png
+ icons/32x32/star-grey.png
+ icons/32x32/star.png
+ icons/32x32/strawberry-panel-grey.png
+ icons/32x32/strawberry-panel.png
+ icons/32x32/strawberry.png
+ icons/32x32/strawberry.svg
+ icons/32x32/tools-wizard.png
+ icons/32x32/view-choose.png
+ icons/32x32/view-fullscreen.png
+ icons/32x32/view-media-lyrics.png
+ icons/32x32/view-media-playlist.png
+ icons/32x32/view-media-visualization.png
+ icons/32x32/view-refresh.png
+ icons/32x32/vinyl.png
+ icons/32x32/vlc.png
+ icons/32x32/xine.png
+ icons/32x32/zoom-in.png
+ icons/32x32/zoom-out.png
+ icons/22x22/albums.png
+ icons/22x22/alsa.png
+ icons/22x22/application-exit.png
+ icons/22x22/applications-internet.png
+ icons/22x22/bluetooth.png
+ icons/22x22/cdcase.png
+ icons/22x22/cd.png
+ icons/22x22/configure.png
+ icons/22x22/device-ipod-nano.png
+ icons/22x22/device-ipod.png
+ icons/22x22/device-phone.png
+ icons/22x22/device.png
+ icons/22x22/device-usb-drive.png
+ icons/22x22/device-usb-flash.png
+ icons/22x22/dialog-error.png
+ icons/22x22/dialog-information.png
+ icons/22x22/dialog-ok-apply.png
+ icons/22x22/dialog-password.png
+ icons/22x22/dialog-warning.png
+ icons/22x22/document-download.png
+ icons/22x22/document-new.png
+ icons/22x22/document-open-folder.png
+ icons/22x22/document-open.png
+ icons/22x22/document-save.png
+ icons/22x22/document-search.png
+ icons/22x22/download.png
+ icons/22x22/edit-clear-list.png
+ icons/22x22/edit-clear-locationbar-ltr.png
+ icons/22x22/edit-copy.png
+ icons/22x22/edit-delete.png
+ icons/22x22/edit-find.png
+ icons/22x22/edit-redo.png
+ icons/22x22/edit-rename.png
+ icons/22x22/edit-undo.png
+ icons/22x22/electrocompaniet.png
+ icons/22x22/equalizer.png
+ icons/22x22/folder-new.png
+ icons/22x22/folder.png
+ icons/22x22/folder-sound.png
+ icons/22x22/footsteps.png
+ icons/22x22/go-down.png
+ icons/22x22/go-home.png
+ icons/22x22/go-jump.png
+ icons/22x22/go-next.png
+ icons/22x22/go-previous.png
+ icons/22x22/go-up.png
+ icons/22x22/gstreamer.png
+ icons/22x22/guitar.png
+ icons/22x22/headset.png
+ icons/22x22/help-hint.png
+ icons/22x22/intel.png
+ icons/22x22/jack.png
+ icons/22x22/keyboard.png
+ icons/22x22/list-add.png
+ icons/22x22/list-remove.png
+ icons/22x22/mcintosh-player.png
+ icons/22x22/mcintosh.png
+ icons/22x22/mcintosh-text.png
+ icons/22x22/media-eject.png
+ icons/22x22/media-forward.png
+ icons/22x22/media-pause.png
+ icons/22x22/media-playlist-repeat.png
+ icons/22x22/media-playlist-shuffle.png
+ icons/22x22/media-play.png
+ icons/22x22/media-rewind.png
+ icons/22x22/media-stop.png
+ icons/22x22/nvidia.png
+ icons/22x22/play2.png
+ icons/22x22/pulseaudio.png
+ icons/22x22/realtek.png
+ icons/22x22/search.png
+ icons/22x22/soundcard2.png
+ icons/22x22/soundcard.png
+ icons/22x22/speaker.png
+ icons/22x22/star-grey.png
+ icons/22x22/star.png
+ icons/22x22/strawberry-panel-grey.png
+ icons/22x22/strawberry-panel.png
+ icons/22x22/strawberry.png
+ icons/22x22/strawberry.svg
+ icons/22x22/tools-wizard.png
+ icons/22x22/view-choose.png
+ icons/22x22/view-fullscreen.png
+ icons/22x22/view-media-lyrics.png
+ icons/22x22/view-media-playlist.png
+ icons/22x22/view-media-visualization.png
+ icons/22x22/view-refresh.png
+ icons/22x22/vinyl.png
+ icons/22x22/vlc.png
+ icons/22x22/xine.png
+ icons/22x22/zoom-in.png
+ icons/22x22/zoom-out.png
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5424e8b5e..6f3b8f82c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,8 +16,9 @@
# You should have received a copy of the GNU General Public License
# along with Strawberry. If not, see .
+set(CMAKE_CXX_STANDARD 11)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -fpermissive --std=c++0x -U__STRICT_ANSI__")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -fpermissive --std=c++11 -U__STRICT_ANSI__")
option(BUILD_WERROR "Build with -Werror" ON)
@@ -504,7 +505,7 @@ optional_source(HAVE_LIBLASTFM
)
# Platform specific - Linux
-optional_source(LINUX
+optional_source(HAVE_ALSA
SOURCES
engine/alsadevicefinder.cpp
)
@@ -535,7 +536,7 @@ optional_source(APPLE
globalshortcuts/macglobalshortcutbackend.h
)
-if(APPLE)
+if (APPLE)
optional_source(HAVE_LIBMTP
SOURCES
device/macdevicelister.mm
@@ -552,9 +553,9 @@ optional_source(WIN32
)
# Platform specific - X11
-optional_source(LINUX SOURCES widgets/osd_x11.cpp)
+optional_source(UNIX SOURCES widgets/osd_x11.cpp)
-# DBUS and MPRIS - Linux specific
+# DBUS and MPRIS - Unix specific
if(HAVE_DBUS)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
@@ -827,7 +828,6 @@ add_library(strawberry_lib STATIC
target_link_libraries(strawberry_lib
libstrawberry-common
libstrawberry-tagreader
- #gstafc
${GLIB_LIBRARIES}
${GIO_LIBRARIES}
${SHA2_LIBRARIES}
@@ -839,13 +839,13 @@ target_link_libraries(strawberry_lib
${QTSINGLEAPPLICATION_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${SQLITE_LIBRARIES}
+ ${QOCOA_LIBRARIES}
z
- Qocoa
)
-if(LINUX)
+if(HAVE_ALSA)
target_link_libraries(strawberry_lib ${ALSA_LIBRARIES})
-endif(LINUX)
+endif(HAVE_ALSA)
if(HAVE_LIBLASTFM)
target_link_libraries(strawberry_lib ${LASTFM5_LIBRARIES})
@@ -910,13 +910,11 @@ if (WIN32)
endif (WIN32)
if (UNIX AND NOT APPLE)
- # Hack: the Gold linker pays attention to the order that libraries are
- # specified on the link line. -lX11 and -ldl are provided earlier in the link
- # command but they're actually used by libraries that appear after them, so
- # they end up getting ignored. This appends them to the very end of the link
- # line, ensuring they're always used.
+ # Hack: the Gold linker pays attention to the order that libraries are specified on the link line.
+ # -lX11 and -ldl are provided earlier in the link command but they're actually used by libraries that appear after them, so they end up getting ignored.
+ # This appends them to the very end of the link line, ensuring they're always used.
find_package(X11)
- if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ if (FREEBSD)
target_link_libraries(strawberry_lib ${X11_X11_LIB})
else ()
target_link_libraries(strawberry_lib ${X11_X11_LIB} ${CMAKE_DL_LIBS})
@@ -948,9 +946,9 @@ add_executable(strawberry
core/main.cpp
)
-if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+if(FREEBSD)
target_link_libraries(strawberry execinfo)
-endif (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+endif()
target_link_libraries(strawberry
strawberry_lib
diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp
index 9deee69e7..4a4f03616 100644
--- a/src/core/mainwindow.cpp
+++ b/src/core/mainwindow.cpp
@@ -647,6 +647,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
FancyTabWidget::Mode default_mode = FancyTabWidget::Mode_LargeSidebar;
ui_->tabs->SetMode(FancyTabWidget::Mode(settings_.value("tab_mode", default_mode).toInt()));
file_view_->SetPath(settings_.value("file_path", QDir::homePath()).toString());
+
TabSwitched();
// Users often collapse one side of the splitter by mistake and don't know how to restore it. This must be set after the state is restored above.
@@ -729,7 +730,6 @@ void MainWindow::ReloadSettings() {
doubleclick_playlist_addmode_ = PlaylistAddBehaviour(settings.value("doubleclick_playlist_addmode", PlaylistAddBehaviour_Play).toInt());
menu_playmode_ = PlayBehaviour(settings.value("menu_playmode", PlayBehaviour_IfStopped).toInt());
settings.endGroup();
-
}
void MainWindow::ReloadAllSettings() {
diff --git a/src/widgets/statusview.cpp b/src/widgets/statusview.cpp
index 99522c6e6..c5ad7d461 100644
--- a/src/widgets/statusview.cpp
+++ b/src/widgets/statusview.cpp
@@ -87,7 +87,7 @@ StatusView::StatusView(CollectionViewContainer *collectionviewcontainer, QWidget
show_hide_animation_(new QTimeLine(500, this)),
fade_animation_(new QTimeLine(1000, this)),
image_blank_(""),
- image_nosong_(":/icons/full/strawberry.png"),
+ image_nosong_(":/pictures/strawberry.png"),
widgetstate_(None),
menu_(new QMenu(this))
{
@@ -348,7 +348,7 @@ void StatusView::NoSong() {
//qLog(Debug) << __PRETTY_FUNCTION__;
QString html;
- QImage image_logo(":/icons/full/strawberry.png");
+ QImage image_logo(":/pictures/strawberry.png");
QImage image_logo_scaled = image_logo.scaled(300, 300, Qt::KeepAspectRatio);
QPixmap pixmap_logo(QPixmap::fromImage(image_logo_scaled));