Merge branch 'develop'

README.md

@@ -1,19 +1,21 @@
 # LMS - Lightweight Music Server
 
-LMS is a self-hosted media streaming software, released under the GPLv3 license.
-It allows you to access your music using an http(s) web interface.
+LMS is a self-hosted music streaming software, released under the GPLv3 license.
+It allows you to access your music using a web interface.
+
+A [demo](http://lms.demo.poupon.io) instance is available, with the following limitations:
+- Settings cannot be saved
+- No persistent playqueue
 
 ## Main features
 - Responsive design
 - Browse your audio collection using tag-based filters
-- Custom tag support
 - User management
 - Persistent play queue
 - Radio mode
 - MusicBrainzID support to handle duplicated artist and release names
 - Audio transcode for maximum interoperability and low bandwith requirements
-
-LMS is written entirely in C++. Therefore, it is suitable to run on embedded devices, where space and memory are limited.
+- Custom tag support
 
 ## Installation
 Here are the required packages to build on Debian Stretch:

approot/messages.xml

@@ -88,12 +88,15 @@
 <message id="Lms.Explore.TracksInfo.most-played">Top tracks</message>
 
 
-<!--Playque-->
+<!--Playqueue-->
+<message id="Lms.PlayQueue.clear">Clear</message>
 <message id="Lms.PlayQueue.nb-tracks">{1} tracks</message>
 <message id="Lms.PlayQueue.nb-tracks-added">Added {1} tracks</message>
 <message id="Lms.PlayQueue.nb-tracks-playing">Playing {1} tracks</message>
 <message id="Lms.PlayQueue.playqueue">Play Queue</message>
 <message id="Lms.PlayQueue.radio-mode">Radio mode</message>
+<message id="Lms.PlayQueue.repeat">Repeat</message>
+<message id="Lms.PlayQueue.shuffle">Shuffle</message>
 
 <!--PlayHistory-->
 <message id="Lms.PlayHistory.playhistory">Play History</message>

approot/playqueue.xml

@@ -2,20 +2,26 @@
 <messages xmlns:if="Wt.WTemplate.conditions">
 <!--FORMS message blocks-->
 
-<message id="Lms.PlayQueue.clear">
+<message id="Lms.PlayQueue.template.clear-btn">
 	<i class="fa fa-times-circle Lms-playqueue-btn"></i>
 </message>
 
-<message id="Lms.PlayQueue.shuffle">
+<message id="Lms.PlayQueue.template.shuffle-btn">
 	<i class="fa fa-random Lms-playqueue-btn"></i>
 </message>
 
+<message id="Lms.PlayQueue.template.repeat-btn">
+	<i class="fa fa-repeat Lms-playqueue-btn"></i>
+</message>
+
+<message id="Lms.PlayQueue.template.radio-btn">
+	<i class="fa fa-rss Lms-playqueue-btn"></i>
+</message>
+
 <message id="Lms.PlayQueue.template">
 	<div class="page-header">
 		<h2>${tr:Lms.PlayQueue.playqueue}</h2>
-		${clear-btn}
-		${shuffle-btn}
-		${radio-mode}
+		${clear-btn}${shuffle-btn}${repeat-btn}${radio-btn}
 		<h4><small>${nb-tracks}</small></h4>
 	</div>
 	${entries}
@@ -26,11 +32,11 @@
 	</div>
 </message>
 
-<message id="Lms.PlayQueue.play">
+<message id="Lms.PlayQueue.template.play-btn">
 	<i class="fa fa-play-circle Lms-playqueue-btn"></i>
 </message>
 
-<message id="Lms.PlayQueue.delete">
+<message id="Lms.PlayQueue.template.delete-btn">
 	<i class="fa fa-times-circle Lms-playqueue-btn"></i>
 </message>
 

docroot/css/lms.css

@@ -248,6 +248,10 @@ a:hover {
 	color: #337ab7;
 }
 
+.Lms-playqueue-btn-selected {
+	color: #337ab7;
+}
+
 .Lms-playqueue-selected {
 	font-weight: 800;
 }

src/Makefile.am

@@ -41,7 +41,7 @@ lms_SOURCES = \
 	$(srcdir)/ui/explore/TracksInfoView.cpp			\
 	$(srcdir)/ui/explore/TracksView.cpp			\
 	$(srcdir)/ui/resource/ImageResource.cpp			\
-	$(srcdir)/ui/resource/TranscodeResource.cpp		\
+	$(srcdir)/ui/resource/AudioResource.cpp			\
 	$(srcdir)/utils/Config.cpp				\
 	$(srcdir)/utils/Logger.cpp				\
 	$(srcdir)/utils/Path.cpp				\

src/av/AvTranscoder.hpp

@@ -42,8 +42,6 @@ enum class Encoding
 };
 
 std::string encodingToMimetype(Encoding encoding);
