diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user deleted file mode 100644 index 2aa447533..000000000 --- a/CMakeLists.txt.user +++ /dev/null @@ -1,1266 +0,0 @@ - - - - - - EnvironmentId - {6b0aa776-3cc6-474f-842a-549e3f71d442} - - - ProjectExplorer.Project.ActiveTarget - 1 - - - ProjectExplorer.Project.EditorSettings - - true - false - true - - Cpp - - CppGlobal - - - - QmlJS - - QmlJSGlobal - - - 2 - UTF-8 - false - 4 - false - 80 - true - true - 1 - true - false - 0 - true - true - 0 - 8 - true - 1 - true - true - true - false - - - - ProjectExplorer.Project.PluginSettings - - - - ProjectExplorer.Project.Target.0 - - Qt 5.6.2 (qt5) - Qt 5.6.2 (qt5) - {af2d4c87-1843-4050-9e00-6e038cc612ad} - 0 - 0 - 0 - - - /home/jonas/Projects/strawberry/build - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Build - Build - CMakeProjectManager.CMakeBuildConfiguration - - 1 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - - - %{buildDir} - Custom Executable - - ProjectExplorer.CustomExecutableRunConfiguration - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop - Desktop - {80173244-0390-41e7-b1fe-e499d6813389} - 1 - 0 - 0 - - - /home/jonas/Projects/strawberry/build-strawberry-Desktop-Default - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Default - Default - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=Debug - - /home/jonas/Projects/strawberry/build-strawberry-Desktop-Debug - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=Release - - /home/jonas/Projects/strawberry/build-strawberry-Desktop-Release - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=RelWithDebInfo - - /home/jonas/Projects/strawberry/build-strawberry-Desktop-Release with Debug Information - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release with Debug Information - Release with Debug Information - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=MinSizeRel - - /home/jonas/Projects/strawberry/build-strawberry-Desktop-Minimum Size Release - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Minimum Size Release - Minimum Size Release - CMakeProjectManager.CMakeBuildConfiguration - - 5 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - strawberry - - - .. - 2 - - strawberry - - CMakeProjectManager.CMakeRunConfiguration.strawberry - 3768 - false - true - false - false - true - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - strawberry-tagreader - - - /home/jonas/Projects/strawberry/build-strawberry-Desktop-Debug - 2 - - strawberry-tagreader - - CMakeProjectManager.CMakeRunConfiguration.strawberry-tagreader - 3768 - false - true - false - false - true - - 2 - - - - ProjectExplorer.Project.Target.2 - - Qt 4.8.6 in PATH (System) - Qt 4.8.6 in PATH (System) - {02b71e75-dd34-48bd-8535-e5c32e47198c} - 0 - 0 - 0 - - - /home/jonas/Projects/strawberry/build-strawberry-Qt_4_8_6_in_PATH_System_02b71e-Default - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Default - Default - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=Debug - - /home/jonas/Projects/strawberry/build-strawberry-Qt_4_8_6_in_PATH_System_02b71e-Debug - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=Release - - /home/jonas/Projects/strawberry/build-strawberry-Qt_4_8_6_in_PATH_System_02b71e-Release - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=RelWithDebInfo - - /home/jonas/Projects/strawberry/build-strawberry-Qt_4_8_6_in_PATH_System_02b71e-Release with Debug Information - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release with Debug Information - Release with Debug Information - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=MinSizeRel - - /home/jonas/Projects/strawberry/build-strawberry-Qt_4_8_6_in_PATH_System_02b71e-Minimum Size Release - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Minimum Size Release - Minimum Size Release - CMakeProjectManager.CMakeBuildConfiguration - - 5 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - strawberry - - - .. - 2 - - strawberry - - CMakeProjectManager.CMakeRunConfiguration.strawberry - 3768 - false - true - false - false - true - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - strawberry-tagreader - - - /tmp/QtCreator-LC1Phe/qtc-cmake-XXq5fNoN - -1 - - strawberry-tagreader - - CMakeProjectManager.CMakeRunConfiguration.strawberry-tagreader - 3768 - false - true - false - false - true - - 2 - - - - ProjectExplorer.Project.Target.3 - - Qt 4.8.6 in PATH (System) - Qt 4.8.6 in PATH (System) - {feba4b14-1974-4db7-94b6-65ce15367edf} - 0 - 0 - 0 - - - /home/jonas/Projects/strawberry/build-strawberry-Qt_4_8_6_in_PATH_System_feba4b-Default - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Default - Default - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=Debug - - /home/jonas/Projects/strawberry/build-strawberry-Qt_4_8_6_in_PATH_System_feba4b-Debug - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=Release - - /home/jonas/Projects/strawberry/build-strawberry-Qt_4_8_6_in_PATH_System_feba4b-Release - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=RelWithDebInfo - - /home/jonas/Projects/strawberry/build-strawberry-Qt_4_8_6_in_PATH_System_feba4b-Release with Debug Information - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release with Debug Information - Release with Debug Information - CMakeProjectManager.CMakeBuildConfiguration - - - - CMAKE_BUILD_TYPE:STRING=MinSizeRel - - /home/jonas/Projects/strawberry/build-strawberry-Qt_4_8_6_in_PATH_System_feba4b-Minimum Size Release - - - - - all - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Build - - ProjectExplorer.BuildSteps.Build - - - - - - clean - - true - CMake Build - - CMakeProjectManager.MakeStep - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Minimum Size Release - Minimum Size Release - CMakeProjectManager.CMakeBuildConfiguration - - 5 - - - 0 - Deploy - - ProjectExplorer.BuildSteps.Deploy - - 1 - Deploy locally - - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - strawberry - - - .. - 2 - - strawberry - - CMakeProjectManager.CMakeRunConfiguration.strawberry - 3768 - false - true - false - false - true - - - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - strawberry-tagreader - - - /tmp/QtCreator-LC1Phe/qtc-cmake-XXlPl0g1 - -1 - - strawberry-tagreader - - CMakeProjectManager.CMakeRunConfiguration.strawberry-tagreader - 3768 - false - true - false - false - true - - 2 - - - - ProjectExplorer.Project.TargetCount - 4 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - - diff --git a/TODO b/TODO new file mode 100644 index 000000000..97fa6ebb4 --- /dev/null +++ b/TODO @@ -0,0 +1,8 @@ +Strawberry Music Player +======================= +TODO + +- Fix freeze on exit caused by GStreamer +- Fix crash when loading playlists from Audio CD +- Improve status/context +- Fix album covers not updating in Cover manager. diff --git a/data/icons/generate-icons.sh b/data/icons/generate-icons.sh deleted file mode 100755 index 357dd2151..000000000 --- a/data/icons/generate-icons.sh +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/sh - -sizes="128x128 64x64 48x48 32x32 22x22" - -# - -for i in full/* -do - source=$i - file=`basename $i` - - id=`identify "$i"` || exit 1 - if [ "$id" = "" ] ; then - echo "ERROR: Cannot dermine format and geometry for image: \"$i\"." - continue - fi - g=`echo $id | awk '{print $3}'` || exit 1 - if [ "$g" = "" ] ; then - echo "ERROR: Cannot dermine geometry for image: \"$i\"." - continue - fi - - # Geometry can be 563x144+0+0 or 75x98 - # we need to get rid of the plus (+) and the x characters: - w=`echo $g | sed 's/[^0-9]/ /g' | awk '{print $1}'` || exit 1 - if [ "$w" = "" ] ; then - echo "ERROR: Cannot dermine width for image: \"$x\"." - continue - fi - h=`echo $g | sed 's/[^0-9]/ /g' | awk '{print $2}'` || exit 1 - if [ "$h" = "" ] ; then - echo "ERROR: Cannot dermine height for image: \"$x\"." - continue - fi - - for x in $sizes - do - - dest="$x/$file" - if [ -f $dest ]; then - continue - fi - - x_w=$(echo $x | cut -d 'x' -f1) - x_h=$(echo $x | cut -d 'x' -f2) - - if [ "$w" -lt "$x_w" ] || [ "$h" -lt "$x_h" ]; then - continue - fi - - echo "convert -verbose -resize $x $source $dest" - convert -verbose -resize $x $source $dest - - done -done - - -for i in $sizes -do - for x in $i/* - do - file=`basename $x` - if ! [ -f "full/$file" ]; then - echo "Warning: full/$file does not exist, but $x exists." - fi - - id=`identify "$x"` || exit 1 - if [ "$id" = "" ] ; then - echo "ERROR: Cannot dermine format and geometry for image: \"$x\"." - continue - fi - g=`echo $id | awk '{print $3}'` || exit 1 - if [ "$g" = "" ] ; then - echo "ERROR: Cannot dermine geometry for image: \"$x\"." - continue - fi - - # Geometry can be 563x144+0+0 or 75x98 - # we need to get rid of the plus (+) and the x characters: - w=`echo $g | sed 's/[^0-9]/ /g' | awk '{print $1}'` || exit 1 - if [ "$w" = "" ] ; then - echo "ERROR: Cannot dermine width for image: \"$x\"." - continue - fi - h=`echo $g | sed 's/[^0-9]/ /g' | awk '{print $2}'` || exit 1 - if [ "$h" = "" ] ; then - echo "ERROR: Cannot dermine height for image: \"$x\"." - continue - fi - - if ! [ "${h}x${w}" = "$i" ]; then - echo "Warning: $x is not $i, but ${h}x${w}!" - fi - - done -done - -file="../icons.qrc" -rm -rf "$file" -echo "" >>$file -echo "" >>$file - -for i in full $sizes -do - for x in $i/* - do - f=`basename $x` - echo " icons/$i/$f" >>$file - done -done - -echo "" >>$file -echo "" >>$file - diff --git a/dist/maketarball.sh b/dist/maketarball.sh deleted file mode 100755 index b5044262e..000000000 --- a/dist/maketarball.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -name=strawberry -version="0.1.1" -deb_dist="" -root=$(cd "${0%/*}/.." && echo $PWD/${0##*/}) -root=`dirname "$root"` -rootnoslash=`echo $root | sed "s/^\///"` - -echo "Creating $name-$version.tar.xz..." - -tar -cJf $name-$version.tar.xz \ - --transform "s,^$rootnoslash,$name-$version," \ - --exclude-vcs \ - --exclude "$root/dist/*.tar" \ - --exclude "$root/dist/*.tar.*" \ - --exclude "$root/CMakeLists.txt.user" \ - "$root" - -echo "Also creating ${name}_${version}~${deb_dist}.orig.tar.xz..." -cp "$name-$version.tar.xz" "${name}_${version}~${deb_dist}.orig.tar.xz" diff --git a/dist/strawberry.spec b/dist/strawberry.spec deleted file mode 100644 index cf761ab7f..000000000 --- a/dist/strawberry.spec +++ /dev/null @@ -1,87 +0,0 @@ -Name: strawberry -Version: 0.1.1 -Release: 1.fc13 -Summary: A audio player and music collection organiser - -Group: Applications/Multimedia -License: GPLv3 -URL: http://www.strawbs.org/ -Source0: %{name}-0.1.1.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: desktop-file-utils liblastfm-devel taglib-devel gettext -BuildRequires: qt5-devel boost-devel gcc-c++ glew-devel libgpod-devel -BuildRequires: cmake gstreamer-devel gstreamer-plugins-base-devel -BuildRequires: libimobiledevice-devel libplist-devel usbmuxd-devel -BuildRequires: libmtp-devel protobuf-devel protobuf-compiler libcdio-devel -BuildRequires: qjson-devel qca2-devel fftw-devel sparsehash-devel -BuildRequires: libchromaprint-devel - -Requires: libgpod protobuf-lite libcdio qjson qca-ossl sqlite - -# GStreamer codec dependencies -Requires: gstreamer-plugins-ugly - -%ifarch x86_64 -Requires: gstreamer1.0(decoder-audio/x-vorbis)()(64bit) -Requires: gstreamer1.0(decoder-audio/x-flac)()(64bit) -Requires: gstreamer1.0(decoder-audio/x-speex)()(64bit) -Requires: gstreamer1.0(decoder-audio/x-wav)()(64bit) -%else -Requires: gstreamer1.0(decoder-audio/x-vorbis) -Requires: gstreamer1.0(decoder-audio/x-flac) -Requires: gstreamer1.0(decoder-audio/x-speex) -Requires: gstreamer1.0(decoder-audio/x-wav) -%endif - -%description -Strawberry is a modern audio player and music collection organiser. -It is a fork of Clementine. The name is inspired by the band Strawbs. - -Features include: - - * Organize and play your music collection - * Edit tags on your music - * Download album cover art from Last.fm, musicbrainz, Discogs and Amazon - * Native desktop notifications - * Import and export playlists in multiple formats - * Copy music to your iPod, iPhone, MTP or mass-storage USB player - * Support for multiple backends - -%prep -%setup -q -n %{name}-0.1.1 - - -%build -cd bin -%{cmake} .. -DUSE_INSTALL_PREFIX=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON -make %{?_smp_mflags} - -%install -cd bin -make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT/usr/share/icons/ubuntu-mono-{dark,light}/apps/24/strawberry-panel*.png - -%clean -cd bin -make clean - - -%files -%defattr(-,root,root,-) -%doc -%{_bindir}/strawberry -%{_bindir}/strawberry-tagreader -%{_datadir}/applications/strawberry.desktop -%{_datadir}/strawberry/projectm-presets -%{_datadir}/kde4/services/strawberry-itms.protocol -%{_datadir}/kde4/services/strawberry-itpc.protocol -%{_datadir}/kde4/services/strawberry-feed.protocol -%{_datadir}/kde4/services/strawberry-zune.protocol -%{_datadir}/icons/hicolor/64x64/apps/strawberry.png -%{_datadir}/icons/hicolor/128x128/apps/strawberry.png -%{_datadir}/icons/hicolor/scalable/apps/strawberry.svg - -%changelog -* fr. mars 02 2018 0.1.1 -- Version 0.1.1 diff --git a/src/cmakelists-check.sh b/src/cmakelists-check.sh deleted file mode 100755 index de2354f59..000000000 --- a/src/cmakelists-check.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -for f in `find .` -do - file=$(basename $f) - grep -i $file CMakeLists.txt >/dev/null 2>&1 - #echo $? - if [ $? -eq 0 ]; then - continue - fi - echo "$file not in CMakeLists.txt" -done