Merge branch 'develop'

TODO

@@ -27,7 +27,6 @@
 [UI]
 	- handle internationalization
 	[Settings]
-		- increase the menu's width / add margins
 		- logout users that are being changed (loss of admin admin rights), or make sure they are still admin when they make changes
 		- "signal not exposed" problem if a user logout and login again. bad resource destruction?
 		[user/transcoding]
@@ -43,8 +42,7 @@
 	- MediaPlayer: move slider using js (http://redmine.webtoolkit.eu/boards/2/topics/7924?r=8478)
 	- TrackView : handle duration > 1 hour
 	- TrackView : Reselect the current selected item when displaying the updated search results
-	- Add Year column in the release filter. Add covers too?
-	- Save/Load playlists
+	- Add covers in the release filter?
 
 	[Video]
 	- implement a decent mediaplayer

src/Makefile.am

@@ -13,6 +13,7 @@ lms_SOURCES = \
 	$(srcdir)/cover/CoverArtGrabber.cpp			\
 	$(srcdir)/database/DatabaseHandler.cpp			\
 	$(srcdir)/database/MediaDirectory.cpp			\
+	$(srcdir)/database/Playlist.cpp				\
 	$(srcdir)/database/SqlQuery.cpp				\
 	$(srcdir)/database/Track.cpp				\
 	$(srcdir)/database/User.cpp				\

src/av/InputFormatContext.cpp

@@ -154,8 +154,6 @@ InputFormatContext::getPictures(std::vector<Picture>& pictures) const
 			else
 				picture.mimeType = "application/octet-stream";
 
-			LMS_LOG(MOD_AV, SEV_DEBUG) << "MIME set to '" << picture.mimeType << "'" << std::endl;
-
 			AVPacket pkt = native()->streams[i]->attached_pic;
 
 			std::copy(pkt.data, pkt.data + pkt.size, std::back_inserter(picture.data));

src/cover/CoverArtGrabber.hpp

@@ -23,7 +23,7 @@
 #include <vector>
 
 #include "av/InputFormatContext.hpp"
-#include "database/AudioTypes.hpp"
+#include "database/Types.hpp"
 
 #include "CoverArt.hpp"
 

src/database-updater/DatabaseUpdater.cpp

@@ -25,9 +25,7 @@
 
 #include "logger/Logger.hpp"
 
-#include "database/MediaDirectory.hpp"
-#include "database/AudioTypes.hpp"
-#include "database/VideoTypes.hpp"
+#include "database/Types.hpp"
 
 #include "Checksum.hpp"
 #include "DatabaseUpdater.hpp"

src/database-updater/DatabaseUpdater.hpp

@@ -25,8 +25,6 @@
 
 #include "metadata/MetaData.hpp"
 
-#include "database/DatabaseHandler.hpp"
-#include "database/MediaDirectory.hpp"
 #include "database/DatabaseHandler.hpp"
 
 namespace DatabaseUpdater {

src/database/DatabaseHandler.cpp

@@ -27,12 +27,6 @@
 
 #include "logger/Logger.hpp"
 
-// Db types
-#include "AudioTypes.hpp"
-#include "VideoTypes.hpp"
-#include "MediaDirectory.hpp"
-#include "User.hpp"
-
 #include "DatabaseHandler.hpp"
 
 namespace Database {
@@ -85,6 +79,8 @@ _dbBackend( db.string() )
 	_session.setConnection(_dbBackend);
 	_session.mapClass<Database::Genre>("genre");
 	_session.mapClass<Database::Track>("track");
+	_session.mapClass<Database::Playlist>("playlist");
+	_session.mapClass<Database::PlaylistEntry>("playlist_entry");
 	_session.mapClass<Database::Video>("video");
 	_session.mapClass<Database::MediaDirectory>("media_directory");
 	_session.mapClass<Database::MediaDirectorySettings>("media_directory_settings");

src/database/DatabaseHandler.hpp

@@ -28,11 +28,11 @@
 #include <Wt/Auth/Login>
 #include <Wt/Auth/PasswordService>
 
-#include "User.hpp"
+#include "Types.hpp"
 
 namespace Database {
 
-		typedef Wt::Auth::Dbo::UserDatabase<AuthInfo> UserDatabase;
+typedef Wt::Auth::Dbo::UserDatabase<AuthInfo> UserDatabase;
 
 // Session living class handling the database and the login
 class Handler
@@ -44,8 +44,8 @@ class Handler
 
 		Wt::Dbo::Session& getSession() { return _session; }
 
-		User::pointer getCurrentUser();	// get the current user, may return empty
-		User::pointer getUser(const Wt::Auth::User& authUser);	// Get or create the given user
+		Wt::Dbo::ptr<User> getCurrentUser();	// get the current user, may return empty
+		Wt::Dbo::ptr<User> getUser(const Wt::Auth::User& authUser);	// Get or create the given user
 
 		Wt::Auth::AbstractUserDatabase& getUserDatabase();
 		Wt::Auth::Login& getLogin() { return _login; }

src/database/MediaDirectory.cpp

@@ -19,7 +19,7 @@
 
 #include <boost/foreach.hpp>
 
-#include "MediaDirectory.hpp"
+#include "Types.hpp"
 
 namespace Database {
 

src/database/Playlist.cpp

@@ -17,22 +17,76 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "AudioTypes.hpp"
+#include "Types.hpp"
 
 namespace Database {
 
 Playlist::Playlist()
-: _public(false)
+: _isPublic(false)
 {
 
 }
 
-Playlist::Playlist(std::string name, Wt::Dbo::ptr<User> user, bool isPublic)
-: _public(isPublic),
+Playlist::Playlist(std::string name, bool isPublic, Wt::Dbo::ptr<User> user)
+: _name(name),
+ _isPublic(isPublic),
  _user(user)
 {
 
 }
 
+Playlist::pointer
+Playlist::create(Wt::Dbo::Session& session, std::string name, bool isPublic, Wt::Dbo::ptr<User> user)
+{
+	return session.add( new Playlist(name, isPublic, user) );
+}
+
+PlaylistEntry::PlaylistEntry()
+: _pos(0)
+{
+
+}
+
+Playlist::pointer
+Playlist::get(Wt::Dbo::Session& session, std::string name, Wt::Dbo::ptr<User> user)
+{
+	return session.find<Playlist>().where("name = ? AND user_id = ?").bind(name).bind(user.id());
+}
+
+std::vector<Playlist::pointer>
+Playlist::get(Wt::Dbo::Session& session, Wt::Dbo::ptr<User> user)
+{
+	Wt::Dbo::collection<Playlist::pointer> res = session.find<Playlist>().where("user_id = ?").bind(user.id()).orderBy("name");
+
+	return std::vector<Playlist::pointer>(res.begin(), res.end());
+}
+
+PlaylistEntry::PlaylistEntry(Wt::Dbo::ptr<Track> track, Wt::Dbo::ptr<Playlist> playlist, int pos)
+: _pos(pos),
+ _track(track),
+ _playlist(playlist)
+{
+
+}
+
+PlaylistEntry::pointer
+PlaylistEntry::create(Wt::Dbo::Session& session, Wt::Dbo::ptr<Track> track, Wt::Dbo::ptr<Playlist> playlist, int pos)
+{
+	return session.add( new PlaylistEntry( track, playlist, pos) );
+}
+
+std::vector<Track::id_type>
+PlaylistEntry::getEntries(Wt::Dbo::Session& session, Playlist::pointer playlist)
+{
+	typedef Wt::Dbo::collection<pointer> Entries;
+
+	Entries entries = session.find<PlaylistEntry>().where("playlist_id = ?").bind(playlist.id()).orderBy("pos");
+
+	std::vector<Track::id_type> res;
+	for (Entries::iterator it = entries.begin(); it != entries.end(); ++it)
+		res.push_back((*it)->getTrack().id());
+
+	return res;
+}
+
 } // namespace Database

src/database/Playlist.hpp

@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2014 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef DATABASE_PLAYLIST_HPP
+#define DATABASE_PLAYLIST_HPP
+
+#include <Wt/Dbo/Dbo>
+
+namespace Database {
+
+class PlaylistEntry;
+class User;
+class Track;
+
+class Playlist
+{
+	public:
+		typedef Wt::Dbo::ptr<Playlist> pointer;
+
+		Playlist();
+		Playlist(std::string name, bool isPublic, Wt::Dbo::ptr<User> user);
+
+		// Search utility
+		static pointer	get(Wt::Dbo::Session& session, std::string name, Wt::Dbo::ptr<User> user);
+
+		// ordered by name
+		static std::vector<pointer>	get(Wt::Dbo::Session& session, Wt::Dbo::ptr<User> user);
+
+		// Create utility
+		static pointer	create(Wt::Dbo::Session& session, std::string name, bool isPublic, Wt::Dbo::ptr<User> user);
+
+		// Accessors
+		std::string	getName() const { return _name; }
+
+		template<class Action>
+		void persist(Action& a)
+		{
+			Wt::Dbo::field(a,	_name,		"name");
+			Wt::Dbo::field(a,	_isPublic,	"public");
+			Wt::Dbo::belongsTo(a,	_user,		"user", Wt::Dbo::OnDeleteCascade);
+			Wt::Dbo::hasMany(a, _entries, Wt::Dbo::ManyToOne, "playlist");
+		}
+
+	private:
+
+		std::string		_name;
+		bool			_isPublic;
+		Wt::Dbo::ptr<User>	_user;
+		Wt::Dbo::collection< Wt::Dbo::ptr<PlaylistEntry> > _entries;
+
+};
+
+class PlaylistEntry
+{
+	public:
+
+		typedef Wt::Dbo::ptr<PlaylistEntry> pointer;
+
+		PlaylistEntry();
+		PlaylistEntry(Wt::Dbo::ptr<Track> rack, Wt::Dbo::ptr<Playlist> playlist, int position);
+
+		// Search utility
+
+		// Get the position ordered track id list
+		static std::vector<Track::id_type> getEntries(Wt::Dbo::Session& session,Wt::Dbo::ptr<Playlist> playlist);
+
+		// Create utility
+		static pointer	create(Wt::Dbo::Session& session, Wt::Dbo::ptr<Track> track, Wt::Dbo::ptr<Playlist> playlist, int position);
+
+		// Accesors
+		Wt::Dbo::ptr<Track>	getTrack() const { return _track; }
+
+		template<class Action>
+		void persist(Action& a)
+		{
+			Wt::Dbo::field(a,	_pos,	"pos");
+			Wt::Dbo::belongsTo(a,	_track, "track", Wt::Dbo::OnDeleteCascade);
+			Wt::Dbo::belongsTo(a,	_playlist, "playlist", Wt::Dbo::OnDeleteCascade);
+		}
+
+	private:
+
+		int			_pos;
+		Wt::Dbo::ptr<Track>	_track;
+		Wt::Dbo::ptr<Playlist>	_playlist;
+};
+
+} // namespace Database
+
+#endif

src/database/Track.cpp

@@ -25,7 +25,7 @@
 
 #include "SqlQuery.hpp"
 
-#include "AudioTypes.hpp"
+#include "Types.hpp"
 
 namespace Database {
 

src/database/Track.hpp

@@ -52,6 +52,7 @@ struct SearchFilter
 };
 
 class Track;
+class PlaylistEntry;
 
 class Genre
 {
@@ -174,6 +175,7 @@ class Track
 				Wt::Dbo::field(a, _fileChecksum,	"checksum");
 				Wt::Dbo::field(a, _hasCover,		"has_cover");
 				Wt::Dbo::hasMany(a, _genres, Wt::Dbo::ManyToMany, "track_genre", "", Wt::Dbo::OnDeleteCascade);
+				Wt::Dbo::hasMany(a, _playlistEntries, Wt::Dbo::ManyToOne, "track");
 			}
 
 	private:
@@ -198,10 +200,15 @@ class Track
 		boost::posix_time::ptime		_fileLastWrite;
 		bool					_hasCover;
 
-		Wt::Dbo::collection< Genre::pointer > _genres;	// Tracks that belong to this genre
+		Wt::Dbo::collection< Genre::pointer > _genres;	// Genres that are related to this track
+		Wt::Dbo::collection< Wt::Dbo::ptr<PlaylistEntry> > _playlistEntries;
+
 };
 
 
+
+
+
 } // namespace database
 
 #endif

src/database/Types.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Emeric Poupon
+ * Copyright (C) 2015 Emeric Poupon
  *
  * This file is part of LMS.
  *
@@ -17,23 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// header file aimed to ease database class declarations
 
-#include "AudioTypes.hpp"
+#include "Track.hpp"
+#include "Playlist.hpp"
+#include "Video.hpp"
+#include "MediaDirectory.hpp"
+#include "User.hpp"
 
-namespace Database {
-
-PlaylistEntry::PlaylistEntry()
-: _position(0)
-{
-
-}
-
-PlaylistEntry::PlaylistEntry(Wt::Dbo::ptr<Track> track, Wt::Dbo::ptr<Playlist> playlist)
-: _position(0),
- _track(track),
- _playlist(playlist)
-{
-
-}
-
-} // namespace Database

src/database/User.cpp

@@ -17,13 +17,10 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "User.hpp"
-
+#include "Types.hpp"
 
 namespace Database {
 
-
 // must be ordered
 const std::vector<std::size_t>
 	User::audioBitrates =
@@ -140,7 +137,6 @@ User::getMaxVideoBitrate(void) const
 		return videoBitrates.back();
 }
 
-
 } // namespace Database
 
 

src/database/User.hpp

@@ -20,7 +20,9 @@
 #ifndef DATABASE_USER_HPP
 #define DATABASE_USER_HPP
 
+#include <vector>
 
+#include <Wt/Dbo/Dbo>
 #include <Wt/Auth/Dbo/AuthInfo>
 
 namespace Database {
@@ -28,6 +30,8 @@ namespace Database {
 class User;
 typedef Wt::Auth::Dbo::AuthInfo<User> AuthInfo;
 
+class Playlist;
+
 class User {
 
 	public:
@@ -68,6 +72,7 @@ class User {
 				Wt::Dbo::field(a, _isAdmin, "admin");
 				Wt::Dbo::field(a, _audioBitrate, "audio_bitrate");
 				Wt::Dbo::field(a, _videoBitrate, "video_bitrate");
+				Wt::Dbo::hasMany(a, _playlists, Wt::Dbo::ManyToOne, "user");
 			}
 
 	private:
@@ -87,6 +92,8 @@ class User {
 		int		_audioBitrate;
 		int		_videoBitrate;
 
+		Wt::Dbo::collection< Wt::Dbo::ptr<Playlist> > _playlists;
+
 };
 
 } // namespace Databas'

src/database/Video.cpp

@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "VideoTypes.hpp"
+#include "Types.hpp"
 
 namespace Database {
 

src/remote/server/AudioCollectionRequestHandler.cpp

@@ -27,8 +27,7 @@
 
 #include "AudioCollectionRequestHandler.hpp"
 
-#include "database/AudioTypes.hpp"
-#include "database/MediaDirectory.hpp"
+#include "database/Types.hpp"
 #include "cover/CoverArtGrabber.hpp"
 
 namespace Remote {

src/remote/server/MediaRequestHandler.cpp

@@ -21,7 +21,7 @@
 
 #include "MediaRequestHandler.hpp"
 
-#include "database/AudioTypes.hpp"
+#include "database/Types.hpp"
 
 namespace Remote {
 namespace Server {

src/transcode/Format.cpp

@@ -30,7 +30,7 @@ const std::vector<Format> Format::_supportedFormats
 {
 	{Format::OGA, Format::Audio, "audio/ogg", "Ogg"},
 	{Format::OGV, Format::Video, "video/ogg", "Ogg"},
-	{Format::MP3, Format::Audio, "audio/mp3", "MP3"},
+	{Format::MP3, Format::Audio, "audio/mpeg", "MP3"},
 	{Format::WEBMA, Format::Audio, "audio/webm", "WebM"},
 	{Format::WEBMV, Format::Video, "video/webm", "WebM"},
 	{Format::FLV, Format::Video, "video/x-flv", "Flash Video"},

src/transcode/Parameters.cpp

@@ -27,13 +27,6 @@
 namespace Transcode
 {
 
-std::string
-getMimeType(Format format)
-{
-	//TODO
-	return "";
-}
-
 Parameters::Parameters(const InputMediaFile& inputMediaFile,
 		const Format& outputFormat)
 	:

src/ui/audio/Audio.cpp

@@ -24,7 +24,12 @@
 #include <Wt/WGridLayout>
 #include <Wt/WComboBox>
 #include <Wt/WPushButton>
-#include <Wt/WPopupMenu>
+#include <Wt/WMessageBox>
+
+#include <Wt/WLengthValidator>
+#include <Wt/WDialog>
+#include <Wt/WLineEdit>
+#include <Wt/WLabel>
 
 #include "logger/Logger.hpp"
 
@@ -33,6 +38,16 @@
 
 #include "Audio.hpp"
 
+namespace {
+
+void WPopupMenuClear(Wt::WPopupMenu* menu)
+{
+	while(menu->count() > 0)
+		menu->removeItem(menu->itemAt(0));
+}
+
+}
+
 namespace UserInterface {
 
 Audio::Audio(SessionData& sessionData, Wt::WContainerWidget* parent)
@@ -94,7 +109,6 @@ _playQueue(nullptr)
 	// Playlist/PlayQueue
 	{
 		Wt::Dbo::Transaction transaction(_db.getSession());
-		Database::User::pointer user = _db.getCurrentUser();
 
 		Wt::WContainerWidget* playQueueContainer = new Wt::WContainerWidget();
 		playQueueContainer->setStyleClass("playqueue");
@@ -108,13 +122,25 @@ _playQueue(nullptr)
 
 		Wt::WHBoxLayout* playlistControls = new Wt::WHBoxLayout();
 
-		Wt::WPushButton *saveBtn = new Wt::WPushButton("Save");
-		saveBtn->setStyleClass("btn-sm");
+		Wt::WPushButton *playlistBtn = new Wt::WPushButton("Playlist");
+		playlistBtn->setStyleClass("btn-sm btn-primary");
+		playlistControls->addWidget(playlistBtn);
 
-		playlistControls->addWidget(saveBtn);
-		Wt::WPushButton *loadBtn = new Wt::WPushButton("Load");
-		loadBtn->setStyleClass("btn-sm");
-		playlistControls->addWidget(loadBtn);
+		// Playlist menu
+		{
+			Wt::WPopupMenu *popupMain = new Wt::WPopupMenu();
+
+			_popupMenuSave = new Wt::WPopupMenu();
+			popupMain->addMenu("Save", _popupMenuSave);
+
+			_popupMenuLoad = new Wt::WPopupMenu();
+			popupMain->addMenu("Load", _popupMenuLoad);
+
+			_popupMenuDelete = new Wt::WPopupMenu();
+			popupMain->addMenu("Delete", _popupMenuDelete);
+
+			playlistBtn->setMenu(popupMain);
+		}
 
 		Wt::WPushButton *upBtn = new Wt::WPushButton("UP");
 		upBtn->setStyleClass("btn-sm");
@@ -134,27 +160,6 @@ _playQueue(nullptr)
 		downBtn->clicked().connect(_playQueue, &PlayQueue::moveSelectedDown);
 		clearBtn->clicked().connect(_playQueue, &PlayQueue::delAll);
 
-		// Load menu
-		{
-			Wt::WPopupMenu *popup = new Wt::WPopupMenu();
-
-			popup->addItem("Metal");
-			popup->addItem("Test");
-
-			loadBtn->setMenu(popup);
-		}
-
-		// Save Menu
-		{
-			Wt::WPopupMenu *popup = new Wt::WPopupMenu();
-
-			popup->addItem("New");
-			popup->addSeparator();
-			popup->addItem("Metal");
-			popup->addItem("Test");
-
-			saveBtn->setMenu(popup);
-		}
 
 		playQueueLayout->addLayout(playlistControls);
 
@@ -190,6 +195,226 @@ _playQueue(nullptr)
 	_mediaPlayer->playPrevious().connect(_playQueue, &PlayQueue::playPrevious);
 	_mediaPlayer->shuffle().connect(boost::bind(&PlayQueue::setShuffle, _playQueue, _1));
 	_mediaPlayer->loop().connect(boost::bind(&PlayQueue::setLoop,_playQueue, _1));
+
+	playlistRefreshMenus();
+}
+
+void
+Audio::playlistShowSaveNewDialog()
+{
+	Wt::WDialog *dialog = new Wt::WDialog("New playlist");
+
+	Wt::WLabel *label = new Wt::WLabel("Name", dialog->contents());
+	Wt::WLineEdit *edit = new Wt::WLineEdit(dialog->contents());
+	label->setBuddy(edit);
+
+	Wt::WLengthValidator* validator = new Wt::WLengthValidator();
+	validator->setMinimumLength(3);
+	validator->setMandatory(true);
+	edit->setValidator(validator);
+
+	Wt::WPushButton *save = new Wt::WPushButton("Save", dialog->footer());
+	save->setStyleClass("btn-success");
+	save->setDefault(true);
+	save->disable();
+
+	Wt::WPushButton *cancel = new Wt::WPushButton("Cancel", dialog->footer());
+	dialog->rejectWhenEscapePressed();
+
+	edit->keyWentUp().connect(std::bind([=] () {
+		save->setDisabled(edit->validate() != Wt::WValidator::Valid);
+	}));
+
+	save->clicked().connect(std::bind([=] ()
+	{
+		if (edit->validate())
+			dialog->accept();
+        }));
+
+	cancel->clicked().connect(dialog, &Wt::WDialog::reject);
+
+	dialog->finished().connect(std::bind([=] ()
+	{
+		if (dialog->result() == Wt::WDialog::Accepted)
+		{
+			playlistShowSaveDialog(edit->text().toUTF8());
+		}
+
+		delete dialog;
+	}));
+
+	dialog->show();
+}
+
+void
+Audio::playlistShowSaveDialog(std::string playlistName)
+{
+	Wt::Dbo::Transaction transaction(_db.getSession());
+
+	Database::User::pointer user = _db.getCurrentUser();
+	if (!user)
+		return;
+
+	// Actually create the dialog only if the given list already exists
+	if (Database::Playlist::get(_db.getSession(), playlistName, user))
+	{
+		Wt::WMessageBox *messageBox = new Wt::WMessageBox
+			("Overwrite playlist",
+			 Wt::WString( "Overwrite playlist '{1}'?").arg(playlistName),
+			 Wt::Question, Wt::Yes | Wt::No);
+
+		messageBox->setModal(true);
+
+		messageBox->buttonClicked().connect(std::bind([=] () {
+			if (messageBox->buttonResult() == Wt::Yes)
+				playlistSaveFromPlayqueue(playlistName);
+
+			delete messageBox;
+		}));
+
+		messageBox->show();
+	}
+	else
+	{
+		playlistSaveFromPlayqueue(playlistName);
+		playlistRefreshMenus();
+	}
+}
+
+void
+Audio::playlistSaveFromPlayqueue(std::string playlistName)
+{
+	LMS_LOG(MOD_UI, SEV_INFO) << "Saving playqueue to playlist '" << playlistName << "'";
+
+	Wt::Dbo::Transaction transaction(_db.getSession());
+
+	Database::User::pointer user = _db.getCurrentUser();
+	if (!user)
+		return;
+
+	Database::Playlist::pointer playlist = Database::Playlist::get(_db.getSession(), playlistName, user);
+	if (playlist)
+	{
+		LMS_LOG(MOD_UI, SEV_INFO) << "Erasing playlist '" << playlistName << "'";
+		playlist.remove();
+	}
+
+	playlist = Database::Playlist::create(_db.getSession(), playlistName, false, user);
+
+	std::vector<Database::Track::id_type> trackIds;
+	_playQueue->getTracks(trackIds);
+
+	int pos = 0;
+	BOOST_FOREACH(Database::Track::id_type trackId, trackIds)
+	{
+		Database::Track::pointer track = Database::Track::getById(_db.getSession(), trackId);
+
+		if (track)
+			Database::PlaylistEntry::create(_db.getSession(), track, playlist, pos++);
+	}
+
+	LMS_LOG(MOD_UI, SEV_INFO) << "Saving playqueue to playlist '" << playlistName << "' done. Contains " << pos << " entries";
+}
+
+void
+Audio::playlistLoadToPlayqueue(std::string playlistName)
+{
+	LMS_LOG(MOD_UI, SEV_DEBUG) << "Loading playlist '" << playlistName << "' to playqueue";
+
+	Wt::Dbo::Transaction transaction(_db.getSession());
+
+	Database::User::pointer user = _db.getCurrentUser();
+	if (!user)
+		return;
+
+	Database::Playlist::pointer playlist = Database::Playlist::get(_db.getSession(), playlistName, user);
+	if (!playlist)
+		return;
+
+	std::vector<Database::Track::id_type> entries = Database::PlaylistEntry::getEntries(_db.getSession(), playlist);
+
+	_playQueue->clear();
+	_playQueue->addTracks(entries);
+
+	LMS_LOG(MOD_UI, SEV_DEBUG) << "Loading playlist '" << playlistName << "' to playqueue done. " << entries.size() << " entries";
+}
+
+
+void
+Audio::playlistShowDeleteDialog(std::string name)
+{
+
+	Wt::WMessageBox *messageBox = new Wt::WMessageBox
+		("Delete playlist",
+		 Wt::WString( "Deleting playlist '{1}'?").arg(name),
+		 Wt::Question, Wt::Yes | Wt::No);
+
+	messageBox->setModal(true);
+
+	messageBox->buttonClicked().connect(std::bind([=] () {
+		if (messageBox->buttonResult() == Wt::Yes)
+		{
+			Wt::Dbo::Transaction transaction(_db.getSession());
+			Database::User::pointer user = _db.getCurrentUser();
+			if (!user)
+				return;
+
+			Database::Playlist::pointer playlist = Database::Playlist::get(_db.getSession(), name, user);
+			if (playlist)
+				playlist.remove();
+
+			playlistRefreshMenus();
+		}
+
+		delete messageBox;
+	}));
+
+	messageBox->show();
+}
+
+void
+Audio::playlistRefreshMenus()
+{
+	Wt::Dbo::Transaction transaction(_db.getSession());
+
+	Database::User::pointer user = _db.getCurrentUser();
+	if (!user)
+		return;
+
+	// Clear playlists in each menu
+	LMS_LOG(MOD_UI, SEV_DEBUG) << "Save item count: " << _popupMenuSave->count();
+
+	WPopupMenuClear(_popupMenuDelete);
+	WPopupMenuClear(_popupMenuLoad);
+	WPopupMenuClear(_popupMenuSave);
+
+	_popupMenuSave->addItem("New")->triggered().connect(std::bind([=] ()
+	{
+		playlistShowSaveNewDialog();
+	}));
+	_popupMenuSave->addSeparator();
+
+	std::vector<Database::Playlist::pointer> playlists = Database::Playlist::get(_db.getSession(), user);
+
+	BOOST_FOREACH(Database::Playlist::pointer playlist, playlists)
+	{
+		// Add playlists in each menu
+		_popupMenuDelete->addItem(playlist->getName())->triggered().connect(std::bind([=] ()
+		{
+			playlistShowDeleteDialog(playlist->getName());
+		}));
+
+		_popupMenuLoad->addItem(playlist->getName())->triggered().connect(std::bind([=] ()
+		{
+			playlistLoadToPlayqueue(playlist->getName());
+			playlistRefreshMenus(); // in case deleted in other session
+		}));
+
+		_popupMenuSave->addItem(playlist->getName())->triggered().connect(std::bind([=] ()
+		{
+			playlistShowSaveDialog(playlist->getName());
+		}));
+	}
 }
 
 void
@@ -277,7 +502,18 @@ Audio::playTrack(boost::filesystem::path p)
 
 		Transcode::InputMediaFile inputFile(p);
 
-		Transcode::Parameters parameters(inputFile, Transcode::Format::get(Transcode::Format::OGA));
+		// Determine the output format using the encoding of the player
+		Transcode::Format::Encoding encoding;
+		switch(AudioMediaPlayer::getEncoding())
+		{
+			case Wt::WMediaPlayer::MP3: encoding = Transcode::Format::MP3; break;
+			case Wt::WMediaPlayer::M4A: encoding = Transcode::Format::M4A; break;
+			case Wt::WMediaPlayer::OGA: encoding = Transcode::Format::OGA; break;
+			default:
+			    encoding = Transcode::Format::MP3;
+		}
+
+		Transcode::Parameters parameters(inputFile, Transcode::Format::get(encoding));
 
 		parameters.setBitrate(Transcode::Stream::Audio, bitrate);
 

src/ui/audio/Audio.hpp

@@ -22,6 +22,7 @@
 
 #include <string>
 
+#include <Wt/WPopupMenu>
 #include <Wt/WContainerWidget>
 
 #include "common/SessionData.hpp"
@@ -45,6 +46,13 @@ class Audio : public Wt::WContainerWidget
 
 	private:
 
+		void playlistSaveFromPlayqueue(std::string name);
+		void playlistLoadToPlayqueue(std::string name);
+		void playlistShowSaveNewDialog();
+		void playlistShowSaveDialog(std::string name);
+		void playlistShowDeleteDialog(std::string name);
+		void playlistRefreshMenus();
+
 		void playTrack(boost::filesystem::path p);
 
 		enum PlayQueueAddType
@@ -66,6 +74,9 @@ class Audio : public Wt::WContainerWidget
 
 		FilterChain		_filterChain;
 
+		Wt::WPopupMenu* 	_popupMenuSave;
+		Wt::WPopupMenu* 	_popupMenuLoad;
+		Wt::WPopupMenu* 	_popupMenuDelete;
 };
 
 } // namespace UserInterface

src/ui/audio/AudioMediaPlayer.cpp

@@ -23,11 +23,24 @@
 #include <Wt/WTemplate>
 #include <Wt/WHBoxLayout>
 #include <Wt/WVBoxLayout>
+#include <Wt/WApplication>
+#include <Wt/WEnvironment>
 
 #include "AudioMediaPlayer.hpp"
 
 namespace UserInterface {
 
+Wt::WMediaPlayer::Encoding
+AudioMediaPlayer::getEncoding()
+{
+	const Wt::WEnvironment& env = Wt::WApplication::instance()->environment();
+
+	if (env.agentIsIE())
+		return Wt::WMediaPlayer::MP3;
+	else
+		return Wt::WMediaPlayer::OGA;
+}
+
 AudioMediaPlayer::AudioMediaPlayer( Wt::WContainerWidget *parent)
 	: Wt::WContainerWidget(parent),
 	_mediaResource(nullptr)
@@ -98,7 +111,7 @@ AudioMediaPlayer::AudioMediaPlayer( Wt::WContainerWidget *parent)
 	controlsLayout->addWidget(shuffle);
 
 	_mediaPlayer = new Wt::WMediaPlayer( Wt::WMediaPlayer::Audio, btnContainer );
-	_mediaPlayer->addSource( Wt::WMediaPlayer::OGA, "" );
+	_mediaPlayer->addSource( getEncoding(), "" );
 	_mediaPlayer->ended().connect(this, &AudioMediaPlayer::handleTrackEnded);
 
 	_mediaPlayer->setControlsWidget( 0 );
@@ -142,7 +155,7 @@ AudioMediaPlayer::loadPlayer(void)
 	_mediaResource = new AvConvTranscodeStreamResource( *_currentParameters, this );
 	_mediaInternalLink.setResource( _mediaResource );
 
-	_mediaPlayer->addSource( Wt::WMediaPlayer::OGA, _mediaInternalLink );
+	_mediaPlayer->addSource( getEncoding(), _mediaInternalLink );
 }
 
 void

src/ui/audio/AudioMediaPlayer.hpp

@@ -38,6 +38,9 @@ class AudioMediaPlayer : public Wt::WContainerWidget
 {
 	public:
 
+		// Encoding is set based on environment
+		static Wt::WMediaPlayer::Encoding getEncoding();
+
 		AudioMediaPlayer( Wt::WContainerWidget *parent = 0);
 
 		void load(const Transcode::Parameters& parameters);

src/ui/audio/Filter.hpp

@@ -22,7 +22,7 @@
 
 #include <Wt/WSignal>
 
-#include "database/AudioTypes.hpp"
+#include "database/Types.hpp"
 
 namespace UserInterface {
 

src/ui/audio/PlayQueue.cpp

@@ -599,7 +599,16 @@ PlayQueue::renumber(int firstId, int lastId)
 		_model->setData( i, 1, i + 1);
 }
 
-
+void
+PlayQueue::getTracks(std::vector<Database::Track::id_type>& trackIds) const
+{
+	// Now add each entry in the playlist
+	for (int i = 0; i < _model->rowCount(); ++i)
+	{
+		Database::Track::id_type trackId = boost::any_cast<Database::Track::id_type>(_model->data(i, COLUMN_ID_TRACK_ID, Wt::UserRole));
+		trackIds.push_back(trackId);
+	}
+}
 
 } // namespace UserInterface
 

src/ui/audio/PlayQueue.hpp

@@ -24,7 +24,6 @@
 #include <Wt/WStandardItemModel>
 
 #include "database/DatabaseHandler.hpp"
-#include "database/AudioTypes.hpp"
 
 #include "resource/CoverResource.hpp"
 
@@ -39,6 +38,7 @@ class PlayQueue : public Wt::WTableView
 		PlayQueue(Database::Handler& db, Wt::WContainerWidget* parent = 0);
 
 		void addTracks(const std::vector<Database::Track::id_type>& trackIds);
+		void getTracks(std::vector<Database::Track::id_type>& trackIds) const;
 
 		void clear(void);
 
@@ -61,8 +61,6 @@ class PlayQueue : public Wt::WTableView
 		Wt::Signal< boost::filesystem::path >& playTrack() { return _sigTrackPlay; }
 
 		// Slots
-		void saveToPlaylist(std::string& playListName);
-		void loadFromPlaylist(std::string& playListName);
 		void handlePlaybackComplete(void);
 
 	private:

src/ui/audio/TableFilter.cpp

@@ -21,7 +21,7 @@
 
 #include <Wt/WItemDelegate>
 
-#include "database/AudioTypes.hpp"
+#include "database/Types.hpp"
 
 #include "logger/Logger.hpp"
 

src/ui/audio/TrackView.hpp

@@ -24,7 +24,6 @@
 #include <Wt/Dbo/QueryModel>
 
 #include "database/DatabaseHandler.hpp"
-#include "database/AudioTypes.hpp"
 
 #include "Filter.hpp"
 

src/ui/resource/AvConvTranscodeStreamResource.cpp

@@ -58,6 +58,7 @@ AvConvTranscodeStreamResource::handleRequest(const Wt::Http::Request& request,
 		LMS_LOG(MOD_UI, SEV_DEBUG) << "Launching transcoder";
 		transcoder = std::make_shared<Transcode::AvConvTranscoder>( _parameters);
 
+		LMS_LOG(MOD_UI, SEV_DEBUG) << "Mime type set to '" << _parameters.getOutputFormat().getMimeType() << "'";
 		response.setMimeType(_parameters.getOutputFormat().getMimeType());
 	}
 

src/ui/resource/CoverResource.hpp

@@ -26,7 +26,6 @@
 #include <Wt/WResource>
 
 #include "database/DatabaseHandler.hpp"
-#include "database/AudioTypes.hpp"
 
 namespace UserInterface {
 

src/ui/video/VideoDatabaseWidget.cpp

@@ -26,8 +26,6 @@
 #include <Wt/WFileResource>
 
 #include "transcode/Parameters.hpp"
-#include "database/VideoTypes.hpp"
-#include "database/MediaDirectory.hpp"
 
 #include "VideoDatabaseWidget.hpp"
 

src/ui/video/VideoWidget.cpp

@@ -68,6 +68,7 @@ VideoWidget::playVideo(boost::filesystem::path p)
 		// Get user preferences
 		{
 			Wt::Dbo::Transaction transaction(_sessionData.getDatabaseHandler().getSession());
+
 			Database::User::pointer user = _sessionData.getDatabaseHandler().getCurrentUser();
 			if (user)
 			{

test/CheckDatabaseUser.cpp

@@ -18,7 +18,6 @@
  */
 
 #include "database/DatabaseHandler.hpp"
-#include <Wt/Auth/PasswordService>
 #include <Wt/Auth/Identity>
 
 int main(void)

test/DatabaseIntegrity.cpp

@@ -25,8 +25,6 @@
 
 #include "database/DatabaseHandler.hpp"
 
-#include "database/AudioTypes.hpp"
-
 int main(void)
 {
 

test/Makefile.am

@@ -30,7 +30,7 @@ remote_client_CXXFLAGS=-std=c++11 -Wall -Wextra -DBOOST_LOG_DYN_LINK -I$(top_src
 database_user_SOURCES = \
 	$(srcdir)/CheckDatabaseUser.cpp		\
 	$(top_srcdir)/src/logger/Logger.cpp 			\
-	$(top_srcdir)/src/database/Genre.cpp	\
+	$(top_srcdir)/src/database/Playlist.cpp	\
 	$(top_srcdir)/src/database/Track.cpp	\
 	$(top_srcdir)/src/database/DatabaseHandler.cpp	\
 	$(top_srcdir)/src/database/MediaDirectory.cpp		\
@@ -44,7 +44,7 @@ database_user_CXXFLAGS=-std=c++11 -Wall -Wextra -DBOOST_LOG_DYN_LINK -I$(top_src
 database_integrity_SOURCES = \
 	$(srcdir)/DatabaseIntegrity.cpp		\
 	$(top_srcdir)/src/logger/Logger.cpp 			\
-	$(top_srcdir)/src/database/Genre.cpp	\
+	$(top_srcdir)/src/database/Playlist.cpp	\
 	$(top_srcdir)/src/database/Track.cpp	\
 	$(top_srcdir)/src/database/DatabaseHandler.cpp	\
 	$(top_srcdir)/src/database/MediaDirectory.cpp		\