-int encodingToInt(Encoding encoding);
-Encoding encodingFromInt(int encoding);
 
 struct TranscodeParameters
 {

src/cover/CoverArtGrabber.cpp

@@ -43,12 +43,15 @@ isFileSupported(const boost::filesystem::path& file, const std::vector<boost::fi
 
 	return false;
 }
+
 } // namespace
 
 namespace CoverArt {
 
 Grabber::Grabber()
 {
+	if (!_defaultCover.load( Wt::WApplication::instance()->docRoot() + "/images/unknown-cover.jpg"))
+		throw LmsException("Cannot read default cover file");
 }
 
 Grabber&
@@ -58,48 +61,63 @@ Grabber::instance()
 	return instance;
 }
 
-static std::vector<Image::Image>
-getFromAvMediaFile(const Av::MediaFile& input, std::size_t nbMaxCovers)
+Image::Image
+Grabber::getDefaultCover(std::size_t size)
+{
+	std::unique_lock<std::mutex> lock(_mutex);
+
+	auto it = _defaultCovers.find(size);
+	if (it == _defaultCovers.end())
+	{
+		Image::Image cover = _defaultCover;
+
+		cover.scale(size);
+		auto res = _defaultCovers.insert(std::make_pair(size, cover));
+		assert(res.second);
+		it = res.first;
+	}
+
+	return it->second;
+}
+
+static boost::optional<Image::Image>
+getFromAvMediaFile(const Av::MediaFile& input)
 {
 	std::vector<Image::Image> res;
 
-	for (Av::Picture& picture : input.getAttachedPictures(nbMaxCovers))
+	for (auto& picture : input.getAttachedPictures(2))
 	{
 		Image::Image image;
 
 		if (image.load(picture.data))
-			res.push_back( image );
+			return image;
 		else
 			LMS_LOG(COVER, ERROR) << "Cannot load embedded cover file in '" << input.getPath().string() << "'";
 	}
 
-	return res;
+	LMS_LOG(COVER, DEBUG) << "No cover found in media file '" << input.getPath().string() << "'";
+	return boost::none;
 }
 
-std::vector<Image::Image>
-Grabber::getFromDirectory(const boost::filesystem::path& p, std::size_t nbMaxCovers) const
+boost::optional<Image::Image>
+Grabber::getFromDirectory(const boost::filesystem::path& p) const
 {
-	std::vector<Image::Image> res;
-
-	std::vector<boost::filesystem::path> coverPathes = getCoverPaths(p, nbMaxCovers);
-	for (auto coverPath : coverPathes)
+	for (auto coverPath : getCoverPaths(p))
 	{
-		if (res.size() >= nbMaxCovers)
-			break;
-
 		Image::Image image;
 
 		if (image.load(coverPath))
-			res.push_back(image);
+			return image;
 		else
 			LMS_LOG(COVER, ERROR) << "Cannot load image in file '" << coverPath.string() << "'";
 	}
 
-	return res;
+	LMS_LOG(COVER, DEBUG) << "No cover found in directory '" << p.string() << "'";
+	return boost::none;
 }
 
 std::vector<boost::filesystem::path>
-Grabber::getCoverPaths(const boost::filesystem::path& directoryPath, std::size_t nbMaxCovers) const
+Grabber::getCoverPaths(const boost::filesystem::path& directoryPath) const
 {
 	std::vector<boost::filesystem::path> res;
 	boost::system::error_code ec;
@@ -126,86 +144,108 @@ Grabber::getCoverPaths(const boost::filesystem::path& directoryPath, std::size_t
 		}
 
 		res.push_back(path);
-		if (res.size() >= nbMaxCovers)
-			break;
 	}
+
 	return res;
 }
 
-std::vector<Image::Image>
-Grabber::getFromTrack(const boost::filesystem::path& p, std::size_t nbMaxCovers) const
+boost::optional<Image::Image>
+Grabber::getFromTrack(const boost::filesystem::path& p) const
 {
 	try
 	{
 		Av::MediaFile input(p);
 
-		return getFromAvMediaFile(input, nbMaxCovers);
+		return getFromAvMediaFile(input);
 	}
 	catch (Av::MediaFileException& e)
 	{
 		LMS_LOG(COVER, ERROR) << "Cannot get covers from track " << p.string() << ": " << e.what();
+		return boost::none;
 	}
-
-	return std::vector<Image::Image>();
 }
 
