began some rewrites to timeline drawing

app/node/block/block.cpp

@@ -29,7 +29,10 @@ namespace olive {
 
 Block::Block() :
   previous_(nullptr),
-  next_(nullptr)
+  next_(nullptr),
+  track_(nullptr),
+  in_transition_(nullptr),
+  out_transition_(nullptr)
 {
   length_input_ = new NodeInput(this, QStringLiteral("length_in"), NodeValue::kRational);
   length_input_->SetConnectable(false);
@@ -59,26 +62,6 @@ QVector<Node::CategoryID> Block::Category() const
   return {kCategoryTimeline};
 }
 
-const rational &Block::in() const
-{
-  return in_point_;
-}
-
-const rational &Block::out() const
-{
-  return out_point_;
-}
-
-void Block::set_in(const rational &in)
-{
-  in_point_ = in;
-}
-
-void Block::set_out(const rational &out)
-{
-  out_point_ = out;
-}
-
 rational Block::length() const
 {
   return length_input_->GetStandardValue().value<rational>();
@@ -110,31 +93,6 @@ void Block::set_length_and_media_in(const rational &length)
   set_length_internal(length);
 }
 
-TimeRange Block::range() const
-{
-  return TimeRange(in(), out());
-}
-
-Block *Block::previous()
-{
-  return previous_;
-}
-
-Block *Block::next()
-{
-  return next_;
-}
-
-void Block::set_previous(Block *previous)
-{
-  previous_ = previous;
-}
-
-void Block::set_next(Block *next)
-{
-  next_ = next;
-}
-
 rational Block::media_in() const
 {
   return media_in_input_->GetStandardValue().value<rational>();
@@ -309,16 +267,6 @@ bool Block::AreLinked(Block *a, Block *b)
   return a->linked_clips_.contains(b);
 }
 
-const QVector<Block*> &Block::linked_clips()
-{
-  return linked_clips_;
-}
-
-bool Block::HasLinks()
-{
-  return !linked_clips_.isEmpty();
-}
-
 void Block::Retranslate()
 {
   Node::Retranslate();
@@ -329,21 +277,6 @@ void Block::Retranslate()
   speed_input_->set_name(tr("Speed"));
 }
 
-NodeInput *Block::length_input() const
-{
-  return length_input_;
-}
-
-NodeInput *Block::media_in_input() const
-{
-  return media_in_input_;
-}
-
-NodeInput *Block::speed_input() const
-{
-  return speed_input_;
-}
-
 void Block::Hash(QCryptographicHash &, const rational &) const
 {
   // A block does nothing by default, so we hash nothing

app/node/block/block.h

@@ -26,6 +26,8 @@
 
 namespace olive {
 
+class TransitionBlock;
+
 /**
  * @brief A Node that represents a block of time, also displayable on a Timeline
  */
@@ -45,25 +47,68 @@ public:
 
   virtual QVector<CategoryID> Category() const override;
 
-  const rational& in() const;
-  const rational& out() const;
-  void set_in(const rational& in);
-  void set_out(const rational& out);
+  const rational& in() const
+  {
+    return in_point_;
+  }
+
+  const rational& out() const
+  {
+    return out_point_;
+  }
+
+  void set_in(const rational& in)
+  {
+    in_point_ = in;
+  }
+
+  void set_out(const rational& out)
+  {
+    out_point_ = out;
+  }
 
   rational length() const;
   void set_length_and_media_out(const rational &length);
   void set_length_and_media_in(const rational &length);
 
-  TimeRange range() const;
+  TimeRange range() const
+  {
+    return TimeRange(in(), out());
+  }
 
-  Block* previous();
-  Block* next();
-  void set_previous(Block* previous);
-  void set_next(Block* next);
+  Block* previous() const
+  {
+    return previous_;
+  }
+
+  Block* next() const
+  {
+    return next_;
+  }
+
+  void set_previous(Block* previous)
+  {
+    previous_ = previous;
+  }
+
+  void set_next(Block* next)
+  {
+    next_ = next;
+  }
 
   rational media_in() const;
   void set_media_in(const rational& media_in);
 
+  Track* track() const
+  {
+    return track_;
+  }
+
+  void set_track(Track* track)
+  {
+    track_ = track;
+  }
+
   bool is_enabled() const;
   void set_enabled(bool e);
 
@@ -72,14 +117,53 @@ public:
   static bool Unlink(Block* a, Block* b);
   static void Unlink(const QList<Block*>& blocks);
   static bool AreLinked(Block* a, Block* b);
-  const QVector<Block*>& linked_clips();
-  bool HasLinks();
+
+  const QVector<Block*>& linked_clips() const
+  {
+    return linked_clips_;
+  }
+
+  bool HasLinks() const
+  {
+    return !linked_clips_.isEmpty();
+  }
 
   virtual void Retranslate() override;
 
-  NodeInput* length_input() const;
-  NodeInput* media_in_input() const;
-  NodeInput* speed_input() const;
+  NodeInput* length_input() const
+  {
+    return length_input_;
+  }
+
+  NodeInput* media_in_input() const
+  {
+    return media_in_input_;
+  }
+
+  NodeInput* speed_input() const
+  {
+    return speed_input_;
+  }
+
+  TransitionBlock* in_transition()
+  {
+    return in_transition_;
+  }
+
+  void set_in_transition(TransitionBlock* t)
+  {
+    in_transition_ = t;
+  }
+
+  TransitionBlock* out_transition()
+  {
+    return out_transition_;
+  }
+
+  void set_out_transition(TransitionBlock* t)
+  {
+    out_transition_ = t;
+  }
 
   virtual void Hash(QCryptographicHash &hash, const rational &time) const override;
 
@@ -116,6 +200,10 @@ private:
 
   rational in_point_;
   rational out_point_;
+  Track* track_;
+
+  TransitionBlock* in_transition_;
+  TransitionBlock* out_transition_;
 
   QVector<Block*> linked_clips_;
 

app/node/block/transition/transition.cpp

@@ -172,23 +172,43 @@ void TransitionBlock::InsertTransitionTimes(AcceleratedJob *job, const double &t
 void TransitionBlock::OutBlockConnected(Node *node)
 {
   // If node is not a block, this will just be null
-  connected_out_block_ = dynamic_cast<Block*>(node);
+  if ((connected_out_block_ = dynamic_cast<Block*>(node))) {
+
+    Q_ASSERT(connected_out_block_->type() != Block::kTransition
+        && !connected_out_block_->out_transition()
+        && connected_out_block_ == this->previous());
+
+    connected_out_block_->set_out_transition(this);
+  }
 }
 
 void TransitionBlock::OutBlockDisconnected()
 {
-  connected_out_block_ = nullptr;
+  if (connected_out_block_) {
+    connected_out_block_->set_in_transition(nullptr);
+    connected_out_block_ = nullptr;
+  }
 }
 
 void TransitionBlock::InBlockConnected(Node *node)
 {
   // If node is not a block, this will just be null
-  connected_in_block_ = dynamic_cast<Block*>(node);
+  if ((connected_in_block_ = dynamic_cast<Block*>(node))) {
+
+    Q_ASSERT(connected_in_block_->type() != Block::kTransition
+        && !connected_in_block_->in_transition()
+        && connected_in_block_ == this->next());
+
+    connected_in_block_->set_in_transition(this);
+  }
 }
 
 void TransitionBlock::InBlockDisconnected()
 {
-  connected_in_block_ = nullptr;
+  if (connected_in_block_) {
+    connected_in_block_->set_in_transition(nullptr);
+    connected_in_block_ = nullptr;
+  }
 }
 
 NodeValueTable TransitionBlock::Value(NodeValueDatabase &value) const
@@ -251,33 +271,6 @@ NodeValueTable TransitionBlock::Value(NodeValueDatabase &value) const
   return table;
 }
 
-TransitionBlock *GetBlockTransitionInternal(Block *block, Timeline::MovementMode mode)
-{
-  // See if this block outputs to a transition
-  foreach (const NodeConnectable::InputConnection& conn, block->edges()) {
-    TransitionBlock* transition = dynamic_cast<TransitionBlock*>(conn.input->parent());
-
-    if (transition) {
-      if ((mode == Timeline::kTrimIn && conn.input == transition->in_block_input())
-          || (mode == Timeline::kTrimOut && conn.input == transition->out_block_input())) {
-        return transition;
-      }
-    }
-  }
-
-  return nullptr;
-}
-
-TransitionBlock *TransitionBlock::GetBlockInTransition(Block *block)
-{
-  return GetBlockTransitionInternal(block, Timeline::kTrimIn);
-}
-
-TransitionBlock *TransitionBlock::GetBlockOutTransition(Block *block)
-{
-  return GetBlockTransitionInternal(block, Timeline::kTrimOut);
-}
-
 void TransitionBlock::ShaderJobEvent(NodeValueDatabase &value, ShaderJob &job) const
 {
   Q_UNUSED(value)

app/node/block/transition/transition.h

@@ -52,10 +52,6 @@ public:
 
   virtual NodeValueTable Value(NodeValueDatabase &value) const override;
 
-  static TransitionBlock* GetBlockInTransition(Block* block);
-
-  static TransitionBlock* GetBlockOutTransition(Block* block);
-
 protected:
   virtual void ShaderJobEvent(NodeValueDatabase &value, ShaderJob& job) const;