ASE: track: use properties for mute/solo/volume

Signed-off-by: Stefan Westerfeld <stefan@space.twc.de>

Author: swesterfeld

ase/api.hh

@@ -261,12 +261,6 @@ class Track : public virtual Device {
 public:
   virtual int32           midi_channel        () const = 0;          ///< Midi channel assigned to this track, 0 uses internal per-track channel.
   virtual void            midi_channel        (int32 midichannel) = 0;
-  virtual bool            mute                () const = 0;          ///< Whether the track is muted
-  virtual void            mute                (bool newmute) = 0;
-  virtual bool            solo                () const = 0;          ///< Whether the track is solo
-  virtual void            solo                (bool newsolo) = 0;
-  virtual double          volume              () const = 0;          ///< Volume of the track [0..1]
-  virtual void            volume              (double newvolume) = 0;
   virtual bool            is_master           () const = 0;          ///< Flag set on the main output track.
   virtual ClipS           launcher_clips      () = 0;                ///< Retrieve the list of clips that can be directly played.
   virtual DeviceP         access_device       () = 0;                ///< Retrieve Device handle for this track.

ase/track.cc

@@ -169,30 +169,33 @@ TrackImpl::midi_channel (int32 midichannel) // TODO: implement
   emit_notify ("midi_channel");
 }
 
-void
+bool
 TrackImpl::mute (bool new_mute)
 {
   mute_ = new_mute;
   set_chain_volumes();
   emit_notify ("mute");
+  return true;
 }
 
-void
+bool
 TrackImpl::solo (bool new_solo)
 {
   solo_ = new_solo;
   set_chain_volumes();
   emit_notify ("solo");
+  return true;
 }
 
-void
+bool
 TrackImpl::volume (double new_volume)
 {
   volume_ = new_volume;
   // TODO: display this value if track volume is changed in the UI
   // printf ("Track '%s' -> set volume to %f dB\n", name().c_str(), AudioChain::volume_db (new_volume));
   set_chain_volumes();
   emit_notify ("volume");
+  return true;
 }
 
 void
@@ -211,7 +214,10 @@ TrackImpl::set_chain_volumes()
 
   bool have_solo_tracks = false;
   for (const auto& track : all_tracks)
-    have_solo_tracks = have_solo_tracks || track->solo();
+    {
+      auto track_impl = dynamic_cast<Ase::TrackImpl*> (track.get());
+      have_solo_tracks = have_solo_tracks || track_impl->solo();
+    }
 
   for (const auto& track : all_tracks)
     {
@@ -233,6 +239,25 @@ TrackImpl::set_chain_volumes()
     }
 }
 
+void
+TrackImpl::create_properties ()
+{
+  // chain to base class
+  DeviceImpl::create_properties();
+  // create own properties
+  auto getvolume = [this] (Value &val)       { val = volume(); };
+  auto setvolume = [this] (const Value &val) { return volume (val.as_double()); };
+  auto getsolo   = [this] (Value &val)       { val = solo(); };
+  auto setsolo   = [this] (const Value &val) { return solo (val.as_double()); };
+  auto getmute   = [this] (Value &val)       { val = mute(); };
+  auto setmute   = [this] (const Value &val) { return mute (val.as_double()); };
+  PropertyBag bag = property_bag();
+  bag.group = _("Mix");
+  bag += Prop (getvolume, setvolume, { "volume", _("Volume"), _("Volume"), 1., "", { 0., 2 }, STANDARD });
+  bag += Prop (getsolo, setsolo,     { "solo",   _("Solo"),   _("Solo"), false, "", {}, STANDARD + String (":toggle") });
+  bag += Prop (getmute, setmute,     { "mute",   _("Mute"),   _("Mute"), false, "", {}, STANDARD + String (":toggle") });
+}
+
 static constexpr const uint MAX_LAUNCHER_CLIPS = 8;
 
 ClipS

ase/track.hh

@@ -21,6 +21,13 @@ class TrackImpl : public DeviceImpl, public virtual Track {
 protected:
   String          fallback_name     () const override;
   void            serialize         (WritNode &xs) override;
+  void            create_properties () override;
+  bool            mute              () const               { return mute_; }
+  bool            mute              (bool new_mute);
+  bool            solo              () const               { return solo_; }
+  bool            solo              (bool new_solo);
+  double          volume            () const               { return volume_; }
+  bool            volume            (double new_volume);
 public:
   class ClipScout;
   explicit        TrackImpl         (ProjectImpl&, bool masterflag);
@@ -34,12 +41,6 @@ public:
   bool            is_master         () const override      { return MASTER_TRACK & gadget_flags(); }
   int32           midi_channel      () const override      { return midi_channel_; }
   void            midi_channel      (int32 midichannel) override;
-  bool            mute              () const override      { return mute_; }
-  void            mute              (bool new_mute) override;
-  bool            solo              () const override      { return solo_; }
-  void            solo              (bool new_solo) override;
-  double          volume            () const override      { return volume_; }
-  void            volume            (double new_volume) override;
   ClipS           launcher_clips    () override;
   DeviceP         access_device     () override;
   MonitorP        create_monitor    (int32 ochannel) override;