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

various: encapsulate all code in the olive namespace to avoid name collisions

Browse Source 
Large-scale code cleanup. Also adds a license to the top of all files that were
missing it.
This commit is contained in:
itsmattkc
2020-04-06 15:29:53 +10:00
parent 82b6ddccc8
commit 1aa87cbda6
519 changed files with 7939 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/viewer/audiowaveformview.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
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/>.
***/
#include "audiowaveformview.h"
#include <QFile>
@@ -7,6 +27,8 @@
#include "common/clamp.h"
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
AudioWaveformView::AudioWaveformView(QWidget *parent) :
SeekableWidget(parent),
backend_(nullptr)
@@ -193,3 +215,5 @@ void AudioWaveformView::ForceUpdate()
cached_size_ = QSize();
update();
}
OLIVE_NAMESPACE_EXIT
app/widget/viewer/audiowaveformview.h
+27 -3
View File
@@ -1,5 +1,25 @@
#ifndef WAVEFORMVIEW_H
#define WAVEFORMVIEW_H
/***
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/>.
***/
#ifndef AUDIOWAVEFORMVIEW_H
#define AUDIOWAVEFORMVIEW_H
#include <QWidget>
@@ -8,6 +28,8 @@
#include "render/backend/audiorenderbackend.h"
#include "widget/timeruler/seekablewidget.h"
OLIVE_NAMESPACE_ENTER
class AudioWaveformView : public SeekableWidget
{
Q_OBJECT
@@ -38,4 +60,6 @@ private slots:
};
#endif // WAVEFORMVIEW_H
OLIVE_NAMESPACE_EXIT
#endif // AUDIOWAVEFORMVIEW_H
app/widget/viewer/footageviewer.cpp
+24
View File
@@ -1,3 +1,23 @@
/***
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/>.
***/
#include "footageviewer.h"
#include <QDrag>
@@ -5,6 +25,8 @@
#include "project/project.h"
OLIVE_NAMESPACE_ENTER
FootageViewerWidget::FootageViewerWidget(QWidget *parent) :
ViewerWidget(parent),
footage_(nullptr)
@@ -126,3 +148,5 @@ void FootageViewerWidget::StartAudioDrag()
{
StartFootageDragInternal(false, true);
}
OLIVE_NAMESPACE_EXIT
app/widget/viewer/footageviewer.h
+24
View File
@@ -1,3 +1,23 @@
/***
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/>.
***/
#ifndef FOOTAGEVIEWERWIDGET_H
#define FOOTAGEVIEWERWIDGET_H
@@ -6,6 +26,8 @@
#include "node/output/viewer/viewer.h"
#include "viewer.h"
OLIVE_NAMESPACE_ENTER
class FootageViewerWidget : public ViewerWidget
{
Q_OBJECT
@@ -38,4 +60,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // FOOTAGEVIEWERWIDGET_H
app/widget/viewer/pixelsamplerwidget.cpp
+24
View File
@@ -1,7 +1,29 @@
/***
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/>.
***/
#include "pixelsamplerwidget.h"
#include <QVBoxLayout>
OLIVE_NAMESPACE_ENTER
PixelSamplerWidget::PixelSamplerWidget(QWidget *parent) :
QGroupBox(parent)
{
@@ -53,3 +75,5 @@ void ManagedPixelSamplerWidget::SetValues(const Color &reference, const Color &d
reference_view_->SetValues(reference);
display_view_->SetValues(display);
}
OLIVE_NAMESPACE_EXIT
app/widget/viewer/pixelsamplerwidget.h
+24
View File
@@ -1,3 +1,23 @@
/***
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/>.
***/
#ifndef PIXELSAMPLERWIDGET_H
#define PIXELSAMPLERWIDGET_H
@@ -7,6 +27,8 @@
#include "render/color.h"
OLIVE_NAMESPACE_ENTER
class PixelSamplerWidget : public QGroupBox
{
Q_OBJECT
@@ -41,4 +63,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // PIXELSAMPLERWIDGET_H
app/widget/viewer/viewer.cpp
+4
View File
@@ -36,6 +36,8 @@
#include "render/pixelformat.h"
#include "widget/menu/menu.h"
OLIVE_NAMESPACE_ENTER
ViewerWidget::ViewerWidget(QWidget *parent) :
TimeBasedWidget(false, true, parent),
playback_speed_(0),
@@ -734,3 +736,5 @@ void ViewerWidget::InvalidateVisible()
{
video_renderer_->InvalidateCache(TimeRange(GetTime(), GetTime()));
}
OLIVE_NAMESPACE_EXIT
app/widget/viewer/viewer.h
+4
View File
@@ -40,6 +40,8 @@
#include "widget/playbackcontrols/playbackcontrols.h"
#include "widget/timebased/timebased.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief An OpenGL-based viewer widget with playback controls (a PlaybackControls widget).
*/
@@ -234,4 +236,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // VIEWER_WIDGET_H
app/widget/viewer/viewerglwidget.cpp
+4
View File
@@ -33,6 +33,8 @@
#include "render/backend/opengl/openglshader.h"
#include "render/pixelformat.h"
OLIVE_NAMESPACE_ENTER
#ifdef Q_OS_LINUX
bool ViewerGLWidget::nouveau_check_done_ = false;
#endif
@@ -392,3 +394,5 @@ void ViewerGLWidget::ContextCleanup()
doneCurrent();
}
OLIVE_NAMESPACE_EXIT
app/widget/viewer/viewerglwidget.h
+4
View File
@@ -30,6 +30,8 @@
#include "render/color.h"
#include "render/colormanager.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief The inner display/rendering widget of a Viewer class.
*
@@ -262,4 +264,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
#endif // VIEWERGLWIDGET_H
app/widget/viewer/viewersizer.cpp
+24
View File
@@ -1,7 +1,29 @@
/***
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/>.
***/
#include "viewersizer.h"
#include <QMatrix4x4>
OLIVE_NAMESPACE_ENTER
ViewerSizer::ViewerSizer(QWidget *parent) :
QWidget(parent),
widget_(nullptr),
@@ -114,3 +136,5 @@ void ViewerSizer::UpdateSize()
emit RequestMatrix(child_matrix);
}
OLIVE_NAMESPACE_EXIT
app/widget/viewer/viewersizer.h
+6
View File
@@ -23,6 +23,10 @@
#include <QWidget>
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
/**
* @brief A container widget that enforces the aspect ratio of a child widget
*
@@ -99,4 +103,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // VIEWERSIZER_H
app/widget/viewer/viewerwindow.cpp
+24
View File
@@ -1,8 +1,30 @@
/***
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/>.
***/
#include "viewerwindow.h"
#include <QKeyEvent>
#include <QVBoxLayout>
OLIVE_NAMESPACE_ENTER
ViewerWindow::ViewerWindow(QWidget *parent) :
QWidget(parent, Qt::Window | Qt::WindowStaysOnTopHint)
{
@@ -53,3 +75,5 @@ void ViewerWindow::closeEvent(QCloseEvent *e)
deleteLater();
}
OLIVE_NAMESPACE_EXIT
app/widget/viewer/viewerwindow.h
+24
View File
@@ -1,3 +1,23 @@
/***
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/>.
***/
#ifndef VIEWERWINDOW_H
#define VIEWERWINDOW_H
@@ -5,6 +25,8 @@
#include "viewerglwidget.h"
OLIVE_NAMESPACE_ENTER
class ViewerWindow : public QWidget
{
public:
@@ -27,4 +49,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
#endif // VIEWERWINDOW_H