merged video and audio nodes into a single media node

They performed exactly the same function so I don't think we need the clutter.

Also bumped the project version, but old projects are automatically converted.
This commit is contained in:
itsmattkc
2020-11-18 13:48:14 +11:00
parent aeb7bc02b6
commit b3c3fe0fc8
28 changed files with 62 additions and 306 deletions
+3 -4
View File
@@ -31,8 +31,7 @@
#include "dialog/sequence/sequence.h"
#include "node/audio/volume/volume.h"
#include "node/generator/matrix/matrix.h"
#include "node/input/media/audio/audio.h"
#include "node/input/media/video/video.h"
#include "node/input/media/media.h"
#include "node/math/math/math.h"
#include "project/item/sequence/sequence.h"
#include "widget/nodeview/nodeviewundo.h"
@@ -416,7 +415,7 @@ void ImportTool::DropGhosts(bool insert)
switch (footage_stream->type()) {
case Stream::kVideo:
{
VideoInput* video_input = new VideoInput();
MediaInput* video_input = new MediaInput();
video_input->SetStream(footage_stream);
new NodeAddCommand(dst_graph, video_input, command);
@@ -438,7 +437,7 @@ void ImportTool::DropGhosts(bool insert)
}
case Stream::kAudio:
{
AudioInput* audio_input = new AudioInput();
MediaInput* audio_input = new MediaInput();
audio_input->SetStream(footage_stream);
new NodeAddCommand(dst_graph, audio_input, command);
+2 -2
View File
@@ -32,10 +32,10 @@ FootageViewerWidget::FootageViewerWidget(QWidget *parent) :
ViewerWidget(parent),
footage_(nullptr)
{
video_node_ = new VideoInput();
video_node_ = new MediaInput();
sequence_.AddNode(video_node_);
audio_node_ = new AudioInput();
audio_node_ = new MediaInput();
sequence_.AddNode(audio_node_);
connect(display_widget(), &ViewerDisplayWidget::DragStarted, this, &FootageViewerWidget::StartFootageDrag);
+3 -4
View File
@@ -21,8 +21,7 @@
#ifndef FOOTAGEVIEWERWIDGET_H
#define FOOTAGEVIEWERWIDGET_H
#include "node/input/media/audio/audio.h"
#include "node/input/media/video/video.h"
#include "node/input/media/media.h"
#include "node/output/viewer/viewer.h"
#include "viewer.h"
@@ -49,9 +48,9 @@ private:
Sequence sequence_;
VideoInput* video_node_;
MediaInput* video_node_;
AudioInput* audio_node_;
MediaInput* audio_node_;
QHash<Footage*, int64_t> cached_timestamps_;