fixed transition bugs

Fixes #1522

app/node/block/transition/transition.cpp

@@ -24,6 +24,8 @@
 
 namespace olive {
 
+#define super Block
+
 const QString TransitionBlock::kOutBlockInput = QStringLiteral("out_block_in");
 const QString TransitionBlock::kInBlockInput = QStringLiteral("in_block_in");
 const QString TransitionBlock::kCurveInput = QStringLiteral("curve_in");
@@ -41,7 +43,7 @@ TransitionBlock::TransitionBlock() :
 
 void TransitionBlock::Retranslate()
 {
-  Block::Retranslate();
+  super::Retranslate();
 
   SetInputName(kOutBlockInput, tr("From"));
   SetInputName(kInBlockInput, tr("To"));
@@ -154,15 +156,9 @@ NodeValueTable TransitionBlock::Value(const QString &output, NodeValueDatabase &
 {
   Q_UNUSED(output)
 
-  NodeValue::Type data_type;
-
-  if (IsInputConnected(kOutBlockInput)) {
-    data_type = value[kOutBlockInput].GetWithMeta(NodeValue::kBuffer).type();
-  } else if (IsInputConnected(kInBlockInput)) {
-    data_type = value[kInBlockInput].GetWithMeta(NodeValue::kBuffer).type();
-  } else {
-    data_type = NodeValue::kNone;
-  }
+  NodeValue out_buffer = value[kOutBlockInput].TakeWithMeta(NodeValue::kBuffer);
+  NodeValue in_buffer = value[kInBlockInput].TakeWithMeta(NodeValue::kBuffer);
+  NodeValue::Type data_type = (out_buffer.type() != NodeValue::kNone) ? out_buffer.type() : in_buffer.type();
 
   NodeValue::Type job_type = NodeValue::kNone;
   QVariant push_job;
@@ -171,8 +167,14 @@ NodeValueTable TransitionBlock::Value(const QString &output, NodeValueDatabase &
     // This must be a visual transition
     ShaderJob job;
 
-    job.InsertValue(this, kOutBlockInput, value);
-    job.InsertValue(this, kInBlockInput, value);
+    if (out_buffer.type() != NodeValue::kNone) {
+      job.InsertValue(kOutBlockInput, out_buffer);
+    }
+
+    if (in_buffer.type() != NodeValue::kNone) {
+      job.InsertValue(kInBlockInput, in_buffer);
+    }
+
     job.InsertValue(this, kCurveInput, value);
 
     double time = value[QStringLiteral("global")].Get(NodeValue::kFloat, QStringLiteral("time_in")).toDouble();
@@ -184,8 +186,8 @@ NodeValueTable TransitionBlock::Value(const QString &output, NodeValueDatabase &
     push_job = QVariant::fromValue(job);
   } else if (data_type == NodeValue::kSamples) {
     // This must be an audio transition
-    SampleBufferPtr from_samples = value[kOutBlockInput].Take(NodeValue::kSamples).value<SampleBufferPtr>();
-    SampleBufferPtr to_samples = value[kInBlockInput].Take(NodeValue::kSamples).value<SampleBufferPtr>();
+    SampleBufferPtr from_samples = out_buffer.data().value<SampleBufferPtr>();
+    SampleBufferPtr to_samples = in_buffer.data().value<SampleBufferPtr>();
 
     if (from_samples || to_samples) {
       double time_in = value[QStringLiteral("global")].Get(NodeValue::kFloat, QStringLiteral("time_in")).toDouble();
@@ -277,4 +279,28 @@ void TransitionBlock::InputDisconnectedEvent(const QString &input, int element,
   }
 }
 
+TimeRange TransitionBlock::InputTimeAdjustment(const QString &input, int element, const TimeRange &input_time) const
+{
+  if (input == kInBlockInput || input == kOutBlockInput) {
+    Block* block = dynamic_cast<Block*>(GetConnectedNode(input));
+    if (block) {
+      return input_time + in() - block->in();
+    }
+  }
+
+  return super::InputTimeAdjustment(input, element, input_time);
+}
+
+TimeRange TransitionBlock::OutputTimeAdjustment(const QString &input, int element, const TimeRange &input_time) const
+{
+  if (input == kInBlockInput || input == kOutBlockInput) {
+    Block* block = dynamic_cast<Block*>(GetConnectedNode(input));
+    if (block) {
+      return input_time + block->in() - in();
+    }
+  }
+
+  return super::OutputTimeAdjustment(input, element, input_time);
+}
+
 }

app/node/block/transition/transition.h

@@ -64,6 +64,10 @@ protected:
 
   virtual void InputDisconnectedEvent(const QString& input, int element, const NodeOutput& output) override;
 
+  virtual TimeRange InputTimeAdjustment(const QString& input, int element, const TimeRange& input_time) const override;
+
+  virtual TimeRange OutputTimeAdjustment(const QString& input, int element, const TimeRange& input_time) const override;
+
 private:
   enum CurveType {
     kLinear,

app/widget/timelinewidget/view/timelineview.cpp

@@ -406,13 +406,15 @@ void TimelineView::DrawBlocks(QPainter *painter, bool foreground)
         if (foreground) {
           painter->setBrush(Qt::NoBrush);
 
+          QString using_label = block->GetLabel().isEmpty() ? block->Name() : block->GetLabel();
+
           QRectF text_rect = r.adjusted(text_padding, text_padding, -text_padding, -text_padding);
           painter->setPen(block->is_enabled() ? ColorCoding::GetUISelectorColor(block->color()) : Qt::lightGray);
-          painter->drawText(text_rect, Qt::AlignLeft | Qt::AlignTop, block->GetLabel());
+          painter->drawText(text_rect, Qt::AlignLeft | Qt::AlignTop, using_label);
 
           if (block->HasLinks()) {
             int text_width = qMin(qRound(text_rect.width()),
-                                  QtUtils::QFontMetricsWidth(fm, block->GetLabel()));
+                                  QtUtils::QFontMetricsWidth(fm, using_label));
 
             int underline_y = text_rect.y() + text_height;
 
@@ -439,6 +441,23 @@ void TimelineView::DrawBlocks(QPainter *painter, bool foreground)
             painter->setPen(shadow_color);
             AudioVisualWaveform::DrawWaveform(painter, waveform_rect, this->GetScale(), track->waveform(), SceneToTime(block_left));
           }
+
+          // For transitions, show lines representing a transition
+          TransitionBlock* transition = dynamic_cast<TransitionBlock*>(block);
+          if (transition) {
+            QVector<QLineF> lines;
+
+            if (transition->connected_in_block()) {
+              lines.append(QLineF(r.bottomLeft(), r.topRight()));
+            }
+
+            if (transition->connected_out_block()) {
+              lines.append(QLineF(r.topLeft(), r.bottomRight()));
+            }
+
+            painter->setPen(shadow_color);
+            painter->drawLines(lines);
+          }
         }
 
       }