allowing to setup an index field into Destination

Author: theod

Documentation/Examples/Editor/curve.cpp

@@ -59,10 +59,10 @@ int main()
 
   Tuple t = {new Float(-1.), new Float(0.), new Float(1.)};
   localTupleAddress->setValue(&t);
-  Destination d(localTupleNode);
-  
+
   cout << "*** test 3 ***" << endl;
-  myCurve->setInitialDestination(&d);
+  Destination d1(localTupleNode);
+  myCurve->setInitialDestination(&d1);
 
   cout << "value at 0. = " << myCurve->valueAt(0.) << endl;
   cout << "value at 0.5 = " << myCurve->valueAt(0.5) << endl;
@@ -71,7 +71,8 @@ int main()
   cout << "value at 2. = " << myCurve->valueAt(2.) << endl;
 
   cout << "*** test 4 ***" << endl;
-  myCurve->setInitialDestinationIndex({1});
+  Destination d2(localTupleNode, {1});
+  myCurve->setInitialDestination(&d2);
 
   cout << "value at 0. = " << myCurve->valueAt(0.) << endl;
   cout << "value at 0.5 = " << myCurve->valueAt(0.5) << endl;

Headers/Editor/Curve.h

@@ -112,16 +112,6 @@ class Curve : public CurveAbstract
    \param const Destination* */
   virtual void setInitialDestination(const Destination*) = 0;
 
-  /*! get which index are taken in case the initial destination is a Tuple of Tuple of Tuple ...
-   \return std::vector<char> */
-  virtual std::vector<char> getInitialDestinationIndex() const = 0;
-  
-  /*! precise which index to take in case the initial destination is a Tuple of Tuple of Tuple ...
-   \param char for first level Tuple index
-   \param char for second level Tuple index
-   \param ... */
-  virtual void setInitialDestinationIndex(std::initializer_list<char>) = 0;
-  
   /*! get initial curve value
    \return std::map<X, std::pair<Y, std::shared_ptr<CurveSegment<Y>>>> map of {abscissa, {value, previous segment} */
   virtual std::map<X, std::pair<Y, std::shared_ptr<CurveSegment<Y>>>> getPointsMap() const = 0;

Headers/Editor/Value.h

@@ -311,7 +311,6 @@ struct Tuple final : public Value
   \param ... */
   Tuple(std::initializer_list<const Value*>);
 
-
   /*! constructor passing a value vector
    \param std::vector<const #Value> value */
   Tuple(const std::vector<const Value*>&);

Headers/Network/Address.h

@@ -77,8 +77,9 @@ class Address : public CallbackContainer<ValueCallback>
 
   /*! clone the address value
    \details thread-safe
+   \param std::initializer_list<char> optionnal index list to clone only some elements from a Tuple value
    \return const #Value* a cloned value. deletion is the responsibility of the caller. */
-  virtual const Value * cloneValue() const = 0;
+  virtual const Value * cloneValue(std::vector<char> = {}) const = 0;
 
   /*! set the address value
    \note call pushValue if you need to sync the value with the device

Headers/Network/Node.h

@@ -152,13 +152,23 @@ class Node : public CallbackContainer<NodeChangeCallback>
 # pragma mark -
 # pragma mark Destination
 
-/*! \details Destination value */
+/*! \details Destination to an Address value and optionnally to several index of this value */
 struct Destination final : public Value
 {
   std::shared_ptr<Node> value;
-
-  /*! constructor */
-  Destination(std::shared_ptr<Node> v);
+  std::vector<char> index;
+
+  /*! constructor for a node and optionnal index values
+   \param std::shared_ptr<Node>
+   \param char
+   \param char
+   \param ... */
+  Destination(std::shared_ptr<Node> v, std::initializer_list<char> = {});
+  
+  /*! constructor for a node and an index vector
+   \param std::shared_ptr<Node>
+   \param std::vector<const #Value> value */
+  Destination(std::shared_ptr<Node> v, std::vector<char>);
 
   /*! clone */
   Value * clone() const override;

Implementations/Jamoma/Includes/Editor/JamomaCurve.h

@@ -68,10 +68,6 @@ class JamomaCurve final : public Curve<X,Y>
 
   void setInitialDestination(const Destination*) override;
 
-  vector<char> getInitialDestinationIndex() const override;
-
-  void setInitialDestinationIndex(std::initializer_list<char>) override;
-
   map<X, pair<Y, shared_ptr<CurveSegment<Y>>>> getPointsMap() const override;
 
 # pragma mark -

Implementations/Jamoma/Includes/Network/JamomaAddress.h

@@ -73,7 +73,7 @@ class JamomaAddress final : public Address, public enable_shared_from_this<Jamom
 
   const Value * getValue() const override;
 
-  const Value * cloneValue() const override;
+  const Value * cloneValue(std::vector<char> = {}) const override;
 
   Address & setValue(const Value *) override;
 

Implementations/Jamoma/Sources/Editor/Curve.cpp

@@ -291,23 +291,6 @@ setInitialDestination(const Destination* destination)
   mInitialDestination = static_cast<Destination*>(destination->clone());
 }
 
-template <typename X, typename Y>
-vector<char> JamomaCurve<X,Y>::
-getInitialDestinationIndex() const
-{
-  return mInitialDestinationIndex;
-}
-
-template <typename X, typename Y>
-void JamomaCurve<X,Y>::
-setInitialDestinationIndex(std::initializer_list<char> index)
-{
-  mInitialDestinationIndex.clear();
-
-  for (const auto & i : index)
-    mInitialDestinationIndex.push_back(i);
-}
-
 template <typename X, typename Y>
 map<X, pair<Y, shared_ptr<CurveSegment<Y>>>> JamomaCurve<X,Y>::
 getPointsMap() const
@@ -352,7 +335,7 @@ convertToTemplateTypeValue(const Value * value, char* level) const
     {
       auto t = static_cast<const Tuple*>(value);
 
-      char index = mInitialDestinationIndex[*level];
+      char index = mInitialDestination->index[*level];
       (*level)++;
 
       return convertToTemplateTypeValue(t->value[index], level);