footageviewer: allows users to drag video or audio only

Updates drag mime data to include a variable determining which streams are
enabled and which ones aren't (a binary qint64 where the 0s are disabled
and the 1s are enabled) rather than relying solely on the stream->enabled
values which can't be modified as part of the drag process.
This commit is contained in:
itsmattkc
2020-03-23 18:55:59 +11:00
parent 3b8743a0ce
commit 9f3b9fdc70
14 changed files with 218 additions and 22 deletions
@@ -16,6 +16,8 @@
set(OLIVE_SOURCES
${OLIVE_SOURCES}
widget/playbackcontrols/dragbutton.h
widget/playbackcontrols/dragbutton.cpp
widget/playbackcontrols/playbackcontrols.h
widget/playbackcontrols/playbackcontrols.cpp
PARENT_SCOPE
@@ -0,0 +1,12 @@
#include "dragbutton.h"
DragButton::DragButton(QWidget *parent) :
QPushButton(parent)
{
}
void DragButton::mousePressEvent(QMouseEvent *event) {
QPushButton::mousePressEvent(event);
emit MousePressed();
}
+20
View File
@@ -0,0 +1,20 @@
#ifndef DRAGBUTTON_H
#define DRAGBUTTON_H
#include <QPushButton>
class DragButton : public QPushButton
{
Q_OBJECT
public:
DragButton(QWidget* parent = nullptr);
signals:
void MousePressed();
protected:
virtual void mousePressEvent(QMouseEvent* event) override;
};
#endif // DRAGBUTTON_H
@@ -37,12 +37,14 @@ PlaybackControls::PlaybackControls(QWidget *parent) :
lower_control_layout->setSpacing(0);
lower_control_layout->setMargin(0);
QSizePolicy lower_container_size_policy = QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
QSizePolicy lower_container_size_policy(QSizePolicy::Minimum, QSizePolicy::Expanding);
lower_container_size_policy.setHorizontalStretch(1);
// In the lower-left, we create a current timecode label wrapped in a QWidget for fixed sizing
lower_left_container_ = new QWidget();
lower_left_container_->setVisible(false);
lower_left_container_->setSizePolicy(lower_container_size_policy);
lower_control_layout->addWidget(lower_left_container_);
QHBoxLayout* lower_left_layout = new QHBoxLayout(lower_left_container_);
@@ -54,6 +56,12 @@ PlaybackControls::PlaybackControls(QWidget *parent) :
lower_left_layout->addWidget(cur_tc_lbl_);
lower_left_layout->addStretch();
// This is only here
QWidget* blank_widget = new QWidget();
//new QHBoxLayout(blank_widget);
blank_widget->setSizePolicy(lower_container_size_policy);
lower_control_layout->addWidget(blank_widget);
// In the lower-middle, we create playback control buttons
QWidget* lower_middle_container = new QWidget();
lower_middle_container->setSizePolicy(lower_container_size_policy);
@@ -63,8 +71,6 @@ PlaybackControls::PlaybackControls(QWidget *parent) :
lower_middle_layout->setSpacing(0);
lower_middle_layout->setMargin(0);
lower_middle_layout->addStretch();
// Go To Start Button
go_to_start_btn_ = new QPushButton();
lower_middle_layout->addWidget(go_to_start_btn_);
@@ -101,7 +107,20 @@ PlaybackControls::PlaybackControls(QWidget *parent) :
lower_middle_layout->addWidget(go_to_end_btn_);
connect(go_to_end_btn_, &QPushButton::clicked, this, &PlaybackControls::EndClicked);
lower_middle_layout->addStretch();
QWidget* av_btn_widget = new QWidget();
av_btn_widget->setSizePolicy(lower_container_size_policy);
QHBoxLayout* av_btn_layout = new QHBoxLayout(av_btn_widget);
av_btn_layout->setSpacing(0);
av_btn_layout->setMargin(0);
video_drag_btn_ = new DragButton();
connect(video_drag_btn_, &QPushButton::clicked, this, &PlaybackControls::VideoClicked);
connect(video_drag_btn_, &DragButton::MousePressed, this, &PlaybackControls::VideoPressed);
av_btn_layout->addWidget(video_drag_btn_);
audio_drag_btn_ = new DragButton();
connect(audio_drag_btn_, &QPushButton::clicked, this, &PlaybackControls::AudioClicked);
connect(audio_drag_btn_, &DragButton::MousePressed, this, &PlaybackControls::AudioPressed);
av_btn_layout->addWidget(audio_drag_btn_);
lower_control_layout->addWidget(av_btn_widget);
// The lower-right, we create another timecode label, this time to show the end timecode
lower_right_container_ = new QWidget();
@@ -121,6 +140,8 @@ PlaybackControls::PlaybackControls(QWidget *parent) :
SetTimebase(0);
SetAudioVideoDragButtonsVisible(false);
connect(Core::instance(), &Core::TimecodeDisplayChanged, this, &PlaybackControls::TimecodeChanged);
}
@@ -138,6 +159,12 @@ void PlaybackControls::SetTimebase(const rational &r)
cur_tc_lbl_->setEnabled(!r.isNull());
}
void PlaybackControls::SetAudioVideoDragButtonsVisible(bool e)
{
video_drag_btn_->setVisible(e);
audio_drag_btn_->setVisible(e);
}
void PlaybackControls::SetTime(const int64_t &r)
{
cur_tc_lbl_->SetValue(r);
@@ -184,6 +211,8 @@ void PlaybackControls::UpdateIcons()
pause_btn_->setIcon(icon::Pause);
next_frame_btn_->setIcon(icon::NextFrame);
go_to_end_btn_->setIcon(icon::GoToEnd);
video_drag_btn_->setIcon(icon::Video);
audio_drag_btn_->setIcon(icon::Audio);
}
void PlaybackControls::TimecodeChanged()
@@ -27,6 +27,7 @@
#include <QStackedWidget>
#include "common/rational.h"
#include "dragbutton.h"
#include "widget/slider/timeslider.h"
/**
@@ -47,6 +48,8 @@ public:
void SetTimebase(const rational& r);
void SetAudioVideoDragButtonsVisible(bool e);
public slots:
void SetTime(const int64_t &r);
@@ -87,6 +90,14 @@ signals:
*/
void EndClicked();
void AudioClicked();
void VideoClicked();
void AudioPressed();
void VideoPressed();
void TimeChanged(const int64_t& t);
protected:
@@ -111,6 +122,8 @@ private:
QPushButton* pause_btn_;
QPushButton* next_frame_btn_;
QPushButton* go_to_end_btn_;
DragButton* video_drag_btn_;
DragButton* audio_drag_btn_;
QStackedWidget* playpause_stack_;