moved various classes from root to common folder
This commit is contained in:
+1
-5
@@ -16,16 +16,12 @@
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
clamp.h
|
||||
core.h
|
||||
core.cpp
|
||||
lerp.h
|
||||
main.cpp
|
||||
rational.h
|
||||
rational.cpp
|
||||
qobjectlistcast.h
|
||||
)
|
||||
|
||||
add_subdirectory(common)
|
||||
add_subdirectory(decoder)
|
||||
add_subdirectory(node)
|
||||
add_subdirectory(panel)
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
# Olive - Non-Linear Video Editor
|
||||
# Copyright (C) 2019 Olive Team
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
set(OLIVE_SOURCES
|
||||
${OLIVE_SOURCES}
|
||||
common/clamp.h
|
||||
common/lerp.h
|
||||
common/rational.h
|
||||
common/rational.cpp
|
||||
common/qobjectlistcast.h
|
||||
PARENT_SCOPE
|
||||
)
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <QObject>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "rational.h"
|
||||
#include "common/rational.h"
|
||||
#include "project/item/footage/footage.h"
|
||||
#include "decoder/frame.h"
|
||||
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ extern "C" {
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include "rational.h"
|
||||
#include "common/rational.h"
|
||||
|
||||
/**
|
||||
* @brief Abstraction from AVFrame. Currently a simple AVFrame wrapper.
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "graph.h"
|
||||
|
||||
#include "qobjectlistcast.h"
|
||||
#include "common/qobjectlistcast.h"
|
||||
|
||||
NodeGraph::NodeGraph()
|
||||
{
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@
|
||||
|
||||
#include <QVariant>
|
||||
|
||||
#include "rational.h"
|
||||
#include "common/rational.h"
|
||||
|
||||
class NodeKeyframe
|
||||
{
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "node.h"
|
||||
|
||||
#include "qobjectlistcast.h"
|
||||
#include "common/qobjectlistcast.h"
|
||||
|
||||
Node::Node(QObject *parent) :
|
||||
QObject(parent)
|
||||
|
||||
+1
-1
@@ -23,9 +23,9 @@
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include "common/rational.h"
|
||||
#include "node/input.h"
|
||||
#include "node/output.h"
|
||||
#include "rational.h"
|
||||
|
||||
class Node : public QObject
|
||||
{
|
||||
|
||||
+1
-1
@@ -24,8 +24,8 @@
|
||||
#include <QObject>
|
||||
#include <QVariant>
|
||||
|
||||
#include "common/rational.h"
|
||||
#include "node/edge.h"
|
||||
#include "rational.h"
|
||||
|
||||
class Node;
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@ extern "C" {
|
||||
#include <libavcodec/avcodec.h>
|
||||
}
|
||||
|
||||
#include "rational.h"
|
||||
#include "common/rational.h"
|
||||
#include "stream.h"
|
||||
|
||||
/**
|
||||
|
||||
@@ -24,10 +24,10 @@
|
||||
#include <QList>
|
||||
#include <QDateTime>
|
||||
|
||||
#include "common/rational.h"
|
||||
#include "project/item/item.h"
|
||||
#include "project/item/footage/audiostream.h"
|
||||
#include "project/item/footage/videostream.h"
|
||||
#include "rational.h"
|
||||
|
||||
/**
|
||||
* @brief A reference to an external media file with metadata in a project structure
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#ifndef STREAM_H
|
||||
#define STREAM_H
|
||||
|
||||
#include "rational.h"
|
||||
#include "common/rational.h"
|
||||
|
||||
class Footage;
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#ifndef VIDEOSTREAM_H
|
||||
#define VIDEOSTREAM_H
|
||||
|
||||
#include "rational.h"
|
||||
#include "common/rational.h"
|
||||
#include "stream.h"
|
||||
|
||||
/**
|
||||
|
||||
@@ -21,9 +21,9 @@
|
||||
#ifndef SEQUENCE_H
|
||||
#define SEQUENCE_H
|
||||
|
||||
#include "common/rational.h"
|
||||
#include "node/graph.h"
|
||||
#include "project/item/item.h"
|
||||
#include "rational.h"
|
||||
|
||||
class Sequence : public Item, public NodeGraph
|
||||
{
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
|
||||
#include <QDebug>
|
||||
|
||||
#include "clamp.h"
|
||||
#include "lerp.h"
|
||||
#include "common/clamp.h"
|
||||
#include "common/lerp.h"
|
||||
#include "nodeview.h"
|
||||
#include "nodeviewitem.h"
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <QPushButton>
|
||||
#include <QLabel>
|
||||
|
||||
#include "rational.h"
|
||||
#include "common/rational.h"
|
||||
#include "viewerglwidget.h"
|
||||
#include "widget/playbackcontrols/playbackcontrols.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user