Add group support to Channel class

monocasual · May 19, 2024 · 500c8b8 · 500c8b8
1 parent 7c5afcb
commit 500c8b8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/core/channels/channel.cpp b/src/core/channels/channel.cpp
@@ -25,6 +25,7 @@
  * -------------------------------------------------------------------------- */
 
 #include "core/channels/channel.h"
+#include "core/model/channels.h"
 #include <cassert>
 #ifdef G_DEBUG_MODE
 #include "utils/string.h"
@@ -36,6 +37,7 @@ namespace giada::m
 Channel::Channel(ChannelType type, ID id, ChannelShared& s)
 : shared(&s)
 , id(id)
+, parentId(0)
 , type(type)
 , volume(G_DEFAULT_VOL)
 , pan(G_DEFAULT_PAN)
@@ -57,6 +59,10 @@ Channel::Channel(ChannelType type, ID id, ChannelShared& s)
  midiChannel.emplace();
  break;
 
+ case ChannelType::GROUP:
+ groupChannel.emplace();
+ break;
+
  default:
  break;
  }
@@ -67,6 +73,7 @@ Channel::Channel(ChannelType type, ID id, ChannelShared& s)
 Channel::Channel(const Patch::Channel& p, ChannelShared& s, float samplerateRatio, Wave* wave, std::vector<Plugin*> plugins)
 : shared(&s)
 , id(p.id)
+, parentId(0) // TODO
 , type(p.type)
 , volume(p.volume)
 , pan(p.pan)
@@ -95,6 +102,10 @@ Channel::Channel(const Patch::Channel& p, ChannelShared& s, float samplerateRati
  midiChannel.emplace(p);
  break;
 
+ case ChannelType::GROUP:
+ groupChannel.emplace(); // TODO
+ break;
+
  default:
  break;
  }
@@ -156,6 +167,11 @@ bool Channel::hasWave() const
  return sampleChannel && sampleChannel->hasWave();
 }
 
+bool Channel::isGrouped() const
+{
+ return parentId != 0;
+}
+
 bool Channel::isPlaying() const
 {
  ChannelStatus s = shared->playStatus.load();
@@ -167,15 +183,17 @@ bool Channel::isPlaying() const
 #ifdef G_DEBUG_MODE
 std::string Channel::debug() const
 {
- std::string out = fmt::format("ID={} name='{}' type={} channelShared={}",
- id, name, u::string::toString(type), (void*)&shared);
+ std::string out = fmt::format("ID={} name='{}' type={} grouped={} channelShared={}",
+ id, name, u::string::toString(type), isGrouped(), (void*)&shared);
 
  if (type == ChannelType::SAMPLE || type == ChannelType::PREVIEW)
  out += fmt::format(" wave={} mode={} begin={} end={}",
  (void*)sampleChannel->getWave(),
  u::string::toString(sampleChannel->mode),
  sampleChannel->begin,
  sampleChannel->end);
+ else if (type == ChannelType::GROUP)
+ out += fmt::format(" channels={}", groupChannel->getChildren().size());
 
  return out;
 }

diff --git a/src/core/channels/channel.h b/src/core/channels/channel.h
@@ -28,6 +28,7 @@
 #define G_CHANNEL_H
 
 #include "core/channels/channelShared.h"
+#include "core/channels/groupChannel.h"
 #include "core/channels/midiChannel.h"
 #include "core/channels/midiInput.h"
 #include "core/channels/midiLightning.h"
@@ -53,6 +54,7 @@ class Channel final
  bool canInputRec() const;
  bool canActionRec() const;
  bool hasWave() const;
+ bool isGrouped() const;
 
  /* canReceiveAudio
  Tells if the sample channel can receive audio as input monitor. */
@@ -65,7 +67,7 @@ class Channel final
  bool canSendMidi() const;
 
  /* isAudible
- True if this channel is currently audible: not muted or not included in a 
+ True if this channel is currently audible: not muted or not included in a
  solo session. */
 
  bool isAudible(bool mixerHasSolos) const;
@@ -98,6 +100,7 @@ class Channel final
 
  ChannelShared* shared;
  ID id;
+ ID parentId;
  ChannelType type;
  float volume;
  float pan;
@@ -113,6 +116,7 @@ class Channel final
 
  std::optional<SampleChannel> sampleChannel;
  std::optional<MidiChannel> midiChannel;
+ std::optional<GroupChannel> groupChannel;
 
 private:
  bool m_mute;