Use mc::container for v::Model::Channel

monocasual · Apr 28, 2024 · 2290a89 · 2290a89
1 parent f982220
commit 2290a89
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/src/glue/channel.cpp b/src/glue/channel.cpp
@@ -81,7 +81,7 @@ Column makeColumn_(const v::Model::Column& modelColumn)
 	for (const v::Model::Channel& channel : modelColumn)
 	{
 		column.channels.push_back(makeData_(channel));
-		for (const v::Model::Channel& child : channel.channels.getAll()) // for groups
+		for (const v::Model::Channel& child : channel) // for groups
 			column.channels.push_back(makeData_(child));
 	}
 

diff --git a/src/gui/model.cpp b/src/gui/model.cpp
@@ -31,6 +31,16 @@
 
 namespace giada::v
 {
+Model::Channel::Channel(ID id, std::size_t columnIndex)
+: columnIndex(columnIndex)
+{
+	this->id = id;
+}
+
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+/* -------------------------------------------------------------------------- */
+
 Model::Column::Column(int width)
 : width(width)
 {
@@ -232,9 +242,9 @@ void Model::addChannelToGroup(ID channelId, ID groupId, int position)
 	Column&  column = getColumnByChannelId(groupId);
 	Channel& group  = column.getById(groupId);
 	if (position == -1)
-		group.channels.add({channelId, column.index});
+		group.add({channelId, column.index});
 	else
-		group.channels.insert({channelId, column.index}, position);
+		group.insert({channelId, column.index}, position);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -245,7 +255,7 @@ void Model::removeChannelFromColumn(ID channelId)
 	{
 		column.removeById(channelId);
 		for (Channel& channel : column)
-			channel.channels.removeById(channelId);
+			channel.removeById(channelId);
 	}
 }
 

diff --git a/src/gui/model.h b/src/gui/model.h
@@ -32,7 +32,6 @@
 #include "core/plugins/pluginManager.h"
 #include "deps/geompp/src/rect.hpp"
 #include "deps/mcl-container/src/container.hpp"
-#include "utils/container.h"
 #include <FL/Enumerations.H>
 #include <string>
 #include <vector>
@@ -41,18 +40,14 @@ namespace giada::v
 {
 struct Model
 {
-	template <typename T>
-	using Channels = u::Container<T, /*Identifiable=*/true, /*Sortable=*/true>;
-
 	template <typename T>
 	using Columns = mcl::Container<T>;
 
-	struct Channel
+	struct Channel : public mcl::Container<Channel, /*Identifiable=*/true, /*Sortable=*/true>
 	{
-		ID                id;
-		std::size_t       columnIndex;
-		int               index    = -1;
-		Channels<Channel> channels = {};
+		Channel(ID id, std::size_t columnIndex);
+
+		std::size_t columnIndex;
 	};
 
 	struct Column : public mcl::Container<Channel, /*Identifiable=*/false, /*Sortable=*/true>