use strings to connect nodes

This makes the node system somewhat more high-level with the intent of making
working with them far more flexible and stable. By making the architecture more
abstracted, it becomes far less rigid which should allow us to do even more
with it and make it much less crash prone.

app/node/audio/pan/pan.cpp

@@ -24,14 +24,17 @@
 
 namespace olive {
 
+const QString PanNode::kSamplesInput = QStringLiteral("samples_in");
+const QString PanNode::kPanningInput = QStringLiteral("panning_in");
+
 PanNode::PanNode()
 {
-  samples_input_ = new NodeInput(this, QStringLiteral("samples_in"), NodeValue::kSamples);
+  AddInput(kSamplesInput, NodeValue::kSamples, InputFlags(kInputFlagNotKeyframable));
 
-  panning_input_ = new NodeInput(this, QStringLiteral("panning_in"), NodeValue::kFloat, 0.0);
-  panning_input_->setProperty("min", -1.0);
-  panning_input_->setProperty("max", 1.0);
-  panning_input_->setProperty("view", FloatSlider::kPercentage);
+  AddInput(kPanningInput, NodeValue::kFloat, 0.0);
+  SetInputProperty(kPanningInput, QStringLiteral("min"), -1.0);
+  SetInputProperty(kPanningInput, QStringLiteral("max"), 1.0);
+  SetInputProperty(kPanningInput, QStringLiteral("view"), FloatSlider::kPercentage);
 }
 
 Node *PanNode::copy() const
@@ -59,18 +62,20 @@ QString PanNode::Description() const
   return tr("Adjust the stereo panning of an audio source.");
 }
 
