From 4f5422e906b1d17720592d97bc0d5e82a71b1e5f Mon Sep 17 00:00:00 2001 From: jacqueline Date: Tue, 5 Dec 2023 11:36:34 +1100 Subject: Rewrite the track queue to work directly with database iterators --- src/lua/lua_queue.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'src/lua') diff --git a/src/lua/lua_queue.cpp b/src/lua/lua_queue.cpp index 929a7159..fadcb51c 100644 --- a/src/lua/lua_queue.cpp +++ b/src/lua/lua_queue.cpp @@ -22,6 +22,8 @@ #include "property.hpp" #include "service_locator.hpp" #include "source.hpp" +#include "track.hpp" +#include "track_queue.hpp" #include "ui_events.hpp" namespace lua { @@ -32,11 +34,19 @@ static auto queue_add(lua_State* state) -> int { Bridge* instance = Bridge::Get(state); if (lua_isinteger(state, 1)) { - instance->services().track_queue().AddLast(luaL_checkinteger(state, 1)); + database::TrackId id = luaL_checkinteger(state, 1); + instance->services().bg_worker().Dispatch([=]() { + audio::TrackQueue& queue = instance->services().track_queue(); + auto editor = queue.Edit(); + queue.Append(editor, id); + }); } else { - database::Iterator* it = db_check_iterator(state, 1); - instance->services().track_queue().IncludeLast( - std::make_shared(*it)); + database::Iterator it = *db_check_iterator(state, 1); + instance->services().bg_worker().Dispatch([=]() { + audio::TrackQueue& queue = instance->services().track_queue(); + auto editor = queue.Edit(); + queue.Append(editor, database::TrackIterator{it}); + }); } return 0; @@ -44,7 +54,9 @@ static auto queue_add(lua_State* state) -> int { static auto queue_clear(lua_State* state) -> int { Bridge* instance = Bridge::Get(state); - instance->services().track_queue().Clear(); + audio::TrackQueue& queue = instance->services().track_queue(); + auto editor = queue.Edit(); + queue.Clear(editor); return 0; } -- cgit v1.2.3