added conf option 'playqueue-max-entry-count'. fixes #293
This commit is contained in:
@@ -211,7 +211,6 @@
|
|||||||
<message id="Lms.PlayQueue.clear">Clear</message>
|
<message id="Lms.PlayQueue.clear">Clear</message>
|
||||||
<message id="Lms.PlayQueue.create-tracklist">Create new playlist</message>
|
<message id="Lms.PlayQueue.create-tracklist">Create new playlist</message>
|
||||||
<message id="Lms.PlayQueue.playqueue">Play Queue</message>
|
<message id="Lms.PlayQueue.playqueue">Play Queue</message>
|
||||||
<message id="Lms.PlayQueue.playqueue-full">Play Queue full!</message>
|
|
||||||
<message id="Lms.PlayQueue.radio-mode">Radio mode</message>
|
<message id="Lms.PlayQueue.radio-mode">Radio mode</message>
|
||||||
<message id="Lms.PlayQueue.repeat">Repeat</message>
|
<message id="Lms.PlayQueue.repeat">Repeat</message>
|
||||||
<message id="Lms.PlayQueue.replace-tracklist">Replace existing playlist</message>
|
<message id="Lms.PlayQueue.replace-tracklist">Replace existing playlist</message>
|
||||||
|
|||||||
@@ -211,7 +211,6 @@
|
|||||||
<message id="Lms.PlayQueue.clear">Effacer</message>
|
<message id="Lms.PlayQueue.clear">Effacer</message>
|
||||||
<message id="Lms.PlayQueue.create-tracklist">Créer une nouvelle liste de lecture</message>
|
<message id="Lms.PlayQueue.create-tracklist">Créer une nouvelle liste de lecture</message>
|
||||||
<message id="Lms.PlayQueue.playqueue">Liste de lecture</message>
|
<message id="Lms.PlayQueue.playqueue">Liste de lecture</message>
|
||||||
<message id="Lms.PlayQueue.playqueue-full">Liste de lecture pleine!</message>
|
|
||||||
<message id="Lms.PlayQueue.radio-mode">Mode radio</message>
|
<message id="Lms.PlayQueue.radio-mode">Mode radio</message>
|
||||||
<message id="Lms.PlayQueue.repeat">Repéter</message>
|
<message id="Lms.PlayQueue.repeat">Repéter</message>
|
||||||
<message id="Lms.PlayQueue.replace-tracklist">Remplacer une liste de lecture existante</message>
|
<message id="Lms.PlayQueue.replace-tracklist">Remplacer une liste de lecture existante</message>
|
||||||
|
|||||||
@@ -211,7 +211,6 @@
|
|||||||
<message id="Lms.PlayQueue.clear">Cancella</message>
|
<message id="Lms.PlayQueue.clear">Cancella</message>
|
||||||
|
|
||||||
<message id="Lms.PlayQueue.playqueue">Coda di riproduzione</message>
|
<message id="Lms.PlayQueue.playqueue">Coda di riproduzione</message>
|
||||||
<message id="Lms.PlayQueue.playqueue-full">Coda di riproduzione piena!</message>
|
|
||||||
<message id="Lms.PlayQueue.radio-mode">Modalità radio</message>
|
<message id="Lms.PlayQueue.radio-mode">Modalità radio</message>
|
||||||
<message id="Lms.PlayQueue.repeat">Ripeti</message>
|
<message id="Lms.PlayQueue.repeat">Ripeti</message>
|
||||||
|
|
||||||
|
|||||||
@@ -215,7 +215,6 @@
|
|||||||
|
|
||||||
|
|
||||||
<message id="Lms.PlayQueue.playqueue">播放队列</message>
|
<message id="Lms.PlayQueue.playqueue">播放队列</message>
|
||||||
<message id="Lms.PlayQueue.playqueue-full">播放队列已满!</message>
|
|
||||||
<message id="Lms.PlayQueue.radio-mode">广播模式</message>
|
<message id="Lms.PlayQueue.radio-mode">广播模式</message>
|
||||||
<message id="Lms.PlayQueue.repeat">循环播放</message>
|
<message id="Lms.PlayQueue.repeat">循环播放</message>
|
||||||
<message id="Lms.PlayQueue.replace-tracklist">替换现有播放列表</message>
|
<message id="Lms.PlayQueue.replace-tracklist">替换现有播放列表</message>
|
||||||
|
|||||||
@@ -78,6 +78,9 @@ cover-jpeg-quality = 75;
|
|||||||
# Preferred file names for covers (order is important)
|
# Preferred file names for covers (order is important)
|
||||||
cover-preferred-file-names = ("cover", "front" );
|
cover-preferred-file-names = ("cover", "front" );
|
||||||
|
|
||||||
|
# Playqueue max entry count
|
||||||
|
playqueue-max-entry-count = 1000;
|
||||||
|
|
||||||
# Set to true if you want to hide duplicate tracks
|
# Set to true if you want to hide duplicate tracks
|
||||||
scanner-skip-duplicate-mbid = false;
|
scanner-skip-duplicate-mbid = false;
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,7 @@
|
|||||||
#include "services/database/User.hpp"
|
#include "services/database/User.hpp"
|
||||||
#include "services/scrobbling/IScrobblingService.hpp"
|
#include "services/scrobbling/IScrobblingService.hpp"
|
||||||
#include "services/recommendation/IPlaylistGeneratorService.hpp"
|
#include "services/recommendation/IPlaylistGeneratorService.hpp"
|
||||||
|
#include "utils/IConfig.hpp"
|
||||||
#include "utils/Logger.hpp"
|
#include "utils/Logger.hpp"
|
||||||
#include "utils/Random.hpp"
|
#include "utils/Random.hpp"
|
||||||
#include "utils/Service.hpp"
|
#include "utils/Service.hpp"
|
||||||
@@ -117,6 +118,7 @@ namespace
|
|||||||
|
|
||||||
PlayQueue::PlayQueue()
|
PlayQueue::PlayQueue()
|
||||||
: Template {Wt::WString::tr("Lms.PlayQueue.template")}
|
: Template {Wt::WString::tr("Lms.PlayQueue.template")}
|
||||||
|
, _capacity {Service<IConfig>::get()->getULong("playqueue-max-entry-count", 1000)}
|
||||||
{
|
{
|
||||||
initTrackLists();
|
initTrackLists();
|
||||||
|
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ class PlayQueue : public Template
|
|||||||
// Signal emitted when track count changed
|
// Signal emitted when track count changed
|
||||||
Wt::Signal<std::size_t> trackCountChanged;
|
Wt::Signal<std::size_t> trackCountChanged;
|
||||||
|
|
||||||
constexpr std::size_t getCapacity() const { return _capacity; }
|
std::size_t getCapacity() const { return _capacity; }
|
||||||
std::size_t getCount();
|
std::size_t getCount();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -99,7 +99,7 @@ class PlayQueue : public Template
|
|||||||
void exportToNewTrackList(const Wt::WString& name);
|
void exportToNewTrackList(const Wt::WString& name);
|
||||||
void exportToTrackList(Database::TrackListId trackList);
|
void exportToTrackList(Database::TrackListId trackList);
|
||||||
|
|
||||||
static inline constexpr std::size_t _capacity {1000};
|
const std::size_t _capacity;
|
||||||
static inline constexpr std::size_t _batchSize {12};
|
static inline constexpr std::size_t _batchSize {12};
|
||||||
|
|
||||||
bool _mediaPlayerSettingsLoaded {};
|
bool _mediaPlayerSettingsLoaded {};
|
||||||
|
|||||||
Reference in New Issue
Block a user