From 7d7f7755d17e1e0a2348d75d797097f166b70471 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 2 May 2024 21:41:56 +1000 Subject: start moving include files into subdirs --- src/tangara/lua/bridge.cpp | 28 ++++++++++++++-------------- src/tangara/lua/bridge.hpp | 9 ++++----- src/tangara/lua/lua_controls.cpp | 4 ++-- src/tangara/lua/lua_database.cpp | 36 +++++++++++++++++------------------- src/tangara/lua/lua_database.hpp | 2 +- src/tangara/lua/lua_queue.cpp | 20 ++++++++++---------- src/tangara/lua/lua_registry.hpp | 6 +++--- src/tangara/lua/lua_screen.cpp | 20 ++++++++++---------- src/tangara/lua/lua_theme.cpp | 25 ++++++++++++++----------- src/tangara/lua/lua_thread.cpp | 16 +++++++++------- src/tangara/lua/lua_thread.hpp | 2 +- src/tangara/lua/lua_version.cpp | 6 +++--- src/tangara/lua/property.cpp | 8 ++++---- src/tangara/lua/property.hpp | 4 ++-- src/tangara/lua/registry.cpp | 10 +++++----- 15 files changed, 99 insertions(+), 97 deletions(-) (limited to 'src/tangara/lua') diff --git a/src/tangara/lua/bridge.cpp b/src/tangara/lua/bridge.cpp index cfa9d5f7..17dd41cc 100644 --- a/src/tangara/lua/bridge.cpp +++ b/src/tangara/lua/bridge.cpp @@ -4,33 +4,33 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "bridge.hpp" -#include +#include "lua/bridge.hpp" +#include #include #include -#include "database.hpp" +#include "database/database.hpp" +#include "database/index.hpp" #include "esp_log.h" -#include "index.hpp" #include "lauxlib.h" #include "lua.h" #include "lua.hpp" -#include "lua_controls.hpp" -#include "lua_database.hpp" -#include "lua_queue.hpp" -#include "lua_screen.hpp" -#include "lua_version.hpp" -#include "lua_theme.hpp" +#include "lua/lua_controls.hpp" +#include "lua/lua_database.hpp" +#include "lua/lua_queue.hpp" +#include "lua/lua_screen.hpp" +#include "lua/lua_theme.hpp" +#include "lua/lua_version.hpp" #include "lvgl.h" #include "font/lv_font_loader.h" #include "luavgl.h" -#include "event_queue.hpp" -#include "property.hpp" -#include "service_locator.hpp" -#include "ui_events.hpp" +#include "events/event_queue.hpp" +#include "lua/property.hpp" +#include "system_fsm/service_locator.hpp" +#include "ui/ui_events.hpp" extern "C" { int luaopen_linenoise(lua_State* L); diff --git a/src/tangara/lua/bridge.hpp b/src/tangara/lua/bridge.hpp index 64f14e0e..b4cfe503 100644 --- a/src/tangara/lua/bridge.hpp +++ b/src/tangara/lua/bridge.hpp @@ -10,9 +10,9 @@ #include #include "lua.hpp" +#include "lua/property.hpp" #include "lvgl.h" -#include "property.hpp" -#include "service_locator.hpp" +#include "system_fsm/service_locator.hpp" namespace lua { @@ -39,9 +39,8 @@ class Bridge { auto installPropertyModule( lua_State* L, const std::string&, - std::vector< - std::pair>>&) - -> void; + std::vector>>&) -> void; Bridge(const Bridge&) = delete; Bridge& operator=(const Bridge&) = delete; diff --git a/src/tangara/lua/lua_controls.cpp b/src/tangara/lua/lua_controls.cpp index 2da0ed11..ab5b3c02 100644 --- a/src/tangara/lua/lua_controls.cpp +++ b/src/tangara/lua/lua_controls.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "lua_controls.hpp" +#include "lua/lua_controls.hpp" #include #include @@ -17,7 +17,7 @@ #include "lvgl.h" #include "nvs.hpp" -#include "ui_events.hpp" +#include "ui/ui_events.hpp" namespace lua { diff --git a/src/tangara/lua/lua_database.cpp b/src/tangara/lua/lua_database.cpp index d0612fdd..1afb01f0 100644 --- a/src/tangara/lua/lua_database.cpp +++ b/src/tangara/lua/lua_database.cpp @@ -4,30 +4,30 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "lua_database.hpp" +#include "lua/lua_database.hpp" #include #include #include #include -#include "bridge.hpp" #include "lua.hpp" +#include "lua/bridge.hpp" #include "esp_log.h" #include "lauxlib.h" #include "lua.h" -#include "lua_thread.hpp" +#include "lua/lua_thread.hpp" #include "lvgl.h" -#include "database.hpp" -#include "event_queue.hpp" -#include "index.hpp" -#include "property.hpp" -#include "records.hpp" -#include "service_locator.hpp" -#include "track.hpp" -#include "ui_events.hpp" +#include "database/database.hpp" +#include "database/index.hpp" +#include "database/records.hpp" +#include "database/track.hpp" +#include "events/event_queue.hpp" +#include "lua/property.hpp" +#include "system_fsm/service_locator.hpp" +#include "ui/ui_events.hpp" namespace lua { @@ -152,8 +152,8 @@ auto db_check_iterator(lua_State* L, int stack_pos) -> database::Iterator* { return it; } -static auto push_iterator(lua_State* state, const database::Iterator& it) - -> void { +static auto push_iterator(lua_State* state, + const database::Iterator& it) -> void { database::Iterator** data = reinterpret_cast( lua_newuserdata(state, sizeof(uintptr_t))); *data = new database::Iterator(it); @@ -198,12 +198,10 @@ static auto db_iterator_gc(lua_State* state) -> int { return 0; } -static const struct luaL_Reg kDbIteratorFuncs[] = {{"next", db_iterate}, - {"prev", db_iterate_prev}, - {"clone", db_iterator_clone}, - {"__call", db_iterate}, - {"__gc", db_iterator_gc}, - {NULL, NULL}}; +static const struct luaL_Reg kDbIteratorFuncs[] = { + {"next", db_iterate}, {"prev", db_iterate_prev}, + {"clone", db_iterator_clone}, {"__call", db_iterate}, + {"__gc", db_iterator_gc}, {NULL, NULL}}; static auto record_text(lua_State* state) -> int { LuaRecord* data = reinterpret_cast( diff --git a/src/tangara/lua/lua_database.hpp b/src/tangara/lua/lua_database.hpp index b0d2acbd..328004ef 100644 --- a/src/tangara/lua/lua_database.hpp +++ b/src/tangara/lua/lua_database.hpp @@ -8,7 +8,7 @@ #include "lua.hpp" -#include "database.hpp" +#include "database/database.hpp" namespace lua { diff --git a/src/tangara/lua/lua_queue.cpp b/src/tangara/lua/lua_queue.cpp index dfb820c2..bc393aa5 100644 --- a/src/tangara/lua/lua_queue.cpp +++ b/src/tangara/lua/lua_queue.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "lua_database.hpp" +#include "lua/lua_database.hpp" #include #include @@ -16,15 +16,15 @@ #include "lua.h" #include "lvgl.h" -#include "bridge.hpp" -#include "database.hpp" -#include "event_queue.hpp" -#include "index.hpp" -#include "property.hpp" -#include "service_locator.hpp" -#include "track.hpp" -#include "track_queue.hpp" -#include "ui_events.hpp" +#include "audio/track_queue.hpp" +#include "database/database.hpp" +#include "database/index.hpp" +#include "database/track.hpp" +#include "events/event_queue.hpp" +#include "lua/bridge.hpp" +#include "lua/property.hpp" +#include "system_fsm/service_locator.hpp" +#include "ui/ui_events.hpp" namespace lua { diff --git a/src/tangara/lua/lua_registry.hpp b/src/tangara/lua/lua_registry.hpp index abc5063e..e556b6eb 100644 --- a/src/tangara/lua/lua_registry.hpp +++ b/src/tangara/lua/lua_registry.hpp @@ -11,9 +11,9 @@ #include "lua.hpp" -#include "bridge.hpp" -#include "lua_thread.hpp" -#include "service_locator.hpp" +#include "lua/bridge.hpp" +#include "lua/lua_thread.hpp" +#include "system_fsm/service_locator.hpp" namespace lua { diff --git a/src/tangara/lua/lua_screen.cpp b/src/tangara/lua/lua_screen.cpp index f17f6b1a..8d87eebd 100644 --- a/src/tangara/lua/lua_screen.cpp +++ b/src/tangara/lua/lua_screen.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "lua_screen.hpp" +#include "lua/lua_screen.hpp" #include #include @@ -16,15 +16,15 @@ #include "lua.h" #include "lvgl.h" -#include "bridge.hpp" -#include "database.hpp" -#include "event_queue.hpp" -#include "index.hpp" -#include "property.hpp" -#include "service_locator.hpp" -#include "track.hpp" -#include "track_queue.hpp" -#include "ui_events.hpp" +#include "audio/track_queue.hpp" +#include "database/database.hpp" +#include "database/index.hpp" +#include "database/track.hpp" +#include "events/event_queue.hpp" +#include "lua/bridge.hpp" +#include "lua/property.hpp" +#include "system_fsm/service_locator.hpp" +#include "ui/ui_events.hpp" namespace lua { diff --git a/src/tangara/lua/lua_theme.cpp b/src/tangara/lua/lua_theme.cpp index 72434d97..5edde104 100644 --- a/src/tangara/lua/lua_theme.cpp +++ b/src/tangara/lua/lua_theme.cpp @@ -5,20 +5,20 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "lua_version.hpp" +#include "lua/lua_version.hpp" #include -#include "bridge.hpp" #include "lua.hpp" +#include "lua/bridge.hpp" #include "esp_app_desc.h" #include "esp_log.h" #include "lauxlib.h" #include "lua.h" -#include "lua_thread.hpp" +#include "lua/lua_thread.hpp" #include "luavgl.h" -#include "themes.hpp" +#include "ui/themes.hpp" namespace lua { @@ -35,7 +35,7 @@ static auto set_style(lua_State* L) -> int { static auto set_theme(lua_State* L) -> int { std::string class_name; luaL_checktype(L, -1, LUA_TTABLE); - lua_pushnil(L); /* first key */ + lua_pushnil(L); /* first key */ while (lua_next(L, -2) != 0) { /* uses 'key' (at index -2) and 'value' (at index -1) */ if (lua_type(L, -2) == LUA_TSTRING) { @@ -43,11 +43,11 @@ static auto set_theme(lua_State* L) -> int { } if (lua_type(L, -1) == LUA_TTABLE) { // Nesting - lua_pushnil(L); // First key + lua_pushnil(L); // First key while (lua_next(L, -2) != 0) { // Nesting the second int selector = -1; - lua_pushnil(L); // First key + lua_pushnil(L); // First key while (lua_next(L, -2) != 0) { int idx = lua_tointeger(L, -2); if (idx == 1) { @@ -60,12 +60,13 @@ static auto set_theme(lua_State* L) -> int { ESP_LOGI("lua_theme", "Style was null or malformed"); return 0; } else { - ui::themes::Theme::instance()->AddStyle(class_name, selector, style); + ui::themes::Theme::instance()->AddStyle(class_name, selector, + style); } } - lua_pop(L, 1); + lua_pop(L, 1); } - lua_pop(L, 1); + lua_pop(L, 1); } } /* removes 'value'; keeps 'key' for next iteration */ @@ -74,7 +75,9 @@ static auto set_theme(lua_State* L) -> int { return 0; } -static const struct luaL_Reg kThemeFuncs[] = {{"set", set_theme}, {"set_style", set_style}, {NULL, NULL}}; +static const struct luaL_Reg kThemeFuncs[] = {{"set", set_theme}, + {"set_style", set_style}, + {NULL, NULL}}; static auto lua_theme(lua_State* L) -> int { luaL_newlib(L, kThemeFuncs); diff --git a/src/tangara/lua/lua_thread.cpp b/src/tangara/lua/lua_thread.cpp index dd72e41d..77a46b45 100644 --- a/src/tangara/lua/lua_thread.cpp +++ b/src/tangara/lua/lua_thread.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "lua_thread.hpp" +#include "lua/lua_thread.hpp" #include #include @@ -13,11 +13,11 @@ #include "esp_log.h" #include "lua.hpp" -#include "bridge.hpp" -#include "event_queue.hpp" +#include "events/event_queue.hpp" +#include "lua/bridge.hpp" #include "memory_resource.hpp" -#include "service_locator.hpp" -#include "ui_events.hpp" +#include "system_fsm/service_locator.hpp" +#include "ui/ui_events.hpp" namespace lua { @@ -42,8 +42,10 @@ class Allocator { size_t total_allocated_; }; -static auto lua_alloc(void* ud, void* ptr, size_t osize, size_t nsize) - -> void* { +static auto lua_alloc(void* ud, + void* ptr, + size_t osize, + size_t nsize) -> void* { Allocator* instance = reinterpret_cast(ud); return instance->alloc(ptr, osize, nsize); } diff --git a/src/tangara/lua/lua_thread.hpp b/src/tangara/lua/lua_thread.hpp index 384de61d..d7602c1e 100644 --- a/src/tangara/lua/lua_thread.hpp +++ b/src/tangara/lua/lua_thread.hpp @@ -11,7 +11,7 @@ #include "lua.hpp" -#include "service_locator.hpp" +#include "system_fsm/service_locator.hpp" namespace lua { diff --git a/src/tangara/lua/lua_version.cpp b/src/tangara/lua/lua_version.cpp index e5f06bb5..b85a30a5 100644 --- a/src/tangara/lua/lua_version.cpp +++ b/src/tangara/lua/lua_version.cpp @@ -5,18 +5,18 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "lua_version.hpp" +#include "lua/lua_version.hpp" #include -#include "bridge.hpp" #include "lua.hpp" +#include "lua/bridge.hpp" #include "esp_app_desc.h" #include "esp_log.h" #include "lauxlib.h" #include "lua.h" -#include "lua_thread.hpp" +#include "lua/lua_thread.hpp" namespace lua { diff --git a/src/tangara/lua/property.cpp b/src/tangara/lua/property.cpp index 9f4a1908..951c225f 100644 --- a/src/tangara/lua/property.cpp +++ b/src/tangara/lua/property.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "property.hpp" +#include "lua/property.hpp" #include #include @@ -15,14 +15,14 @@ #include #include "bluetooth_types.hpp" +#include "database/track.hpp" #include "lauxlib.h" #include "lua.h" #include "lua.hpp" -#include "lua_thread.hpp" +#include "lua/lua_thread.hpp" #include "lvgl.h" #include "memory_resource.hpp" -#include "service_locator.hpp" -#include "track.hpp" +#include "system_fsm/service_locator.hpp" #include "types.hpp" namespace lua { diff --git a/src/tangara/lua/property.hpp b/src/tangara/lua/property.hpp index 724261be..2df61bad 100644 --- a/src/tangara/lua/property.hpp +++ b/src/tangara/lua/property.hpp @@ -10,11 +10,11 @@ #include #include -#include "audio_events.hpp" +#include "audio/audio_events.hpp" #include "bluetooth_types.hpp" #include "lua.hpp" #include "lvgl.h" -#include "service_locator.hpp" +#include "system_fsm/service_locator.hpp" namespace lua { diff --git a/src/tangara/lua/registry.cpp b/src/tangara/lua/registry.cpp index a6487858..d33594a3 100644 --- a/src/tangara/lua/registry.cpp +++ b/src/tangara/lua/registry.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -#include "lua_registry.hpp" +#include "lua/lua_registry.hpp" #include #include @@ -13,11 +13,11 @@ #include "esp_log.h" #include "lua.hpp" -#include "bridge.hpp" -#include "event_queue.hpp" +#include "events/event_queue.hpp" +#include "lua/bridge.hpp" #include "memory_resource.hpp" -#include "service_locator.hpp" -#include "ui_events.hpp" +#include "system_fsm/service_locator.hpp" +#include "ui/ui_events.hpp" namespace lua { -- cgit v1.2.3