-std::vector<Image::Image>
-Grabber::getFromTrack(Wt::Dbo::Session& session, Database::IdType trackId, std::size_t nbMaxCovers) const
+Image::Image
+Grabber::getFromTrack(Wt::Dbo::Session& session, Database::IdType trackId, std::size_t size)
 {
 	using namespace Database;
 
-	Wt::Dbo::Transaction transaction(session);
+	boost::optional<Image::Image> cover;
 
-	Track::pointer track = Track::getById(session, trackId);
-	if (!track)
-		return std::vector<Image::Image>();
-
-	Track::CoverType coverType = track->getCoverType();
-	boost::filesystem::path trackPath = track->getPath();
-
-	transaction.commit();
-
-	switch (coverType)
 	{
-		case Track::CoverType::Embedded:
-			return Grabber::getFromTrack(trackPath, nbMaxCovers);
-		case Track::CoverType::None:
-			return Grabber::getFromDirectory(trackPath.parent_path(), nbMaxCovers);
+		Wt::Dbo::Transaction transaction(session);
+
+		Track::pointer track = Track::getById(session, trackId);
+		if (track)
+		{
+			Track::CoverType coverType = track->getCoverType();
+			boost::filesystem::path trackPath = track->getPath();
+
+			transaction.commit();
+
+			if (coverType == Track::CoverType::Embedded)
+				cover = getFromTrack(trackPath);
+
+			if (!cover)
+				cover = getFromDirectory(trackPath.parent_path());
+		}
 	}
 
-	return std::vector<Image::Image>();
+	if (!cover)
+		cover = getDefaultCover(size);
+	else
+		cover->scale(size);
+
+	return *cover;
 }
 
 
-std::vector<Image::Image>
-Grabber::getFromRelease(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t nbMaxCovers) const
+Image::Image
+Grabber::getFromRelease(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t size)
 {
 	using namespace Database;
 
-	Wt::Dbo::Transaction transaction(session);
+	boost::optional<Image::Image> cover;
 
-	// If the release does not exist, do nothing
-	Release::pointer release = Release::getById(session, releaseId);
-	if (!release)
-		return std::vector<Image::Image>();
+	{
+		Wt::Dbo::Transaction transaction(session);
 
-	std::vector<Track::pointer> tracks = release->getTracks();
-	if (tracks.empty())
-		return std::vector<Image::Image>();
+		auto release = Release::getById(session, releaseId);
+		if (release)
+		{
+			auto tracks = release->getTracks();
+			if (!tracks.empty())
+			{
+				auto trackId = tracks.front().id();
+				transaction.commit();
 
-	boost::filesystem::path firstTrackPath = tracks.front()->getPath();
-	bool embeddedCover = (tracks.front()->getCoverType() == Track::CoverType::Embedded);
+				return getFromTrack(session, trackId, size);
+			}
+		}
+	}
 
-	transaction.commit();
+	if (!cover)
+		cover = getDefaultCover(size);
+	else
+		cover->scale(size);
 
-	// First, try to get covers from the directory of the release
-	std::vector<Image::Image> res = getFromDirectory( firstTrackPath.parent_path(), nbMaxCovers);
+	return *cover;
+}
 
-	// Fallback on the embedded cover of the first track
-	if (res.empty() && embeddedCover)
-		res = getFromTrack( firstTrackPath, nbMaxCovers);
+std::vector<uint8_t>
+Grabber::getFromTrack(Wt::Dbo::Session& session, Database::IdType trackId, Image::Format format, std::size_t size)
+{
+	Image::Image cover = getFromTrack(session, trackId, size);
 
-	return res;
+	return cover.save(Image::Format::JPEG);
+}
+
+std::vector<uint8_t>
+Grabber::getFromRelease(Wt::Dbo::Session& session, Database::IdType releaseId, Image::Format format, std::size_t size)
+{
+	Image::Image cover = getFromRelease(session, releaseId, size);
+
+	return cover.save(Image::Format::JPEG);
 }
 
 } // namespace CoverArt

src/cover/CoverArtGrabber.hpp

@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <map>
+#include <mutex>
 #include <vector>
 
 #include "database/Types.hpp"
@@ -35,18 +37,32 @@ class Grabber
 
 		static Grabber& instance();
 
-		std::vector<boost::filesystem::path>	getCoverPaths(const boost::filesystem::path& directoryPath, std::size_t nbMaxCovers = 1) const;
-		std::vector<Image::Image>	getFromDirectory(const boost::filesystem::path& path, std::size_t nbMaxCovers = 1) const;
-		std::vector<Image::Image>	getFromTrack(const boost::filesystem::path& path, std::size_t nbMaxCovers = 1) const;
-		std::vector<Image::Image>	getFromTrack(Wt::Dbo::Session& session, Database::IdType trackId, std::size_t nbMaxCovers = 1) const;
-		std::vector<Image::Image>	getFromRelease(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t nbMaxCovers = 1) const;
+		std::vector<uint8_t>	getFromTrack(Wt::Dbo::Session& session, Database::IdType trackId, Image::Format format, std::size_t size);
+		std::vector<uint8_t>	getFromRelease(Wt::Dbo::Session& session, Database::IdType releaseId, Image::Format format, std::size_t size);
 
 	private:
+
 		Grabber();
 
