Add v::Model::Columns::addChannel() method, more generic

monocasual · May 15, 2024 · c67a5a7 · c67a5a7
1 parent 74dcdf5
commit c67a5a7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/src/glue/channel.cpp b/src/glue/channel.cpp
@@ -188,10 +188,7 @@ void loadChannel(ID channelId, const std::string& fname)
 void addChannel(int columnIndex, ChannelType type, ID groupChannelId)
 {
  const m::Channel& ch = g_engine->getChannelsApi().add(type, columnIndex, groupChannelId);
- if (groupChannelId > 0)
- g_ui->model.columns.addChannelToGroup(ch.id, groupChannelId);
- else
- g_ui->model.columns.addChannelToColumn(ch.id, columnIndex);
+ g_ui->model.columns.addChannel(ch.id, columnIndex, groupChannelId);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -212,7 +209,7 @@ void addAndLoadChannels(int columnIndex, const std::vector<std::string>& fnames)
  if (res != G_RES_OK)
  errors = true;
  else
- g_ui->model.columns.addChannelToColumn(ch.id, columnIndex);
+ g_ui->model.columns.addChannel(ch.id, columnIndex);
  }
 
  if (errors)

diff --git a/src/glue/sampleEditor.cpp b/src/glue/sampleEditor.cpp
@@ -236,7 +236,7 @@ void toNewChannel(ID channelId, Frame a, Frame b)
 {
  const int columnIndex = g_ui->mainWindow->keyboard->getChannelColumnIndex(channelId);
  const m::Channel& newChannel = g_engine->getSampleEditorApi().toNewChannel(channelId, a, b);
- g_ui->model.columns.addChannelToColumn(newChannel.id, columnIndex);
+ g_ui->model.columns.addChannel(newChannel.id, columnIndex);
 }
 
 /* -------------------------------------------------------------------------- */

diff --git a/src/gui/model.cpp b/src/gui/model.cpp
@@ -124,6 +124,19 @@ void Model::Columns::addChannelToGroup(ID channelId, ID groupId, int position)
 
 /* -------------------------------------------------------------------------- */
 
+void Model::Columns::addChannel(ID channelId, std::size_t columnIndex, ID groupId)
+{
+ Channel channel = {channelId, groupId, columnIndex};
+ Column& column = getByIndex(columnIndex);
+
+ if (groupId == 0)
+ column.add(std::move(channel));
+ else
+ column.getById(groupId).add(std::move(channel));
+}
+
+/* -------------------------------------------------------------------------- */
+
 void Model::Columns::removeChannelFromColumn(ID channelId)
 {
  for (Column& column : *this) // Brute force!

diff --git a/src/gui/model.h b/src/gui/model.h
@@ -64,6 +64,7 @@ struct Model
  void moveChannel(ID channelId, std::size_t newColumnIndex, int newPosition);
  void addChannelToColumn(ID channelId, std::size_t columnIndex, int position = -1);
  void addChannelToGroup(ID channelId, ID groupId, int position = -1);
+ void addChannel(ID channelId, std::size_t columnIndex, ID groupId = 0);
  void removeChannelFromColumn(ID channelId);
  };