-NodeValueTable PanNode::Value(NodeValueDatabase &value) const
+NodeValueTable PanNode::Value(const QString &output, NodeValueDatabase &value) const
 {
+  Q_UNUSED(output)
+
   // Create a sample job
-  SampleJob job(samples_input_, value);
-  job.InsertValue(panning_input_, value);
+  SampleJob job(kSamplesInput, value);
+  job.InsertValue(this, kPanningInput, value);
 
   // Push it to our table
   NodeValueTable table = value.Merge();
 
   if (job.HasSamples()) {
-    float pan_volume = job.GetValue(panning_input_).data().toFloat();
-    if (panning_input_->IsStatic()) {
+    float pan_volume = job.GetValue(kPanningInput).data().toFloat();
+    if (IsInputStatic(kPanningInput)) {
       if (!qIsNull(pan_volume) && job.samples()->audio_params().channel_count() == 2) {
         if (pan_volume > 0) {
           job.samples()->transform_volume_for_channel(0, 1.0f - pan_volume);
@@ -95,7 +100,7 @@ void PanNode::ProcessSamples(NodeValueDatabase &values, const SampleBufferPtr in
     return;
   }
 
-  float pan_val = values[panning_input_].Get(NodeValue::kFloat).toFloat();
+  float pan_val = values[kPanningInput].Get(NodeValue::kFloat).toFloat();
 
   for (int i=0;i<input->audio_params().channel_count();i++) {
     output->data()[i][index] = input->data()[i][index];
@@ -110,8 +115,8 @@ void PanNode::ProcessSamples(NodeValueDatabase &values, const SampleBufferPtr in
 
 void PanNode::Retranslate()
 {
-  samples_input_->set_name(tr("Samples"));
-  panning_input_->set_name(tr("Pan"));
+  SetInputName(kSamplesInput, tr("Samples"));
+  SetInputName(kPanningInput, tr("Pan"));
 }
 
 }

app/node/audio/pan/pan.h

@@ -38,12 +38,15 @@ public:
   virtual QVector<CategoryID> Category() const override;
   virtual QString Description() const override;
 
-  virtual NodeValueTable Value(NodeValueDatabase &value) const override;
+  virtual NodeValueTable Value(const QString& output, NodeValueDatabase &value) const override;
 
   virtual void ProcessSamples(NodeValueDatabase &values, const SampleBufferPtr input, SampleBufferPtr output, int index) const override;
 
   virtual void Retranslate() override;
 
+  static const QString kSamplesInput;
+  static const QString kPanningInput;
+
 private:
   NodeInput* samples_input_;
   NodeInput* panning_input_;

app/node/audio/volume/volume.cpp

@@ -24,14 +24,16 @@
 
 namespace olive {
 
+const QString VolumeNode::kSamplesInput = QStringLiteral("samples_in");
+const QString VolumeNode::kVolumeInput = QStringLiteral("volume_in");
+
 VolumeNode::VolumeNode()
 {
-  samples_input_ = new NodeInput(this, QStringLiteral("samples_in"), NodeValue::kSamples);
-  samples_input_->SetKeyframable(false);
+  AddInput(kSamplesInput, NodeValue::kSamples, InputFlags(kInputFlagNotKeyframable));
 
-  volume_input_ = new NodeInput(this, QStringLiteral("volume_in"), NodeValue::kFloat, 1.0);
-  volume_input_->setProperty("min", 0.0);
-  volume_input_->setProperty("view", FloatSlider::kDecibel);
+  AddInput(kVolumeInput, NodeValue::kFloat, 1.0);
+  SetInputProperty(kVolumeInput, QStringLiteral("min"), 0.0);
+  SetInputProperty(kVolumeInput, QStringLiteral("view"), FloatSlider::kDecibel);
 }
 
 Node *VolumeNode::copy() const
@@ -59,26 +61,28 @@ QString VolumeNode::Description() const
   return tr("Adjusts the volume of an audio source.");
 }
 
-NodeValueTable VolumeNode::Value(NodeValueDatabase &value) const
+NodeValueTable VolumeNode::Value(const QString &output, NodeValueDatabase &value) const
 {
+  Q_UNUSED(output)
+
   return ValueInternal(value,
                        kOpMultiply,
                        kPairSampleNumber,
-                       samples_input_,
-                       value[samples_input_].TakeWithMeta(NodeValue::kSamples),
-                       volume_input_,
-                       value[volume_input_].TakeWithMeta(NodeValue::kFloat));
+                       kSamplesInput,
+                       value[kSamplesInput].TakeWithMeta(NodeValue::kSamples),
+                       kVolumeInput,
+                       value[kVolumeInput].TakeWithMeta(NodeValue::kFloat));
 }
 
 void VolumeNode::ProcessSamples(NodeValueDatabase &values, const SampleBufferPtr input, SampleBufferPtr output, int index) const
 {
-  return ProcessSamplesInternal(values, kOpMultiply, samples_input_, volume_input_, input, output, index);
+  return ProcessSamplesInternal(values, kOpMultiply, kSamplesInput, kVolumeInput, input, output, index);
 }
 
 void VolumeNode::Retranslate()
 {
-  samples_input_->set_name(tr("Samples"));
-  volume_input_->set_name(tr("Volume"));
+  SetInputName(kSamplesInput, tr("Samples"));
+  SetInputName(kVolumeInput, tr("Volume"));
 }
 
 }

app/node/audio/volume/volume.h

@@ -38,20 +38,14 @@ public:
   virtual QVector<CategoryID> Category() const override;
   virtual QString Description() const override;
 
-  virtual NodeValueTable Value(NodeValueDatabase &value) const override;
+  virtual NodeValueTable Value(const QString& output, NodeValueDatabase &value) const override;
 
   virtual void ProcessSamples(NodeValueDatabase &values, const SampleBufferPtr input, SampleBufferPtr output, int index) const override;
 
   virtual void Retranslate() override;
 
-  NodeInput* samples_input() const
-  {
-    return samples_input_;
-  }
-
-private:
-  NodeInput* samples_input_;
-  NodeInput* volume_input_;
+  static const QString kSamplesInput;
+  static const QString kVolumeInput;
 
 };