From 814ee14c0bd611cd14ff72eacea120cb0c1e078a Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 20 Sep 2019 04:45:17 +1000 Subject: [PATCH] minor improvements --- app/node/output/timeline/timeline.cpp | 5 +++++ app/node/output/timeline/timeline.h | 1 + app/node/output/track/track.cpp | 4 ---- app/widget/timelineview/timelineview.cpp | 8 ++------ 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/node/output/timeline/timeline.cpp b/app/node/output/timeline/timeline.cpp index 0011c221f..73de262f5 100644 --- a/app/node/output/timeline/timeline.cpp +++ b/app/node/output/timeline/timeline.cpp @@ -61,6 +61,11 @@ QString TimelineOutput::Description() return tr("Node for communicating between a Timeline panel and the node graph."); } +const rational &TimelineOutput::Timebase() +{ + return timebase_; +} + NodeInput *TimelineOutput::track_input() { return track_input_; diff --git a/app/node/output/timeline/timeline.h b/app/node/output/timeline/timeline.h index 5437dfc5d..dcea69238 100644 --- a/app/node/output/timeline/timeline.h +++ b/app/node/output/timeline/timeline.h @@ -39,6 +39,7 @@ public: virtual QString Category() override; virtual QString Description() override; + const rational& Timebase(); void SetTimebase(const rational& timebase); NodeInput* track_input(); diff --git a/app/node/output/track/track.cpp b/app/node/output/track/track.cpp index f4c5895e0..73ae473aa 100644 --- a/app/node/output/track/track.cpp +++ b/app/node/output/track/track.cpp @@ -105,7 +105,6 @@ void TrackOutput::Refresh() block_cache_ = detect_attached_blocks; Block::Refresh(); - qDebug() << "Refreshed with in point" << in().toDouble() << "(from connected block" << previous() << ")"; } const int &TrackOutput::Index() @@ -169,9 +168,6 @@ void TrackOutput::InvalidateCache(const rational &start_range, const rational &e { // We intercept IC signals from Blocks since we may be performing several options and they may over-signal if (from == previous_input() && block_invalidate_cache_stack_ == 0) { - qDebug() << "Received IC Signal:" << start_range.toDouble() << "to" << end_range.toDouble(); - qDebug() << "Limiting IC Signal To:" << qMax(start_range, rational(0)).toDouble() << "to" << qMin(end_range, in()).toDouble(); - Node::InvalidateCache(qMax(start_range, rational(0)), qMin(end_range, in()), from); } else { Node::InvalidateCache(start_range, end_range, from); diff --git a/app/widget/timelineview/timelineview.cpp b/app/widget/timelineview/timelineview.cpp index eb49a72cd..dd741bf96 100644 --- a/app/widget/timelineview/timelineview.cpp +++ b/app/widget/timelineview/timelineview.cpp @@ -174,12 +174,8 @@ void TimelineView::ConnectTimelineNode(TimelineOutput *node) timeline_node_ = node; if (timeline_node_ != nullptr) { - qDebug() << "Connecting to" << node; - - // FIXME: TEST CODE ONLY - SetTimebase(rational(1001, 30000)); - emit TimebaseChanged(rational(1001, 30000)); - // END TEST CODE + SetTimebase(timeline_node_->Timebase()); + emit TimebaseChanged(timebase_); connect(timeline_node_, SIGNAL(TimebaseChanged(const rational&)), this, SIGNAL(TimebaseChanged(const rational&))); connect(timeline_node_, SIGNAL(TimebaseChanged(const rational&)), this, SLOT(SetTimebase(const rational&)));