diff --git a/data/data.qrc b/data/data.qrc index 6cb912fa3e..261a3c6bef 100644 --- a/data/data.qrc +++ b/data/data.qrc @@ -14,6 +14,7 @@ schema/schema-20.sql schema/schema-21.sql schema/schema-22.sql + schema/schema-23.sql schema/device-schema.sql style/strawberry.css style/smartplaylistsearchterm.css diff --git a/data/schema/schema-23.sql b/data/schema/schema-23.sql new file mode 100644 index 0000000000..4b474e2f35 --- /dev/null +++ b/data/schema/schema-23.sql @@ -0,0 +1,5 @@ +ALTER TABLE playlists ADD COLUMN half_playing_time_s INTEGER; + +ALTER TABLE playlists ADD COLUMN position_playing_time INTEGER; + +UPDATE schema_version SET version=23; diff --git a/data/schema/schema.sql b/data/schema/schema.sql index 4082a2283d..e4b2b55761 100644 --- a/data/schema/schema.sql +++ b/data/schema/schema.sql @@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS schema_version ( DELETE FROM schema_version; -INSERT INTO schema_version (version) VALUES (22); +INSERT INTO schema_version (version) VALUES (23); CREATE TABLE IF NOT EXISTS directories ( path TEXT NOT NULL, @@ -1027,6 +1027,9 @@ CREATE TABLE IF NOT EXISTS playlists ( ui_path TEXT, is_favorite INTEGER NOT NULL DEFAULT 0, + half_playing_time_s INTEGER, + position_playing_time INTEGER, + dynamic_playlist_type INTEGER, dynamic_playlist_backend TEXT, dynamic_playlist_data BLOB diff --git a/src/core/database.cpp b/src/core/database.cpp index 6f68408f9b..1a69eb9312 100644 --- a/src/core/database.cpp +++ b/src/core/database.cpp @@ -50,7 +50,7 @@ using namespace Qt::Literals::StringLiterals; -const int Database::kSchemaVersion = 22; +const int Database::kSchemaVersion = 23; namespace { constexpr char kDatabaseFilename[] = "strawberry.db"; diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index ae0210ef6b..9955f71f00 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -1833,6 +1833,9 @@ void MainWindow::UpdateTrackPosition() { } } + // At the end of the time of the track, move to the next track + app_->player()->EndPositionNext(position); + } void MainWindow::UpdateTrackSliderPosition() { diff --git a/src/core/player.cpp b/src/core/player.cpp index a80f3f3bb1..79724fa55f 100644 --- a/src/core/player.cpp +++ b/src/core/player.cpp @@ -97,7 +97,8 @@ Player::Player(const SharedPtr task_manager, const SharedPtrclassName())); @@ -757,7 +758,8 @@ void Player::PlayAt(const int index, const bool pause, const quint64 offset_nano return; } - current_item_ = playlist_manager_->active()->current_item(); + current_item_ = playlist_manager_->active()->current_item(play_offset_nanosec_, play_end_sec_); + const QUrl url = current_item_->EffectiveUrl(); if (url_handlers_->CanHandle(url)) { @@ -773,8 +775,8 @@ void Player::PlayAt(const int index, const bool pause, const quint64 offset_nano HandleLoadResult(url_handler->StartLoading(url)); } else { - qLog(Debug) << "Playing song" << current_item_->EffectiveMetadata().title() << url << "position" << offset_nanosec; - engine_->Play(current_item_->OriginalUrl(), url, pause, change, current_item_->EffectiveMetadata().has_cue(), static_cast(current_item_->effective_beginning_nanosec()), current_item_->effective_end_nanosec(), offset_nanosec, current_item_->EffectiveMetadata().ebur128_integrated_loudness_lufs()); + qLog(Debug) << "Playing song" << current_item_->EffectiveMetadata().title() << url << "position" << play_offset_nanosec_; + engine_->Play(current_item_->OriginalUrl(), url, pause, change, current_item_->EffectiveMetadata().has_cue(), static_cast(current_item_->effective_beginning_nanosec()), current_item_->effective_end_nanosec(), play_offset_nanosec_, current_item_->EffectiveMetadata().ebur128_integrated_loudness_lufs()); } } diff --git a/src/core/player.h b/src/core/player.h index 0376502762..d105b48c73 100644 --- a/src/core/player.h +++ b/src/core/player.h @@ -68,6 +68,11 @@ class Player : public PlayerInterface { void SetAnalyzer(AnalyzerContainer *analyzer) { analyzer_ = analyzer; } void SetEqualizer(SharedPtr equalizer) { equalizer_ = equalizer; } + void EndPositionNext(const int position) { + if (play_end_sec_ > 0 && play_end_sec_ <= position) + Next(); + } + public Q_SLOTS: void ReloadSettings() override; @@ -167,6 +172,7 @@ class Player : public PlayerInterface { QDateTime pause_time_; quint64 play_offset_nanosec_; + int play_end_sec_; }; #endif // PLAYER_H diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp index 9fcd183b8b..3982a8837a 100644 --- a/src/playlist/playlist.cpp +++ b/src/playlist/playlist.cpp @@ -132,6 +132,8 @@ Playlist::Playlist(const SharedPtr task_manager, const int id, const QString &special_type, const bool favorite, + const int half_playing_time_s, + const int percent_interest_song, QObject *parent) : QAbstractListModel(parent), is_loading_(false), @@ -156,7 +158,9 @@ Playlist::Playlist(const SharedPtr task_manager, scrobble_point_(-1), auto_sort_(false), sort_column_(Column::Title), - sort_order_(Qt::AscendingOrder) { + sort_order_(Qt::AscendingOrder), + half_playing_time_s_(half_playing_time_s), + percent_interest_song_(percent_interest_song) { undo_stack_->setUndoLimit(kUndoStackSize); @@ -1651,7 +1655,7 @@ void Playlist::Save() { if (!playlist_backend_ || is_loading_) return; - playlist_backend_->SavePlaylistAsync(id_, items_, last_played_row(), dynamic_playlist_); + playlist_backend_->SavePlaylistAsync(id_, items_, last_played_row(), half_playing_time_s_, percent_interest_song_, dynamic_playlist_); } @@ -1923,6 +1927,32 @@ PlaylistItemPtr Playlist::current_item() const { } +PlaylistItemPtr Playlist::current_item(quint64& start_offset_ns, int& end_offset_s) const { + + PlaylistItemPtr ret_value = current_item(); + + end_offset_s = 0; + + if (ret_value && half_playing_time_s_ > 0) { + auto &¤t_song = ret_value->EffectiveMetadata(); + auto &&middle_time_ns = (current_song.length_nanosec() * percent_interest_song_) / 100; + qint64 start_time_ns = middle_time_ns - (static_cast(half_playing_time_s_) * 1'000'000'000L); + qint64 end_time_s = (middle_time_ns + (static_cast(half_playing_time_s_) * 1'000'000'000L)) / 1'000'000'000L; + + if (start_time_ns > static_cast(start_offset_ns)) { + start_offset_ns = start_time_ns; + } + if (end_time_s >= (current_song.length_nanosec() / 1'000'000'000L)) { + // in the case of I am waiting for the end of the track to move to the next + // I am not doing anything to signal that we must wait the end + return ret_value; + } + end_offset_s = static_cast(end_time_s); + } + return ret_value; + +} + PlaylistItem::Options Playlist::current_item_options() const { if (!current_item()) return PlaylistItem::Option::Default; return current_item()->options(); diff --git a/src/playlist/playlist.h b/src/playlist/playlist.h index 31b6892cf1..faa9c1f25c 100644 --- a/src/playlist/playlist.h +++ b/src/playlist/playlist.h @@ -92,6 +92,8 @@ class Playlist : public QAbstractListModel { const int id, const QString &special_type = QString(), const bool favorite = false, + const int half_playing_time_s = 0, + const int percent_interest_song = 50, QObject *parent = nullptr); ~Playlist() override; @@ -209,6 +211,7 @@ class Playlist : public QAbstractListModel { bool has_item_at(const int index) const { return index >= 0 && index < rowCount(); } PlaylistItemPtr current_item() const; + PlaylistItemPtr current_item(quint64& start_offset_ns, int& end_offset_s) const; PlaylistItem::Options current_item_options() const; Song current_item_metadata() const; @@ -227,6 +230,12 @@ class Playlist : public QAbstractListModel { QUndoStack *undo_stack() const { return undo_stack_; } + int half_playing_time_s() const { return half_playing_time_s_; } + void UpdatePlayingTime(const int time_s) { half_playing_time_s_ = time_s; Save(); } + + int percent_interest_song() const { return percent_interest_song_; } + void UpdatePlayingPosition(const int percent_time) { percent_interest_song_ = percent_time; Save(); } + bool scrobbled() const { return scrobbled_; } void set_scrobbled(const bool state) { scrobbled_ = state; } qint64 scrobble_point_nanosec() const { return scrobble_point_; } @@ -436,6 +445,10 @@ class Playlist : public QAbstractListModel { bool auto_sort_; Column sort_column_; Qt::SortOrder sort_order_; + + // Variables to maintain the time to play the song + int half_playing_time_s_; + int percent_interest_song_; }; #endif // PLAYLIST_H diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp index 52e5d2fa08..07ac4cb3f9 100644 --- a/src/playlist/playlistbackend.cpp +++ b/src/playlist/playlistbackend.cpp @@ -130,7 +130,7 @@ PlaylistBackend::PlaylistList PlaylistBackend::GetPlaylists(const GetPlaylistsFl } SqlQuery q(db); - q.prepare(u"SELECT ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend FROM playlists "_s + condition + u" ORDER BY ui_order"_s); + q.prepare(u"SELECT ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend, half_playing_time_s, position_playing_time FROM playlists "_s + condition + u" ORDER BY ui_order"_s); if (!q.Exec()) { database_->ReportErrors(q); return ret; @@ -147,6 +147,8 @@ PlaylistBackend::PlaylistList PlaylistBackend::GetPlaylists(const GetPlaylistsFl p.dynamic_type = static_cast(q.value(6).toInt()); p.dynamic_data = q.value(7).toByteArray(); p.dynamic_backend = q.value(8).toString(); + p.half_playing_time_s_ = q.value(9).toInt(); + p.percent_interest_song_ = q.value(10).toInt(); ret << p; } @@ -160,7 +162,7 @@ PlaylistBackend::Playlist PlaylistBackend::GetPlaylist(const int id) { QSqlDatabase db(database_->Connect()); SqlQuery q(db); - q.prepare(u"SELECT ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend FROM playlists WHERE ROWID=:id"_s); + q.prepare(u"SELECT ROWID, name, last_played, special_type, ui_path, is_favorite, dynamic_playlist_type, dynamic_playlist_data, dynamic_playlist_backend, half_playing_time_s, position_playing_time FROM playlists WHERE ROWID=:id"_s); q.BindValue(u":id"_s, id); if (!q.Exec()) { @@ -180,6 +182,8 @@ PlaylistBackend::Playlist PlaylistBackend::GetPlaylist(const int id) { p.dynamic_type = static_cast(q.value(6).toInt()); p.dynamic_data = q.value(7).toByteArray(); p.dynamic_backend = q.value(8).toString(); + p.half_playing_time_s_ = q.value(9).toInt(); + p.percent_interest_song_ = q.value(10).toInt(); return p; @@ -338,13 +342,13 @@ PlaylistItemPtr PlaylistBackend::RestoreCueData(PlaylistItemPtr item, SharedPtr< } -void PlaylistBackend::SavePlaylistAsync(int playlist, const PlaylistItemPtrList &items, int last_played, PlaylistGeneratorPtr dynamic) { +void PlaylistBackend::SavePlaylistAsync(const int playlist, const PlaylistItemPtrList &items, const int last_played, const int half_playing_s, const int position_playing, PlaylistGeneratorPtr dynamic) { - QMetaObject::invokeMethod(this, "SavePlaylist", Qt::QueuedConnection, Q_ARG(int, playlist), Q_ARG(PlaylistItemPtrList, items), Q_ARG(int, last_played), Q_ARG(PlaylistGeneratorPtr, dynamic)); + QMetaObject::invokeMethod(this, "SavePlaylist", Qt::QueuedConnection, Q_ARG(int, playlist), Q_ARG(PlaylistItemPtrList, items), Q_ARG(int, last_played), Q_ARG(int, half_playing_s), Q_ARG(int, position_playing), Q_ARG(PlaylistGeneratorPtr, dynamic)); } -void PlaylistBackend::SavePlaylist(int playlist, const PlaylistItemPtrList &items, int last_played, PlaylistGeneratorPtr dynamic) { +void PlaylistBackend::SavePlaylist(const int playlist, const PlaylistItemPtrList &items, const int last_played, const int half_playing_s, const int position_playing, PlaylistGeneratorPtr dynamic) { QMutexLocker l(database_->Mutex()); QSqlDatabase db(database_->Connect()); @@ -381,7 +385,7 @@ void PlaylistBackend::SavePlaylist(int playlist, const PlaylistItemPtrList &item // Update the last played track number { SqlQuery q(db); - q.prepare(u"UPDATE playlists SET last_played=:last_played, dynamic_playlist_type=:dynamic_type, dynamic_playlist_data=:dynamic_data, dynamic_playlist_backend=:dynamic_backend WHERE ROWID=:playlist"_s); + q.prepare(u"UPDATE playlists SET last_played=:last_played, dynamic_playlist_type=:dynamic_type, dynamic_playlist_data=:dynamic_data, dynamic_playlist_backend=:dynamic_backend, half_playing_time_s=:half_playing_s, position_playing_time=:position_playing WHERE ROWID=:playlist"_s); q.BindValue(u":last_played"_s, last_played); if (dynamic) { q.BindValue(u":dynamic_type"_s, static_cast(dynamic->type())); @@ -393,6 +397,8 @@ void PlaylistBackend::SavePlaylist(int playlist, const PlaylistItemPtrList &item q.BindValue(u":dynamic_data"_s, QByteArray()); q.BindValue(u":dynamic_backend"_s, QString()); } + q.BindValue(u":half_playing_s"_s, half_playing_s); + q.BindValue(u":position_playing"_s, position_playing); q.BindValue(u":playlist"_s, playlist); if (!q.Exec()) { database_->ReportErrors(q); diff --git a/src/playlist/playlistbackend.h b/src/playlist/playlistbackend.h index 9cc97a87bc..a8ac6c8d9f 100644 --- a/src/playlist/playlistbackend.h +++ b/src/playlist/playlistbackend.h @@ -62,6 +62,9 @@ class PlaylistBackend : public QObject { PlaylistGenerator::Type dynamic_type; QString dynamic_backend; QByteArray dynamic_data; + + int half_playing_time_s_; + int percent_interest_song_; }; using PlaylistList = QList; @@ -80,14 +83,14 @@ class PlaylistBackend : public QObject { void SetPlaylistUiPath(const int id, const QString &path); int CreatePlaylist(const QString &name, const QString &special_type); - void SavePlaylistAsync(const int playlist, const PlaylistItemPtrList &items, const int last_played, PlaylistGeneratorPtr dynamic); + void SavePlaylistAsync(const int playlist, const PlaylistItemPtrList &items, const int last_played, const int half_playing_s, const int position_playing, PlaylistGeneratorPtr dynamic); void RenamePlaylist(const int id, const QString &new_name); void FavoritePlaylist(const int id, bool is_favorite); void RemovePlaylist(const int id); public Q_SLOTS: void Exit(); - void SavePlaylist(const int playlist, const PlaylistItemPtrList &items, const int last_played, PlaylistGeneratorPtr dynamic); + void SavePlaylist(const int playlist, const PlaylistItemPtrList &items, const int last_played, const int half_playing_s, const int position_playing, PlaylistGeneratorPtr dynamic); Q_SIGNALS: void ExitFinished(); diff --git a/src/playlist/playlistcontainer.cpp b/src/playlist/playlistcontainer.cpp index c95c920063..e7e8964942 100644 --- a/src/playlist/playlistcontainer.cpp +++ b/src/playlist/playlistcontainer.cpp @@ -128,6 +128,11 @@ PlaylistContainer::PlaylistContainer(QWidget *parent) ui_->search_field->installEventFilter(this); ui_->search_field->setToolTip(FilterParser::ToolTip()); + ui_->playing_time_before_or_after->setToolTip(PlaylistContainer::ToolTipPlayingTime()); + ui_->playing_center_time->setToolTip(PlaylistContainer::ToolTipPositionTime()); + + ui_->show_collection_option->setIcon(IconLoader::Load(u"configure"_s)); + QObject::connect(ui_->show_collection_option, &QAction::triggered, this, &PlaylistContainer::DisplayPlayingOption); ReloadSettings(); @@ -143,6 +148,7 @@ void PlaylistContainer::SetActions(QAction *new_playlist, QAction *load_playlist ui_->load->setDefaultAction(load_playlist); ui_->save->setDefaultAction(save_playlist); ui_->clear->setDefaultAction(clear_playlist); + ui_->display_option->setDefaultAction(ui_->show_collection_option); ui_->tab_bar->SetActions(new_playlist, load_playlist); @@ -154,6 +160,9 @@ void PlaylistContainer::SetActions(QAction *new_playlist, QAction *load_playlist QObject::connect(previous_playlist, &QAction::triggered, this, &PlaylistContainer::GoToPreviousPlaylistTab); QObject::connect(save_all_playlists, &QAction::triggered, &*manager_, &PlaylistManager::SaveAllPlaylists); + QObject::connect(ui_->playing_time_before_or_after, &QSpinBox::valueChanged, &*manager_, &PlaylistManager::UpdatePlayingTime); + QObject::connect(ui_->playing_center_time, &QSpinBox::valueChanged, &*manager_, &PlaylistManager::UpdatePlayingPosition); + } void PlaylistContainer::SetManager(SharedPtr manager) { @@ -194,6 +203,12 @@ void PlaylistContainer::SetViewModel(Playlist *playlist, const int scroll_positi playlist_ = playlist; + ui_->playing_time_before_or_after->blockSignals(true); + ui_->playing_time_before_or_after->setValue(manager_->half_playing_time_s()); + ui_->playing_time_before_or_after->blockSignals(false); + ui_->playing_center_time->blockSignals(true); + ui_->playing_center_time->setValue(manager_->percent_interest_song()); + ui_->playing_center_time->blockSignals(false); // Set the view playlist->IgnoreSorting(true); view()->setModel(playlist->filter()); @@ -252,6 +267,7 @@ void PlaylistContainer::ReloadSettings() { ui_->clear->setIconSize(QSize(iconsize, iconsize)); ui_->undo->setIconSize(QSize(iconsize, iconsize)); ui_->redo->setIconSize(QSize(iconsize, iconsize)); + ui_->display_option->setIconSize(QSize(iconsize, iconsize)); ui_->search_field->setIconSize(iconsize); s.beginGroup(kSettingsGroup); @@ -466,6 +482,13 @@ void PlaylistContainer::UpdateNoMatchesLabel() { } +void PlaylistContainer::DisplayPlayingOption() { + + ui_->playing_time_before_or_after->setVisible(!ui_->playing_time_before_or_after->isVisible()); + ui_->playing_center_time->setVisible(!ui_->playing_center_time->isVisible()); + +} + void PlaylistContainer::resizeEvent(QResizeEvent *e) { QWidget::resizeEvent(e); RepositionNoMatchesLabel(); @@ -535,3 +558,19 @@ bool PlaylistContainer::eventFilter(QObject *objectWatched, QEvent *event) { return QWidget::eventFilter(objectWatched, event); } + +QString PlaylistContainer::ToolTipPlayingTime() { + + return "

"_L1 + + QObject::tr("The time played before and after the position time selected in seconds (0 for playing the complete track)") + + "

"_L1; + +} + +QString PlaylistContainer::ToolTipPositionTime() { + + return "

"_L1 + + QObject::tr("The position time reference selected in percent of the track length") + + "

"_L1; + +} diff --git a/src/playlist/playlistcontainer.h b/src/playlist/playlistcontainer.h index bf4c4c7870..9cd305b286 100644 --- a/src/playlist/playlistcontainer.h +++ b/src/playlist/playlistcontainer.h @@ -63,6 +63,9 @@ class PlaylistContainer : public QWidget { bool eventFilter(QObject *objectWatched, QEvent *event) override; + static QString ToolTipPlayingTime(); + static QString ToolTipPositionTime(); + Q_SIGNALS: void UndoRedoActionsChanged(QAction *undo, QAction *redo); void ViewSelectionModelChanged(); @@ -85,6 +88,8 @@ class PlaylistContainer : public QWidget { void PlaylistClosed(const int id); void PlaylistRenamed(const int id, const QString &new_name); + void DisplayPlayingOption(); + void Started(); void Save(); diff --git a/src/playlist/playlistcontainer.ui b/src/playlist/playlistcontainer.ui index bee4b89790..2cce390527 100644 --- a/src/playlist/playlistcontainer.ui +++ b/src/playlist/playlistcontainer.ui @@ -145,6 +145,51 @@ + + + + + 20 + 20 + + + + true + + + false + + + + + + + 0 + + + 0 + + + false + + + + + + + 0 + + + 100 + + + 0 + + + false + + + @@ -183,6 +228,11 @@ + + + Show the collection option + + diff --git a/src/playlist/playlistmanager.cpp b/src/playlist/playlistmanager.cpp index 8118228f61..ff474d1901 100644 --- a/src/playlist/playlistmanager.cpp +++ b/src/playlist/playlistmanager.cpp @@ -111,7 +111,7 @@ void PlaylistManager::Init(PlaylistSequence *sequence, PlaylistContainer *playli const PlaylistBackend::PlaylistList playlists = playlist_backend_->GetAllOpenPlaylists(); for (const PlaylistBackend::Playlist &p : playlists) { ++playlists_loading_; - Playlist *ret = AddPlaylist(p.id, p.name, p.special_type, p.ui_path, p.favorite); + Playlist *ret = AddPlaylist(p.id, p.name, p.special_type, p.ui_path, p.half_playing_time_s_, p.percent_interest_song_, p.favorite); QObject::connect(ret, &Playlist::PlaylistLoaded, this, &PlaylistManager::PlaylistLoaded); } @@ -153,9 +153,9 @@ QItemSelection PlaylistManager::selection(const int id) const { return it->selection; } -Playlist *PlaylistManager::AddPlaylist(const int id, const QString &name, const QString &special_type, const QString &ui_path, const bool favorite) { +Playlist *PlaylistManager::AddPlaylist(const int id, const QString &name, const QString &special_type, const QString &ui_path, const int half_playing_time_s, const int percent_interest_song, const bool favorite) { - Playlist *ret = new Playlist(task_manager_, url_handlers_, playlist_backend_, collection_backend_, tagreader_client_, id, special_type, favorite); + Playlist *ret = new Playlist(task_manager_, url_handlers_, playlist_backend_, collection_backend_, tagreader_client_, id, special_type, favorite, half_playing_time_s, percent_interest_song); ret->set_sequence(sequence_); ret->set_ui_path(ui_path); @@ -193,7 +193,7 @@ void PlaylistManager::New(const QString &name, const SongList &songs, const QStr if (id == -1) qFatal("Couldn't create playlist"); - Playlist *playlist = AddPlaylist(id, name, special_type, QString(), false); + Playlist *playlist = AddPlaylist(id, name, special_type, QString(), 0, 50, false); playlist->InsertSongsOrCollectionItems(songs); SetCurrentPlaylist(id); @@ -216,7 +216,7 @@ void PlaylistManager::Load(const QString &filename) { return; } - Playlist *playlist = AddPlaylist(id, fileinfo.completeBaseName(), QString(), QString(), false); + Playlist *playlist = AddPlaylist(id, fileinfo.completeBaseName(), QString(), QString(), 0, 50, false); playlist->InsertUrls(QList() << QUrl::fromLocalFile(filename)); @@ -547,7 +547,7 @@ void PlaylistManager::Open(const int id) { return; } - AddPlaylist(p.id, p.name, p.special_type, p.ui_path, p.favorite); + AddPlaylist(p.id, p.name, p.special_type, p.ui_path, p.half_playing_time_s_, p.percent_interest_song_, p.favorite); } diff --git a/src/playlist/playlistmanager.h b/src/playlist/playlistmanager.h index be568aed22..7f69db78ad 100644 --- a/src/playlist/playlistmanager.h +++ b/src/playlist/playlistmanager.h @@ -140,6 +140,11 @@ class PlaylistManager : public PlaylistManagerInterface { void SaveAllPlaylists(); + int half_playing_time_s() const { return current()->half_playing_time_s(); } + void UpdatePlayingTime(int playing_time_s) { current()->UpdatePlayingTime(playing_time_s); } + int percent_interest_song() const { return current()->percent_interest_song(); } + void UpdatePlayingPosition(int playing_position_percent) { current()->UpdatePlayingPosition(playing_position_percent); } + void SetActivePlaying() override; void SetActivePaused() override; void SetActiveStopped() override; @@ -152,7 +157,7 @@ class PlaylistManager : public PlaylistManagerInterface { void PlaylistLoaded(); private: - Playlist *AddPlaylist(const int id, const QString &name, const QString &special_type, const QString &ui_path, const bool favorite); + Playlist *AddPlaylist(const int id, const QString &name, const QString &special_type, const QString &ui_path, const int half_playing_time_s, const int percent_interest_song, const bool favorite); private: struct Data { diff --git a/src/smartplaylists/smartplaylistsearchpreview.cpp b/src/smartplaylists/smartplaylistsearchpreview.cpp index 4d1620f09f..eb47e175bb 100644 --- a/src/smartplaylists/smartplaylistsearchpreview.cpp +++ b/src/smartplaylists/smartplaylistsearchpreview.cpp @@ -72,7 +72,7 @@ void SmartPlaylistSearchPreview::Init(const SharedPtr player, collection_backend_ = collection_backend; - model_ = new Playlist(nullptr, nullptr, nullptr, collection_backend_, nullptr, -1, QString(), false, this); + model_ = new Playlist(nullptr, nullptr, nullptr, collection_backend_, nullptr, -1, QString(), false, 0, 50, this); ui_->tree->setModel(model_); ui_->tree->SetPlaylist(model_);