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

footagepropertiesdialog: show colorspace and alpha association properties on

Browse Source 
image streams
This commit is contained in:
itsmattkc
2020-02-25 14:59:48 +11:00
parent faffbb0f38
commit 8d7b94658b
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/dialog/footageproperties/footageproperties.cpp
+2 -1
View File
@@ -72,7 +72,8 @@ FootagePropertiesDialog::FootagePropertiesDialog(QWidget *parent, Footage *foota
switch (stream->type()) {
case Stream::kVideo:
stacked_widget_->addWidget(new VideoStreamProperties(std::static_pointer_cast<VideoStream>(stream)));
case Stream::kImage:
stacked_widget_->addWidget(new VideoStreamProperties(std::static_pointer_cast<ImageStream>(stream)));
break;
case Stream::kAudio:
stacked_widget_->addWidget(new AudioStreamProperties(std::static_pointer_cast<AudioStream>(stream)));
app/dialog/footageproperties/streamproperties/videostreamproperties.cpp
+2 -2
View File
@@ -29,7 +29,7 @@ namespace OCIO = OCIO_NAMESPACE::v1;
#include "project/project.h"
#include "undo/undostack.h"
VideoStreamProperties::VideoStreamProperties(VideoStreamPtr stream) :
VideoStreamProperties::VideoStreamProperties(ImageStreamPtr stream) :
stream_(stream)
{
QGridLayout* video_layout = new QGridLayout(this);
@@ -67,7 +67,7 @@ void VideoStreamProperties::Accept(QUndoCommand *parent)
}
}
VideoStreamProperties::VideoStreamChangeCommand::VideoStreamChangeCommand(VideoStreamPtr stream,
VideoStreamProperties::VideoStreamChangeCommand::VideoStreamChangeCommand(ImageStreamPtr stream,
bool premultiplied,
QString colorspace,
QUndoCommand *parent) :
app/dialog/footageproperties/streamproperties/videostreamproperties.h
+4 -4
View File
@@ -31,7 +31,7 @@
class VideoStreamProperties : public StreamProperties
{
public:
VideoStreamProperties(VideoStreamPtr stream);
VideoStreamProperties(ImageStreamPtr stream);
virtual void Accept(QUndoCommand* parent) override;
@@ -39,7 +39,7 @@ private:
/**
* @brief Attached video stream
*/
VideoStreamPtr stream_;
ImageStreamPtr stream_;
/**
* @brief Setting for associated/premultiplied alpha
@@ -53,7 +53,7 @@ private:
class VideoStreamChangeCommand : public QUndoCommand {
public:
VideoStreamChangeCommand(VideoStreamPtr stream,
VideoStreamChangeCommand(ImageStreamPtr stream,
bool premultiplied,
QString colorspace,
QUndoCommand* parent = nullptr);
@@ -62,7 +62,7 @@ private:
virtual void undo() override;
private:
VideoStreamPtr stream_;
ImageStreamPtr stream_;
bool new_premultiplied_;
QString new_colorspace_;