oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix connections for new tracktype namespace

Browse Source
This commit is contained in:
itsmattkc
2020-01-06 15:43:21 +11:00
parent 7bf2422c44
commit 402f031be2
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/viewer/viewer.cpp
+9 -9
View File
@@ -51,28 +51,28 @@ ViewerWidget::ViewerWidget(QWidget *parent) :
// Create time ruler
ruler_ = new TimeRuler(false, true);
layout->addWidget(ruler_);
connect(ruler_, SIGNAL(TimeChanged(int64_t)), this, SLOT(RulerTimeChange(int64_t)));
connect(ruler_, &TimeRuler::TimeChanged, this, &ViewerWidget::RulerTimeChange);
// Create scrollbar
scrollbar_ = new QScrollBar(Qt::Horizontal);
layout->addWidget(scrollbar_);
connect(scrollbar_, SIGNAL(valueChanged(int)), ruler_, SLOT(SetScroll(int)));
connect(scrollbar_, &QScrollBar::valueChanged, ruler_, &TimeRuler::SetScroll);
scrollbar_->setPageStep(ruler_->width());
// Create lower controls
controls_ = new PlaybackControls();
controls_->SetTimecodeEnabled(true);
controls_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
connect(controls_, SIGNAL(PlayClicked()), this, SLOT(Play()));
connect(controls_, SIGNAL(PauseClicked()), this, SLOT(Pause()));
connect(controls_, SIGNAL(PrevFrameClicked()), this, SLOT(PrevFrame()));
connect(controls_, SIGNAL(NextFrameClicked()), this, SLOT(NextFrame()));
connect(controls_, SIGNAL(BeginClicked()), this, SLOT(GoToStart()));
connect(controls_, SIGNAL(EndClicked()), this, SLOT(GoToEnd()));
connect(controls_, &PlaybackControls::PlayClicked, this, &ViewerWidget::Play);
connect(controls_, &PlaybackControls::PauseClicked, this, &ViewerWidget::Pause);
connect(controls_, &PlaybackControls::PrevFrameClicked, this, &ViewerWidget::PrevFrame);
connect(controls_, &PlaybackControls::NextFrameClicked, this, &ViewerWidget::NextFrame);
connect(controls_, &PlaybackControls::BeginClicked, this, &ViewerWidget::GoToStart);
connect(controls_, &PlaybackControls::EndClicked, this, &ViewerWidget::GoToEnd);
layout->addWidget(controls_);
// Connect timer
connect(&playback_timer_, SIGNAL(timeout()), this, SLOT(PlaybackTimerUpdate()));
connect(&playback_timer_, &QTimer::timeout, this, &ViewerWidget::PlaybackTimerUpdate);
// FIXME: Magic number
ruler_->SetScale(48.0);