+		Image::Image		getFromTrack(Wt::Dbo::Session& session, Database::IdType trackId, std::size_t size);
+		Image::Image		getFromRelease(Wt::Dbo::Session& session, Database::IdType releaseId, std::size_t size);
+
+		boost::optional<Image::Image>		getFromTrack(const boost::filesystem::path& path) const;
+		std::vector<boost::filesystem::path>	getCoverPaths(const boost::filesystem::path& directoryPath) const;
+		boost::optional<Image::Image>		getFromDirectory(const boost::filesystem::path& path) const;
+
+		Image::Image	getDefaultCover(std::size_t size);
+
+		Image::Image _defaultCover;
+
+		std::mutex _mutex;
+		std::map<std::size_t /* size */, Image::Image> _defaultCovers;
+
 		std::vector<boost::filesystem::path> _fileExtensions
 			= {".jpg", ".jpeg", ".png", ".bmp"}; // TODO parametrize
+
 		std::size_t _maxFileSize = 5000000;
+
 		std::vector<boost::filesystem::path> _preferredFileNames
 			= {"cover", "front"}; // TODO parametrize
 };

src/database/User.cpp

@@ -28,6 +28,7 @@ const std::vector<std::size_t>
 User::audioBitrates =
 {
 	64000,
+	96000,
 	128000,
 	192000,
 	320000,

src/image/Image.cpp

@@ -97,13 +97,13 @@ Image::scale(std::size_t size)
 	}
 	catch (Magick::Exception& e)
 	{
-		LMS_LOG(COVER, ERROR) << "Caught Magick exception: " << e.what();
+		LMS_LOG(COVER, ERROR) << "Caught Magick exception during scale: " << e.what();
 		return false;
 	}
 }
 
-void
-Image::save(std::vector<unsigned char>& data, Format format) const
+std::vector<uint8_t>
+Image::save(Format format) const
 {
 	Magick::Image outputImage(_image);
 
@@ -112,8 +112,9 @@ Image::save(std::vector<unsigned char>& data, Format format) const
 	Magick::Blob blob;
 	outputImage.write(&blob);
 
-	unsigned char *charBuf = (unsigned char*)blob.data();
-	data.assign( charBuf, charBuf + blob.length() );
+	auto begin = static_cast<const uint8_t*>(blob.data());
+
+	return std::vector<uint8_t>(begin, begin + blob.length());
 }
 
 } // namespace Image

src/image/Image.hpp

@@ -49,7 +49,7 @@ class Image
 		bool	scale(std::size_t size);
 
 		// output
-		void	save(std::vector<unsigned char>& rawData, Format format) const;
+		std::vector<uint8_t> save(Format format) const;
 
 	private:
 		Magick::Image	_image;

src/ui/LmsApplication.cpp

@@ -46,7 +46,7 @@
 #include "admin/UsersView.hpp"
 
 #include "resource/ImageResource.hpp"
