From 37f37fbdab6e8b58446f872a81840111c4da7c91 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 1 Feb 2020 14:13:12 +0100 Subject: [PATCH] Added ALAC file support --- docker/Dockerfile | 4 ++-- src/database/ScanSettings.hpp | 2 +- src/database/Session.cpp | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6718da87..2a94c55d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -7,7 +7,7 @@ ARG FFMPEG_VERSION=4.1.4 ARG WT_VERSION=4.2.0 ARG IMAGEMAGICK6_VERSION=6.9.10-71 ARG PSTREAMS_VERSION=1.0.1 -ARG LMS_VERSION=3.2.0 +ARG LMS_VERSION=3.5.0 ARG PREFIX="/tmp/install" @@ -72,7 +72,7 @@ RUN \ --enable-libopus \ --enable-libvorbis \ --disable-everything \ - --enable-decoder=aac*,ac3*,flac,mp3*,libopus,pcm*,libvorbis,wavpack,wma*,libopenjpg,png,tiff \ + --enable-decoder=aac*,ac3*,alac,als,flac,mp3*,libopus,pcm*,libvorbis,wavpack,wma*,libopenjpg,png,tiff \ --enable-encoder=libmp3lame,libopus,libvorbis \ --enable-demuxer=aac,aiff,asf,flac,ipod,ogg,matroska,mov,mp3,mp4,wav,wv,webm \ --enable-muxer=ogg,matroska,mp3,webm \ diff --git a/src/database/ScanSettings.hpp b/src/database/ScanSettings.hpp index 1abb6433..0ce37a49 100644 --- a/src/database/ScanSettings.hpp +++ b/src/database/ScanSettings.hpp @@ -90,7 +90,7 @@ class ScanSettings : public Wt::Dbo::Dbo Wt::WTime _startTime = Wt::WTime {0,0,0}; UpdatePeriod _updatePeriod {UpdatePeriod::Never}; SimilarityEngineType _similarityEngineType {SimilarityEngineType::Clusters}; - std::string _audioFileExtensions {".mp3 .ogg .oga .aac .m4a .m4b .flac .wav .wma .aif .aiff .ape .mpc .shn .opus"}; + std::string _audioFileExtensions {".alac .mp3 .ogg .oga .aac .m4a .m4b .flac .wav .wma .aif .aiff .ape .mpc .shn .opus"}; Wt::Dbo::collection> _clusterTypes; }; diff --git a/src/database/Session.cpp b/src/database/Session.cpp index 0d4de619..62446009 100644 --- a/src/database/Session.cpp +++ b/src/database/Session.cpp @@ -143,6 +143,7 @@ CREATE TABLE IF NOT EXISTS "track_bookmark" ( else if (version == 10) { ScanSettings::get(*this).modify()->addAudioFileExtension(".m4b"); + ScanSettings::get(*this).modify()->addAudioFileExtension(".alac"); } else {