change static vector to etl so I can use etl queues for some other st…

…uff (#3296)
SynthstromAudible · Jan 18, 2025 · c235c3e · c235c3e
1 parent 0d79ad6
commit c235c3e
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 1,057 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -196,7 +196,8 @@ add_executable(deluge)
 
 # Link external libraries
 target_link_libraries(deluge PUBLIC
-    argon
+        argon
+        etl::etl
 )
 
 option(MAINTAINER_MODE "Enables all warnings and errors" OFF)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -3,8 +3,15 @@ cmake_policy(SET CMP0135 NEW)
 include(FetchContent)
 
 FetchContent_Declare(argon
-  GIT_REPOSITORY https://github.com/stellar-aria/argon
-  GIT_TAG 3779c5315a978a2f8c892e320ac12ecbb77c3759
+        GIT_REPOSITORY https://github.com/stellar-aria/argon
+        GIT_TAG 3779c5315a978a2f8c892e320ac12ecbb77c3759
 )
 FetchContent_MakeAvailable(argon)
 
+FetchContent_Declare(
+        etl
+        GIT_REPOSITORY https://github.com/ETLCPP/etl
+        GIT_TAG 20.39.4
+)
+
+FetchContent_MakeAvailable(etl)
diff --git a/src/OSLikeStuff/task_scheduler/task_scheduler.cpp b/src/OSLikeStuff/task_scheduler/task_scheduler.cpp
@@ -18,7 +18,6 @@
 #include "OSLikeStuff/task_scheduler/task_scheduler.h"
 
 #include "io/debug/log.h"
-#include "util/container/static_vector.hpp"
 #include <algorithm>
 #include <iostream>
 

diff --git a/src/deluge/gui/menu_item/active_scales.cpp b/src/deluge/gui/menu_item/active_scales.cpp
@@ -8,9 +8,10 @@
 #include "model/song/song.h"
 #include "source_selection/range.h"
 #include "source_selection/regular.h"
-#include "util/container/static_vector.hpp"
 #include "util/functions.h"
 
+#include <etl/vector.h>
+
 namespace deluge::gui::menu_item {
 
 void ActiveScaleMenu::beginSession(MenuItem* navigatedBackwardFrom) {
@@ -36,7 +37,7 @@ void ActiveScaleMenu::drawPixelsForOled() {
 	uint8_t sel;
 
 	// Build a vector with visible scale items. No wrap-around.
-	static_vector<uint8_t, kOLEDMenuNumOptionsVisible> visible = {};
+	etl::vector<uint8_t, kOLEDMenuNumOptionsVisible> visible = {};
 	if (currentPos == 0) {
 		sel = 0;
 		// beginning of the list

diff --git a/src/deluge/gui/menu_item/dx/cartridge.cpp b/src/deluge/gui/menu_item/dx/cartridge.cpp
@@ -28,9 +28,9 @@
 #include "processing/sound/sound.h"
 #include "processing/source.h"
 #include "storage/DX7Cartridge.h"
-#include "util/container/static_vector.hpp"
 #include "util/functions.h"
 #include "util/try.h"
+#include <etl/vector.h>
 #include <memory>
 
 static bool openFile(std::string_view path, DX7Cartridge* data) {
@@ -116,7 +116,7 @@ void DxCartridge::drawPixelsForOled() {
 	char names[32][11];
 	pd->getProgramNames(names);
 
-	static_vector<std::string_view, 32> itemNames = {};
+	etl::vector<std::string_view, 32> itemNames = {};
 	for (int i = 0; i < pd->numPatches(); i++) {
 		itemNames.push_back(names[i]);
 	}

diff --git a/src/deluge/gui/menu_item/dx/engine_select.cpp b/src/deluge/gui/menu_item/dx/engine_select.cpp
@@ -23,7 +23,8 @@
 #include "hid/display/display.h"
 #include "memory/general_memory_allocator.h"
 #include "processing/source.h"
-#include "util/container/static_vector.hpp"
+
+#include <etl/vector.h>
 
 namespace deluge::gui::menu_item {
 
@@ -42,7 +43,7 @@ void DxEngineSelect::readValueAgain() {
 constexpr int numValues = 3;
 
 void DxEngineSelect::drawPixelsForOled() {
-	static_vector<std::string_view, numValues> itemNames = {"auto", "modern", "vintage"};
+	etl::vector<std::string_view, numValues> itemNames = {"auto", "modern", "vintage"};
 	drawItemsForOled(itemNames, currentValue, 0);
 }
 

diff --git a/src/deluge/gui/menu_item/dx/global_params.cpp b/src/deluge/gui/menu_item/dx/global_params.cpp
@@ -24,7 +24,8 @@
 #include "hid/display/display.h"
 #include "memory/general_memory_allocator.h"
 #include "processing/source.h"
-#include "util/container/static_vector.hpp"
+
+#include <etl/vector.h>
 
 namespace deluge::gui::menu_item {
 
@@ -57,7 +58,7 @@ struct {
 constexpr int numValues = sizeof(items) / sizeof(items[0]);
 
 void DxGlobalParams::drawPixelsForOled() {
-	static_vector<std::string_view, numValues> itemNames = {};
+	etl::vector<std::string_view, numValues> itemNames = {};
 	for (auto& item : items) {
 		itemNames.push_back(item.name);
 	}

diff --git a/src/deluge/gui/menu_item/dx/operator_params.cpp b/src/deluge/gui/menu_item/dx/operator_params.cpp
@@ -23,7 +23,7 @@
 #include "hid/display/display.h"
 #include "memory/general_memory_allocator.h"
 #include "processing/source.h"
-#include "util/container/static_vector.hpp"
+#include <etl/vector.h>
 
 namespace deluge::gui::menu_item {
 
@@ -60,7 +60,7 @@ struct {
 constexpr int numValues = sizeof(items) / sizeof(items[0]);
 
 void DxOperatorParams::drawPixelsForOled() {
-	static_vector<std::string_view, numValues> itemNames = {};
+	etl::vector<std::string_view, numValues> itemNames = {};
 	for (auto& item : items) {
 		itemNames.push_back(item.name);
 	}

diff --git a/src/deluge/gui/menu_item/midi/devices.cpp b/src/deluge/gui/menu_item/midi/devices.cpp
@@ -25,7 +25,7 @@
 #include "io/midi/cable_types/usb_hosted.h"
 #include "io/midi/midi_device.h"
 #include "io/midi/midi_device_manager.h"
-#include "util/container/static_vector.hpp"
+#include <etl/vector.h>
 #include <string_view>
 
 extern deluge::gui::menu_item::midi::Device midiDeviceMenu;
@@ -150,7 +150,7 @@ MenuItem* Devices::selectButtonPress() {
 }
 
 void Devices::drawPixelsForOled() {
-	static_vector<std::string_view, kOLEDMenuNumOptionsVisible> itemNames = {};
+	etl::vector<std::string_view, kOLEDMenuNumOptionsVisible> itemNames = {};
 
 	int32_t selectedRow = -1;
 

diff --git a/src/deluge/gui/menu_item/multi_range.cpp b/src/deluge/gui/menu_item/multi_range.cpp
@@ -27,9 +27,9 @@
 #include "processing/sound/sound.h"
 #include "processing/source.h"
 #include "storage/multi_range/multisample_range.h"
-#include "util/container/static_vector.hpp"
 #include "util/functions.h"
 #include <cstring>
+#include <etl/vector.h>
 
 namespace deluge::gui::menu_item {
 
@@ -425,7 +425,7 @@ bool MultiRange::mayEditRangeEdge(RangeEdit whichEdge) {
 }
 
 void MultiRange::drawPixelsForOled() {
-	static_vector<std::string_view, kOLEDMenuNumOptionsVisible> itemNames{};
+	etl::vector<std::string_view, kOLEDMenuNumOptionsVisible> itemNames{};
 	char nameBuffers[kOLEDMenuNumOptionsVisible][20];
 	int32_t actualCurrentRange = this->getValue();
 

diff --git a/src/deluge/gui/menu_item/source_selection.cpp b/src/deluge/gui/menu_item/source_selection.cpp
@@ -23,7 +23,8 @@
 #include "modulation/params/param_manager.h"
 #include "modulation/patch/patch_cable_set.h"
 #include "processing/sound/sound.h"
-#include "util/container/static_vector.hpp"
+
+#include <etl/vector.h>
 
 namespace deluge::gui::menu_item {
 const PatchSource sourceMenuContents[] = {
@@ -43,7 +44,7 @@ uint8_t SourceSelection::shouldDrawDotOnValue() {
 int32_t SourceSelection::selectedRowOnScreen;
 
 void SourceSelection::drawPixelsForOled() {
-	static_vector<std::string_view, kOLEDMenuNumOptionsVisible> itemNames{};
+	etl::vector<std::string_view, kOLEDMenuNumOptionsVisible> itemNames{};
 
 	selectedRowOnScreen = 0;
 

diff --git a/src/deluge/gui/menu_item/submenu.cpp b/src/deluge/gui/menu_item/submenu.cpp
@@ -1,9 +1,9 @@
 #include "submenu.h"
+#include "etl/vector.h"
 #include "gui/views/automation_view.h"
 #include "hid/display/display.h"
 #include "hid/display/oled.h"
 #include "model/settings/runtime_feature_settings.h"
-#include "util/container/static_vector.hpp"
 
 namespace deluge::gui::menu_item {
 void Submenu::beginSession(MenuItem* navigatedBackwardFrom) {
@@ -57,7 +57,7 @@ void Submenu::drawPixelsForOled() {
 
 void Submenu::drawVerticalMenu() {
 	// Collect items before the current item, this is possibly more than we need.
-	static_vector<MenuItem*, kOLEDMenuNumOptionsVisible> before = {};
+	etl::vector<MenuItem*, kOLEDMenuNumOptionsVisible> before = {};
 	for (auto it = current_item_ - 1; it != items.begin() - 1 && before.size() < before.capacity(); it--) {
 		MenuItem* menuItem = (*it);
 		if (menuItem->isRelevant(soundEditor.currentModControllable, soundEditor.currentSourceIndex)) {
@@ -67,7 +67,7 @@ void Submenu::drawVerticalMenu() {
 	std::reverse(before.begin(), before.end());
 
 	// Collect current item and fill the tail
-	static_vector<MenuItem*, kOLEDMenuNumOptionsVisible> after = {};
+	etl::vector<MenuItem*, kOLEDMenuNumOptionsVisible> after = {};
 	for (auto it = current_item_; it != items.end() && after.size() < after.capacity(); it++) {
 		MenuItem* menuItem = (*it);
 		if (menuItem->isRelevant(soundEditor.currentModControllable, soundEditor.currentSourceIndex)) {
@@ -89,7 +89,7 @@ void Submenu::drawVerticalMenu() {
 	}
 
 	// Put it together.
-	static_vector<MenuItem*, kOLEDMenuNumOptionsVisible> visible;
+	etl::vector<MenuItem*, kOLEDMenuNumOptionsVisible> visible;
 	visible.insert(visible.begin(), before.end() - pos, before.end());
 	visible.insert(visible.begin() + pos, after.begin(), after.begin() + tail);