-#include "resource/TranscodeResource.hpp"
+#include "resource/AudioResource.hpp"
 
 namespace UserInterface {
 
@@ -78,7 +78,7 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti
   _appGroups(appGroups),
   _scanner(scanner),
   _imageResource(nullptr),
-  _transcodeResource(nullptr)
+  _audioResource(nullptr)
 {
 	auto  bootstrapTheme = std::make_unique<Wt::WBootstrapTheme>();
 	bootstrapTheme->setVersion(Wt::BootstrapVersion::v3);
@@ -328,8 +328,8 @@ LmsApplication::createHome()
 		_isAdmin = LmsApp->getUser()->isAdmin();
 	}
 
-	_imageResource = std::make_shared<ImageResource>(_db);
-	_transcodeResource = std::make_shared<TranscodeResource>(_db);
+	_imageResource = std::make_shared<ImageResource>();
+	_audioResource = std::make_shared<AudioResource>();
 
 	setConfirmCloseMessage(Wt::WString::tr("Lms.quit-confirm"));
 

src/ui/LmsApplication.hpp

@@ -35,7 +35,7 @@
 
 namespace UserInterface {
 
-class TranscodeResource;
+class AudioResource;
 class ImageResource;
 
 // Events that can be listen to anywhere in the application
@@ -75,7 +75,7 @@ class LmsApplication : public Wt::WApplication
 
 		// Session application data
 		std::shared_ptr<ImageResource> getImageResource() { return _imageResource; }
-		std::shared_ptr<TranscodeResource> getTranscodeResource() { return _transcodeResource; }
+		std::shared_ptr<AudioResource> getAudioResource() { return _audioResource; }
 		Database::Handler& getDb() { return _db;}
 		Wt::Dbo::Session& getDboSession() { return _db.getSession();}
 
@@ -122,7 +122,7 @@ class LmsApplication : public Wt::WApplication
 		Auth*			_auth;
 		Scanner::MediaScanner&	_scanner;
 		std::shared_ptr<ImageResource>	_imageResource;
-		std::shared_ptr<TranscodeResource>	_transcodeResource;
+		std::shared_ptr<AudioResource>	_audioResource;
 		bool			_isAdmin = false;
 };
 

src/ui/MediaPlayer.cpp

@@ -26,7 +26,7 @@
 
 
 #include "resource/ImageResource.hpp"
-#include "resource/TranscodeResource.hpp"
+#include "resource/AudioResource.hpp"
 
 #include "LmsApplication.hpp"
 
@@ -65,7 +65,7 @@ MediaPlayer::loadTrack(Database::IdType trackId, bool play)
 	{
 		Av::MediaFile mediaFile(track->getPath());
 
-		auto resource = LmsApp->getTranscodeResource()->getUrl(trackId, Av::Encoding::MP3);
+		auto resource = LmsApp->getAudioResource()->getUrl(trackId);
 		auto imgResource = LmsApp->getImageResource()->getTrackUrl(trackId, 64);
 
 		std::ostringstream oss;
@@ -77,7 +77,7 @@ MediaPlayer::loadTrack(Database::IdType trackId, bool play)
 			<< "};";
 		oss << "LMS.mediaplayer.loadTrack(params, " << (play ? "true" : "false") << ")"; // true to autoplay
 
-		LMS_LOG(UI, DEBUG) << "Runing js = '" << oss.str() << "'";
+		LMS_LOG(UI, DEBUG) << "Running js = '" << oss.str() << "'";
 
 		_title->setText(Wt::WString::fromUTF8(track->getName()));
 

src/ui/PlayQueueView.cpp

@@ -38,22 +38,25 @@ PlayQueue::PlayQueue()
 {
 	addFunction("tr", &Wt::WTemplate::Functions::tr);
 
-	Wt::WText* clearBtn = bindNew<Wt::WText>("clear-btn", Wt::WString::tr("Lms.PlayQueue.clear"), Wt::TextFormat::XHTML);
-
-	_entriesContainer = bindNew<Wt::WContainerWidget>("entries");
-
-	_showMore = bindNew<Wt::WPushButton>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
-	_showMore->setHidden(true);
-
-	Wt::WText* shuffleBtn = bindNew<Wt::WText>("shuffle-btn", Wt::WString::tr("Lms.PlayQueue.shuffle"), Wt::TextFormat::XHTML);
-	_radioMode = bindNew<Wt::WCheckBox>("radio-mode", Wt::WString::tr("Lms.PlayQueue.radio-mode"));
-	_nbTracks = bindNew<Wt::WText>("nb-tracks");
-
+	Wt::WText* clearBtn = bindNew<Wt::WText>("clear-btn", Wt::WString::tr("Lms.PlayQueue.template.clear-btn"), Wt::TextFormat::XHTML);
+	clearBtn->setToolTip(Wt::WString::tr("Lms.PlayQueue.clear"));
 	clearBtn->clicked().connect([=]
 	{
 		clearTracks();
 	});
 
+	_entriesContainer = bindNew<Wt::WContainerWidget>("entries");
+
+	_showMore = bindNew<Wt::WPushButton>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
+	_showMore->setHidden(true);
+	_showMore->clicked().connect([=]
+	{
+		addSome();
+		updateCurrentTrack(true);
+	});
+
+	Wt::WText* shuffleBtn = bindNew<Wt::WText>("shuffle-btn", Wt::WString::tr("Lms.PlayQueue.template.shuffle-btn"), Wt::TextFormat::XHTML);
+	shuffleBtn->setToolTip(Wt::WString::tr("Lms.PlayQueue.shuffle"));
 	shuffleBtn->clicked().connect([=]
 	{
 		{
@@ -65,12 +68,24 @@ PlayQueue::PlayQueue()
 		addSome();
 	});
 
-	_showMore->clicked().connect([=]
+	Wt::WText* repeatBtn = bindNew<Wt::WText>("repeat-btn", Wt::WString::tr("Lms.PlayQueue.template.repeat-btn"), Wt::TextFormat::XHTML);
+	repeatBtn->setToolTip(Wt::WString::tr("Lms.PlayQueue.repeat"));
+	repeatBtn->clicked().connect([=]
 	{
-		addSome();
-		updateCurrentTrack(true);
+		_repeatAll = !_repeatAll;
+		repeatBtn->toggleStyleClass("Lms-playqueue-btn-selected", _repeatAll);
 	});
 
+	Wt::WText* radioBtn = bindNew<Wt::WText>("radio-btn", Wt::WString::tr("Lms.PlayQueue.template.radio-btn"));
+	radioBtn->setToolTip(Wt::WString::tr("Lms.PlayQueue.radio-mode"));
+	radioBtn->clicked().connect([=]
+	{
+		_radioMode = !_radioMode;
+		radioBtn->toggleStyleClass("Lms-playqueue-btn-selected", _radioMode);
+	});
+
+	_nbTracks = bindNew<Wt::WText>("nb-tracks");
+
 	LmsApp->preQuit().connect([=]
 	{
 		if (_tracklistId)
@@ -152,12 +167,17 @@ PlayQueue::load(std::size_t pos, bool play)
 		// If out of range, stop playing
 		if (pos >= tracklist->getCount())
 		{
-			stop();
-			return;
+			if (!_repeatAll)
+			{
+				stop();
+				return;
+			}
+
+			pos = 0;
 		}
 
 		// If last and radio mode, fill the next song
-		if (_radioMode->checkState() == Wt::CheckState::Checked && pos == tracklist->getCount() - 1)
+		if (_radioMode && pos == tracklist->getCount() - 1)
 			addRadioTrack();
 
 		_trackPos = pos;
@@ -293,7 +313,7 @@ PlayQueue::addSome()
 			entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(track->getRelease()));
 		}
 
-		Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.PlayQueue.play"), Wt::TextFormat::XHTML);
+		Wt::WText* playBtn = entry->bindNew<Wt::WText>("play-btn", Wt::WString::tr("Lms.PlayQueue.template.play-btn"), Wt::TextFormat::XHTML);
 		playBtn->clicked().connect(std::bind([=]
 		{
 			auto pos = _entriesContainer->indexOf(entry);
@@ -301,7 +321,7 @@ PlayQueue::addSome()
 				load(pos, true);
 		}));
 
-		Wt::WText* delBtn = entry->bindNew<Wt::WText>("del-btn", Wt::WString::tr("Lms.PlayQueue.delete"), Wt::TextFormat::XHTML);
+		Wt::WText* delBtn = entry->bindNew<Wt::WText>("del-btn", Wt::WString::tr("Lms.PlayQueue.template.delete-btn"), Wt::TextFormat::XHTML);
 		delBtn->clicked().connect(std::bind([=]
 		{
 			// Remove the entry n both the widget tree and the playqueue

src/ui/PlayQueueView.hpp

@@ -67,8 +67,9 @@ class PlayQueue : public Wt::WTemplate
 		void load(std::size_t pos, bool play);
 		void stop();
 
+		bool _repeatAll = false;
+		bool _radioMode = false;
 		boost::optional<Database::IdType> _tracklistId;
-		Wt::WCheckBox* _radioMode;
 		Wt::WContainerWidget* _entriesContainer;
 		Wt::WPushButton* _showMore;
 		Wt::WText* _nbTracks;

src/ui/resource/AudioResource.cpp

@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "TranscodeResource.hpp"
+#include "AudioResource.hpp"
 
 #include <Wt/Http/Response.h>
 
@@ -29,28 +29,22 @@
 
 namespace UserInterface {
 
-TranscodeResource::TranscodeResource(Database::Handler& db)
-: _db(db)
-{
-	LMS_LOG(UI, DEBUG) << "CONSTRUCTING RESOURCE";
-}
 
-TranscodeResource:: ~TranscodeResource()
+AudioResource:: ~AudioResource()
 {
-	LMS_LOG(UI, DEBUG) << "DESTRUCTING RESOURCE";
 	beingDeleted();
 }
 
 std::string
-TranscodeResource::getUrl(Database::IdType trackId, Av::Encoding encoding) const
+AudioResource::getUrl(Database::IdType trackId) const
 {
-	std::string res = url()+ "&trackid=" + std::to_string(trackId) + "&encoding=" + std::to_string(Av::encodingToInt(encoding));
+	std::string res = url()+ "&trackid=" + std::to_string(trackId);
 
 	return res;
 }
 
 void
-TranscodeResource::handleRequest(const Wt::Http::Request& request,
+AudioResource::handleRequest(const Wt::Http::Request& request,
 		Wt::Http::Response& response)
 {
 	std::shared_ptr<Av::Transcoder> transcoder;
@@ -83,14 +77,6 @@ TranscodeResource::handleRequest(const Wt::Http::Request& request,
 			auto offsetStr = request.getParameter("offset");
 			if (offsetStr)
 				parameters.offset = std::chrono::seconds(std::stol(*offsetStr));
-
-			auto encodingStr = request.getParameter("encoding");
-			if (encodingStr)
-				parameters.encoding = Av::encodingFromInt(std::stol(*encodingStr));
-
-			auto streamStr = request.getParameter("stream");
-			if (streamStr)
-				parameters.stream = std::stol(*streamStr);
 		}
 		catch (std::exception &e)
 		{
@@ -100,12 +86,11 @@ TranscodeResource::handleRequest(const Wt::Http::Request& request,
 
 		// transactions are not thread safe
 		{
-			Wt::WApplication::UpdateLock lock(LmsApplication::instance());
+			Wt::WApplication::UpdateLock lock(LmsApp);
 
-			Wt::Dbo::Transaction transaction(_db.getSession());
+			Wt::Dbo::Transaction transaction(LmsApp->getDboSession());
 
-			Database::User::pointer user = _db.getCurrentUser();
-			Database::Track::pointer track = Database::Track::getById(_db.getSession(), trackId);
+			Database::Track::pointer track = Database::Track::getById(LmsApp->getDboSession(), trackId);
 
 			if (!track)
 			{
@@ -113,7 +98,23 @@ TranscodeResource::handleRequest(const Wt::Http::Request& request,
 				return;
 			}
 
-			parameters.bitrate = user->getAudioBitrate();
+			parameters.bitrate = LmsApp->getUser()->getAudioBitrate();
+
+			switch (LmsApp->getUser()->getAudioEncoding())
+			{
+				case Database::AudioEncoding::OGA:
+					parameters.encoding = Av::Encoding::OGA;
+					break;
+				case Database::AudioEncoding::WEBMA:
+					parameters.encoding = Av::Encoding::WEBMA;
+					break;
+				case Database::AudioEncoding::MP3:
+					parameters.encoding = Av::Encoding::MP3;
+					break;
+				case Database::AudioEncoding::AUTO:
+				default:
+					parameters.encoding = Av::Encoding::MP3;
+			}
 			transcoder = std::make_shared<Av::Transcoder>(track->getPath(), parameters);
 		}
 

src/ui/resource/AudioResource.hpp

@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <mutex>
-
 #include <Wt/WResource.h>
 
 #include "av/AvTranscoder.hpp"
@@ -31,21 +29,18 @@
 
 namespace UserInterface {
 
-class TranscodeResource : public Wt::WResource
+class AudioResource : public Wt::WResource
 {
 	public:
-		TranscodeResource(Database::Handler& db);
-		~TranscodeResource();
+		~AudioResource();
 
-		std::string getUrl(Database::IdType trackId, Av::Encoding encoding) const;
+		std::string getUrl(Database::IdType trackId) const;
 
 		void handleRequest(const Wt::Http::Request& request,
 				Wt::Http::Response& response);
 
 	private:
 
-		Database::Handler&		_db;
-
 		static const std::size_t	_chunkSize = 65536*4;
 };
 

src/ui/resource/ImageResource.cpp

@@ -37,61 +37,11 @@ namespace UserInterface {
 static const std::string unknownCoverPath = "/images/unknown-cover.jpg";
 static const std::string unknownArtistImagePath = "/images/unknown-artist.jpg";
 
-ImageResource::ImageResource(Database::Handler& db)
-: _db(db)
-{
-}
-
 ImageResource::~ImageResource()
 {
 	beingDeleted();
 }
 
-Image::Image
-ImageResource::getDefaultCover(std::size_t size)
-{
-	std::unique_lock<std::mutex> lock(_mutex);
-
-	auto itCover = _defaultCovers.find(size);
-	if (itCover == _defaultCovers.end())
-	{
-		// Load default cover art for this size
-		Image::Image image;
-
-		if (!image.load( Wt::WApplication::instance()->docRoot() + unknownCoverPath ))
-			throw LmsException("Cannot read default cover file");
-
-		image.scale(size);
-
-		auto res = _defaultCovers.insert(std::make_pair(size, image));
-		itCover = res.first;
-	}
-
-	return itCover->second;
-}
-
-Image::Image
-ImageResource::getDefaultArtistImage(std::size_t size)
-{
-	std::unique_lock<std::mutex> lock(_mutex);
-
-	auto itCover = _defaultArtistImages.find(size);
-	if (itCover == _defaultArtistImages.end())
-	{
-		Image::Image image;
-
-		if (!image.load( Wt::WApplication::instance()->docRoot() + unknownArtistImagePath))
-			throw LmsException("Cannot read default artist image file");
-
-		image.scale(size);
-
-		auto res = _defaultArtistImages.insert(std::make_pair(size, image));
-		itCover = res.first;
-	}
-
-	return itCover->second;
-}
-
 std::string
 ImageResource::getReleaseUrl(Database::IdType releaseId, std::size_t size) const
 {
@@ -104,52 +54,12 @@ ImageResource::getTrackUrl(Database::IdType trackId, std::size_t size) const
 	return url() + "&trackid=" + std::to_string(trackId) + "&size=" + std::to_string(size);
 }
 
-std::string
-ImageResource::getArtistUrl(Database::IdType artistId, std::size_t size) const
-{
-	return url() + "&artistid=" + std::to_string(artistId) + "&size=" + std::to_string(size);
-}
-
-std::string
-ImageResource::getUnknownTrackUrl(size_t size) const
-{
-	return url() + "&size=" + std::to_string(size);
-}
-
-void
-ImageResource::putImage(Wt::Http::Response& response, Image::Image cover)
-{
-	std::vector<unsigned char> data;
-
-	cover.save(data, Image::Format::JPEG);
-
-	response.setMimeType( Image::format_to_mimeType(Image::Format::JPEG) );
-	response.out().write(reinterpret_cast<const char *>(&data[0]), data.size());
-}
-
-void
-ImageResource::putCover(Wt::Http::Response& response, std::vector<Image::Image> covers, size_t size)
-{
-	for (Image::Image cover : covers)
-	{
-		if (cover.scale(size))
-		{
-			putImage(response, cover);
-			return;
-		}
-	}
-
-	// If no cover found, just send default one
-	putImage(response, getDefaultCover(size));
-}
-
 void
 ImageResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response)
 {
 	// Retrieve parameters
 	const std::string *trackIdStr = request.getParameter("trackid");
 	const std::string *releaseIdStr = request.getParameter("releaseid");
-	const std::string *artistIdStr = request.getParameter("artistid");
 	const std::string *sizeStr = request.getParameter("size");
 
 	// Mandatory parameter size
@@ -160,48 +70,19 @@ ImageResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons
 	if (!size || *size > maxSize)
 		return;
 
+	std::vector<uint8_t> cover;
+
 	if (trackIdStr)
 	{
 		auto trackId = readAs<Database::IdType>(*trackIdStr);
 		if (!trackId)
 			return;
 
-		boost::filesystem::path path;
-		Database::Track::CoverType coverType = Database::Track::CoverType::None;
+		// transactions are not thread safe
 		{
-			// transactions are not thread safe
-			Wt::WApplication::UpdateLock lock(LmsApplication::instance());
-
-			Wt::Dbo::Transaction transaction(_db.getSession());
-
-			Database::Track::pointer track = Database::Track::getById(_db.getSession(), *trackId);
-			if (track)
-			{
-				coverType = track->getCoverType();
-				path = track->getPath();
-			}
+			Wt::WApplication::UpdateLock lock(LmsApp);
+			cover = CoverArt::Grabber::instance().getFromTrack(LmsApp->getDboSession(), *trackId, Image::Format::JPEG, *size);
 		}
-
-		if (!path.empty())
-		{
-			std::vector<Image::Image> covers;
-
-			switch (coverType)
-			{
-				case Database::Track::CoverType::Embedded:
-					covers = CoverArt::Grabber::instance().getFromTrack(path);
-					break;
-
-				case Database::Track::CoverType::None:
-					covers = CoverArt::Grabber::instance().getFromDirectory(path.parent_path());
-					break;
-			}
-
-			putCover(response, covers, *size);
-			return;
-		}
-
-		putImage(response, getDefaultCover(*size));
 	}
 	else if (releaseIdStr)
 	{
@@ -209,24 +90,17 @@ ImageResource::handleRequest(const Wt::Http::Request& request, Wt::Http::Respons
 		if (!releaseId)
 			return;
 
-		std::vector<Image::Image> covers;
-
 		// transactions are not thread safe
 		{
-			Wt::WApplication::UpdateLock lock(LmsApplication::instance());
-			covers = CoverArt::Grabber::instance().getFromRelease(_db.getSession(), *releaseId);
+			Wt::WApplication::UpdateLock lock(LmsApp);
+			cover = CoverArt::Grabber::instance().getFromRelease(LmsApp->getDboSession(), *releaseId, Image::Format::JPEG, *size);
 		}
-
-		putCover(response, covers, *size);
-	}
-	else if (artistIdStr)
-	{
-		putImage(response, getDefaultArtistImage(*size));
 	}
 	else
-	{
-		putImage(response, getDefaultCover(*size));
-	}
+		return;
+
+	response.setMimeType( Image::format_to_mimeType(Image::Format::JPEG) );
+	response.out().write(reinterpret_cast<const char *>(&cover[0]), cover.size());
 }
 
 } // namespace UserInterface

src/ui/resource/ImageResource.hpp

@@ -37,34 +37,13 @@ class ImageResource : public Wt::WResource
 	public:
 		static const std::size_t maxSize = 512;
 
-		ImageResource(Database::Handler& db);
 		~ImageResource();
 
 		std::string getReleaseUrl(Database::IdType releaseId, size_t size) const;
 		std::string getTrackUrl(Database::IdType trackId, size_t size) const;
-		std::string getArtistUrl(Database::IdType artistId, size_t size) const;
-		std::string getUnknownTrackUrl(size_t size) const;
 
 		void handleRequest(const Wt::Http::Request& request, Wt::Http::Response& response);
 
-	private:
-
-		Image::Image			getDefaultCover(std::size_t size);
-		Image::Image			getDefaultArtistImage(std::size_t size);
-		void				putImage(Wt::Http::Response& response, Image::Image image);
-		void				putCover(Wt::Http::Response& response, std::vector<Image::Image> covers, std::size_t size);
-
-		// Used to protect transactions since they are not thread safe
-		std::mutex			_mutex;
-		Database::Handler&		_db;
-
-		// Default cover for different sizes
-		std::map<std::size_t, Image::Image>	_defaultCovers;
-
-		// Default artist images for different sizes
-		std::map<std::size_t, Image::Image>	_defaultArtistImages;
-
-		// TODO construct a cache for covers?
 };
 
 } // namespace UserInterface