reworked timeline elements

app/node/block/block.cpp

@@ -24,7 +24,6 @@
 
 #include "node/output/track/track.h"
 #include "transition/transition.h"
-#include "widget/slider/floatslider.h"
 #include "widget/slider/rationalslider.h"
 
 namespace olive {
@@ -32,18 +31,13 @@ namespace olive {
 #define super Node
 
 const QString Block::kLengthInput = QStringLiteral("length_in");
-const QString Block::kMediaInInput = QStringLiteral("media_in_in");
 const QString Block::kEnabledInput = QStringLiteral("enabled_in");
-const QString Block::kSpeedInput = QStringLiteral("speed_in");
-const QString Block::kReverseInput = QStringLiteral("reverse_in");
 
 Block::Block() :
   previous_(nullptr),
   next_(nullptr),
   track_(nullptr),
-  index_(-1),
-  in_transition_(nullptr),
-  out_transition_(nullptr)
+  index_(-1)
 {
   AddInput(kLengthInput, NodeValue::kRational, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable));
   SetInputProperty(kLengthInput, QStringLiteral("min"), QVariant::fromValue(rational(0, 1)));
@@ -51,21 +45,8 @@ Block::Block() :
   SetInputProperty(kLengthInput, QStringLiteral("viewlock"), true);
   IgnoreHashingFrom(kLengthInput);
 
-  AddInput(kMediaInInput, NodeValue::kRational, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable));
-  SetInputProperty(kMediaInInput, QStringLiteral("view"), RationalSlider::kTime);
-  SetInputProperty(kMediaInInput, QStringLiteral("viewlock"), true);
-  IgnoreHashingFrom(kMediaInInput);
-
   AddInput(kEnabledInput, NodeValue::kBoolean, true, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable));
 
-  AddInput(kSpeedInput, NodeValue::kFloat, 1.0, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable));
-  SetInputProperty(kSpeedInput, QStringLiteral("view"), FloatSlider::kPercentage);
-  SetInputProperty(kSpeedInput, QStringLiteral("min"), 0.0);
-  IgnoreHashingFrom(kSpeedInput);
-
-  AddInput(kReverseInput, NodeValue::kBoolean, false, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable));
-  IgnoreHashingFrom(kReverseInput);
-
   // A block's length must be greater than 0
   set_length_and_media_out(1);
 }
@@ -82,47 +63,23 @@ rational Block::length() const
 
 void Block::set_length_and_media_out(const rational &length)
 {
-  Q_ASSERT(length > 0);
-
   if (length == this->length()) {
     return;
   }
 
-  if (reverse()) {
-    // Calculate media_in adjustment
-    set_media_in(SequenceToMediaTime(length - this->length(), true));
-  }
-
   set_length_internal(length);
 }
 
 void Block::set_length_and_media_in(const rational &length)
 {
-  Q_ASSERT(length > 0);
-
   if (length == this->length()) {
     return;
   }
 
-  if (!reverse()) {
-    // Calculate media_in adjustment
-    set_media_in(SequenceToMediaTime(this->length() - length));
-  }
-
   // Set the length without setting media out
   set_length_internal(length);
 }
 
-rational Block::media_in() const
-{
-  return GetStandardValue(kMediaInInput).value<rational>();
-}
-
-void Block::set_media_in(const rational &media_in)
-{
-  SetStandardValue(kMediaInInput, QVariant::fromValue(media_in));
-}
-
 bool Block::is_enabled() const
 {
   return GetStandardValue(kEnabledInput).toBool();
@@ -135,65 +92,9 @@ void Block::set_enabled(bool e)
   emit EnabledChanged();
 }
 
-rational Block::SequenceToMediaTime(const rational &sequence_time, bool ignore_reverse) const
-{
-  // These constants are not considered "values" per se, so we don't modify them
-  if (sequence_time == RATIONAL_MIN || sequence_time == RATIONAL_MAX) {
-    return sequence_time;
-  }
-
-  rational local_time = sequence_time;
-
-  double speed_value = speed();
-
-  if (qIsNull(speed_value)) {
-    // Effectively holds the frame at the in point
-    local_time = 0;
-  } else if (!qFuzzyCompare(speed_value, 1.0)) {
-    // Multiply time
-    local_time = rational::fromDouble(local_time.toDouble() * speed_value);
-  }
-
-  rational media_time = local_time + media_in();
-
-  if (reverse() && !ignore_reverse) {
-    media_time = length() - media_time;
-  }
-
-  return media_time;
-}
-
-rational Block::MediaToSequenceTime(const rational &media_time) const
-{
-  // These constants are not considered "values" per se, so we don't modify them
-  if (media_time == RATIONAL_MIN || media_time == RATIONAL_MAX) {
-    return media_time;
-  }
-
-  rational sequence_time = media_time;
-
-  if (reverse()) {
-    sequence_time = length() - sequence_time;
-  }
-
-  sequence_time -= media_in();
-
-  double speed_value = speed();
-
-  if (qIsNull(speed_value)) {
-    // Effectively holds the frame at the in point, also prevents divide by zero
-    sequence_time = 0;
-  } else if (!qFuzzyCompare(speed_value, 1.0)) {
-    // Multiply time
-    sequence_time = rational::fromDouble(sequence_time.toDouble() / speed_value);
-  }
-
-  return sequence_time;
-}
-
 void Block::InputValueChangedEvent(const QString &input, int element)
 {
-  Q_UNUSED(element)
+  super::InputValueChangedEvent(input, element);
 
   if (input == kLengthInput) {
     emit LengthChanged();
@@ -202,19 +103,6 @@ void Block::InputValueChangedEvent(const QString &input, int element)
   }
 }
 
-void Block::LinkChangeEvent()
-{
-  block_links_.clear();
-
-  foreach (Node* n, links()) {
-    Block* b = dynamic_cast<Block*>(n);
-
-    if (b) {
-      block_links_.append(b);
-    }
-  }
-}
-
 bool Block::HashPassthrough(const QString &input, const QString &output, QCryptographicHash &hash, const rational &time, const VideoParams &video_params) const
 {
   if (IsInputConnected(input)) {
@@ -239,10 +127,7 @@ void Block::Retranslate()
   super::Retranslate();
 
   SetInputName(kLengthInput, tr("Length"));
-  SetInputName(kMediaInInput, tr("Media In"));
   SetInputName(kEnabledInput, tr("Enabled"));
-  SetInputName(kSpeedInput, tr("Speed"));
-  SetInputName(kReverseInput, tr("Reverse"));
 }
 
 void Block::Hash(const QString &, QCryptographicHash &, const rational &, const VideoParams &) const