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

use hardcoded namespace

Browse Source 
The macro defined namespaces confused the hell out of lupdate and more or less broke translations permanently. Looks like the only way we can do it is to have a hardcoded namespace, which goes against my instinct, but honestly how likely is it that we'll change the namespace anyway (I guess forks might want to do it, but that's their problem ;) )
This commit is contained in:
itsmattkc
2020-11-17 20:24:42 +11:00
parent d241090a9f
commit 75d4cd899b
626 changed files with 1971 additions and 1972 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/audio/audiomanager.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
AudioManager* AudioManager::instance_ = nullptr;
@@ -268,4 +268,4 @@ void AudioManager::InputDevicesRefreshed()
emit InputListReady();
}
OLIVE_NAMESPACE_EXIT
}
app/audio/audiomanager.h
+2 -2
View File
@@ -32,7 +32,7 @@
#include "render/audioparams.h"
#include "render/audioplaybackcache.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief Audio input and output management class
@@ -124,6 +124,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // AUDIOMANAGER_H
app/audio/audiovisualwaveform.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
const int AudioVisualWaveform::kSumSampleRate = 200;
@@ -330,4 +330,4 @@ void AudioVisualWaveform::ExpandMinMax(AudioVisualWaveform::SamplePerChannel &su
}
}
OLIVE_NAMESPACE_EXIT
}
app/audio/audiovisualwaveform.h
+3 -3
View File
@@ -27,7 +27,7 @@
#include "codec/samplebuffer.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A buffer of data used to store a visual representation of audio
@@ -108,8 +108,8 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::AudioVisualWaveform)
Q_DECLARE_METATYPE(olive::AudioVisualWaveform)
#endif // SUMSAMPLES_H
app/audio/outputdeviceproxy.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include "audiomanager.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
AudioOutputDeviceProxy::AudioOutputDeviceProxy(QObject *parent) :
QIODevice(parent),
@@ -137,4 +137,4 @@ qint64 AudioOutputDeviceProxy::ReverseAwareRead(char *data, qint64 maxlen)
return read_count;
}
OLIVE_NAMESPACE_EXIT
}
app/audio/outputdeviceproxy.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include "common/define.h"
#include "tempoprocessor.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief QIODevice wrapper that can adjust speed/reverse an audio file
@@ -61,6 +61,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // AUDIOOUTPUTDEVICEPROXY_H
app/audio/outputmanager.cpp
+2 -2
View File
@@ -25,7 +25,7 @@
#include <QFile>
OLIVE_NAMESPACE_ENTER
namespace olive {
AudioOutputManager::AudioOutputManager(QObject *parent) :
QObject(parent),
@@ -151,4 +151,4 @@ void AudioOutputManager::OutputStateChanged(QAudio::State state)
qDebug() << state << output_->error();
}
OLIVE_NAMESPACE_EXIT
}
app/audio/outputmanager.h
+3 -3
View File
@@ -30,7 +30,7 @@
#include "outputdeviceproxy.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class AudioOutputManager : public QObject
{
@@ -59,7 +59,7 @@ public slots:
void ResetToPushMode();
// Queued
void SetParameters(OLIVE_NAMESPACE::AudioParams params);
void SetParameters(olive::AudioParams params);
// Queued
void Close();
@@ -84,6 +84,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // AUDIOHYBRIDDEVICE_H
app/audio/tempoprocessor.cpp
+2 -2
View File
@@ -30,7 +30,7 @@ extern "C" {
#include "common/ffmpegutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
TempoProcessor::TempoProcessor() :
filter_graph_(nullptr),
@@ -274,4 +274,4 @@ AVFilterContext *TempoProcessor::CreateTempoFilter(AVFilterGraph* graph, AVFilte
return nullptr;
}
OLIVE_NAMESPACE_EXIT
}
app/audio/tempoprocessor.h
+2 -2
View File
@@ -35,7 +35,7 @@ extern "C" {
#include "render/audioparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TempoProcessor
{
@@ -78,6 +78,6 @@ private:
bool flushed_;
};
OLIVE_NAMESPACE_EXIT
}
#endif // TEMPOPROCESSOR_H
app/cli/cliexport/cliexportmanager.cpp
+2 -2
View File
@@ -20,11 +20,11 @@
#include "cliexportmanager.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
CLIExportManager::CLIExportManager()
{
}
OLIVE_NAMESPACE_EXIT
}
app/cli/cliexport/cliexportmanager.h
+2 -2
View File
@@ -23,7 +23,7 @@
#include "task/export/export.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class CLIExportManager : public QObject
{
@@ -31,6 +31,6 @@ public:
CLIExportManager();
};
OLIVE_NAMESPACE_EXIT
}
#endif // CLIEXPORTMANAGER_H
app/cli/cliprogress/cliprogressdialog.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include <iostream>
OLIVE_NAMESPACE_ENTER
namespace olive {
CLIProgressDialog::CLIProgressDialog(const QString& title, QObject *parent) :
QObject(parent),
@@ -103,4 +103,4 @@ void CLIProgressDialog::SetProgress(double p)
}
}
OLIVE_NAMESPACE_EXIT
}
app/cli/cliprogress/cliprogressdialog.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class CLIProgressDialog : public QObject
{
@@ -47,6 +47,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // CLIPROGRESSDIALOG_H
app/cli/clitask/clitaskdialog.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "clitaskdialog.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
CLITaskDialog::CLITaskDialog(Task *task, QObject* parent) :
CLIProgressDialog(task->GetTitle(), parent),
@@ -34,4 +34,4 @@ bool CLITaskDialog::Run()
return task_->Start();
}
OLIVE_NAMESPACE_EXIT
}
app/cli/clitask/clitaskdialog.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "cli/cliprogress/cliprogressdialog.h"
#include "task/task.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class CLITaskDialog : public CLIProgressDialog
{
@@ -39,6 +39,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // CLITASKDIALOG_H
app/codec/decoder.cpp
+2 -2
View File
@@ -37,7 +37,7 @@
#include "task/taskmanager.h"
#include "project/project.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
QMutex Decoder::currently_conforming_mutex_;
QWaitCondition Decoder::currently_conforming_wait_cond_;
@@ -377,4 +377,4 @@ SampleBufferPtr Decoder::RetrieveAudioFromConform(const QString &conform_filenam
return nullptr;
}
OLIVE_NAMESPACE_EXIT
}
app/codec/decoder.h
+3 -3
View File
@@ -36,7 +36,7 @@ extern "C" {
#include "common/rational.h"
#include "project/item/footage/footage.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class Decoder;
using DecoderPtr = std::shared_ptr<Decoder>;
@@ -248,8 +248,8 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::Decoder::RetrieveState)
Q_DECLARE_METATYPE(olive::Decoder::RetrieveState)
#endif // DECODER_H
app/codec/encoder.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "ffmpeg/ffmpegencoder.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
Encoder::Encoder(const EncodingParams &params) :
params_(params)
@@ -236,4 +236,4 @@ Encoder* Encoder::CreateFromID(const QString &id, const EncodingParams& params)
return new FFmpegEncoder(params);
}
OLIVE_NAMESPACE_EXIT
}
app/codec/encoder.h
+5 -5
View File
@@ -32,7 +32,7 @@
#include "render/audioparams.h"
#include "render/videoparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class Encoder;
using EncoderPtr = std::shared_ptr<Encoder>;
@@ -114,10 +114,10 @@ public:
virtual bool Open() = 0;
virtual bool WriteFrame(OLIVE_NAMESPACE::FramePtr frame, OLIVE_NAMESPACE::rational time) = 0;
virtual void WriteAudio(OLIVE_NAMESPACE::AudioParams pcm_info,
virtual bool WriteFrame(olive::FramePtr frame, olive::rational time) = 0;
virtual void WriteAudio(olive::AudioParams pcm_info,
QIODevice *file) = 0;
void WriteAudio(OLIVE_NAMESPACE::AudioParams pcm_info,
void WriteAudio(olive::AudioParams pcm_info,
const QString& pcm_filename);
virtual void Close() = 0;
@@ -132,6 +132,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // ENCODER_H
app/codec/exportcodec.cpp
+2 -2
View File
@@ -25,7 +25,7 @@ extern "C" {
#include <libavutil/pixdesc.h>
}
OLIVE_NAMESPACE_ENTER
namespace olive {
QString ExportCodec::GetCodecName(ExportCodec::Codec c)
{
@@ -125,4 +125,4 @@ QStringList ExportCodec::GetPixelFormatsForCodec(ExportCodec::Codec c)
return pix_fmts;
}
OLIVE_NAMESPACE_EXIT
}
app/codec/exportcodec.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ExportCodec : public QObject
{
@@ -57,6 +57,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // EXPORTCODEC_H
app/codec/exportformat.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "exportformat.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
QString ExportFormat::GetName(olive::ExportFormat::Format f)
{
@@ -135,4 +135,4 @@ QList<ExportCodec::Codec> ExportFormat::GetAudioCodecs(ExportFormat::Format f)
return {};
}
OLIVE_NAMESPACE_EXIT
}
app/codec/exportformat.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include "common/define.h"
#include "exportcodec.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ExportFormat : public QObject
{
@@ -53,6 +53,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // EXPORTFORMAT_H
app/codec/ffmpeg/avframeptr.h
+2 -2
View File
@@ -30,7 +30,7 @@ extern "C" {
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class AVFrameWrapper {
public:
@@ -55,6 +55,6 @@ private:
using AVFramePtr = std::shared_ptr<AVFrameWrapper>;
OLIVE_NAMESPACE_EXIT
}
#endif // AVFRAMEPTR_H
app/codec/ffmpeg/ffmpegdecoder.cpp
+2 -2
View File
@@ -45,7 +45,7 @@ extern "C" {
#include "render/framehashcache.h"
#include "render/diskmanager.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
FFmpegDecoder::FFmpegDecoder() :
scale_ctx_(nullptr),
@@ -1085,4 +1085,4 @@ void FFmpegDecoder::Instance::Seek(int64_t timestamp)
av_seek_frame(fmt_ctx_, avstream_->index, timestamp, AVSEEK_FLAG_BACKWARD);
}
OLIVE_NAMESPACE_EXIT
}
app/codec/ffmpeg/ffmpegdecoder.h
+2 -2
View File
@@ -38,7 +38,7 @@ extern "C" {
#include "ffmpegframepool.h"
#include "project/item/footage/videostream.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A Decoder derivative that wraps FFmpeg functions as on Olive decoder
@@ -162,6 +162,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // FFMPEGDECODER_H
app/codec/ffmpeg/ffmpegencoder.cpp
+2 -2
View File
@@ -28,7 +28,7 @@ extern "C" {
#include "common/ffmpegutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
FFmpegEncoder::FFmpegEncoder(const EncodingParams &params) :
Encoder(params),
@@ -634,4 +634,4 @@ void FFmpegEncoder::Error(const QString &s)
Close();
}
OLIVE_NAMESPACE_EXIT
}
app/codec/ffmpeg/ffmpegencoder.h
+4 -4
View File
@@ -30,7 +30,7 @@ extern "C" {
#include "codec/encoder.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class FFmpegEncoder : public Encoder
{
@@ -40,9 +40,9 @@ public:
virtual bool Open() override;
virtual bool WriteFrame(OLIVE_NAMESPACE::FramePtr frame, OLIVE_NAMESPACE::rational time) override;
virtual bool WriteFrame(olive::FramePtr frame, olive::rational time) override;
virtual void WriteAudio(OLIVE_NAMESPACE::AudioParams pcm_info,
virtual void WriteAudio(olive::AudioParams pcm_info,
QIODevice *file) override;
virtual void Close() override;
@@ -97,6 +97,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // FFMPEGENCODER_H
app/codec/ffmpeg/ffmpegframepool.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include "codec/frame.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
FFmpegFramePool::FFmpegFramePool(int element_count) :
MemoryPool(element_count),
@@ -48,4 +48,4 @@ size_t FFmpegFramePool::GetElementSize()
return Frame::generate_linesize_bytes(width_, format_, channel_count_) * height_;
}
OLIVE_NAMESPACE_EXIT
}
app/codec/ffmpeg/ffmpegframepool.h
+2 -2
View File
@@ -24,7 +24,7 @@
#include "common/memorypool.h"
#include "render/videoparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class FFmpegFramePool : public MemoryPool<uint8_t>
{
@@ -57,6 +57,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // FFMPEGFRAMEPOOL_H
app/codec/frame.cpp
+2 -2
View File
@@ -27,7 +27,7 @@
#include "common/oiioutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
Frame::Frame() :
timestamp_(0)
@@ -129,4 +129,4 @@ FramePtr Frame::convert(VideoParams::Format format) const
}
}
OLIVE_NAMESPACE_EXIT
}
app/codec/frame.h
+3 -3
View File
@@ -28,7 +28,7 @@
#include "render/color.h"
#include "render/videoparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class Frame;
using FramePtr = std::shared_ptr<Frame>;
@@ -163,8 +163,8 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::FramePtr)
Q_DECLARE_METATYPE(olive::FramePtr)
#endif // FRAME_H
app/codec/oiio/oiiodecoder.cpp
+2 -2
View File
@@ -31,7 +31,7 @@
#include "config/config.h"
#include "core.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
QStringList OIIODecoder::supported_formats_;
@@ -261,4 +261,4 @@ void OIIODecoder::CloseImageHandle()
}
}
OLIVE_NAMESPACE_EXIT
}
app/codec/oiio/oiiodecoder.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include "codec/decoder.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class OIIODecoder : public Decoder
{
@@ -72,6 +72,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // OIIODECODER_H
app/codec/samplebuffer.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "samplebuffer.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
SampleBuffer::SampleBuffer() :
sample_count_per_channel_(0),
@@ -310,4 +310,4 @@ void SampleBuffer::destroy_sample_buffer(float ***data, int nb_channels)
}
}
OLIVE_NAMESPACE_EXIT
}
app/codec/samplebuffer.h
+3 -3
View File
@@ -25,7 +25,7 @@
#include "render/audioparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class SampleBuffer;
using SampleBufferPtr = std::shared_ptr<SampleBuffer>;
@@ -94,8 +94,8 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::SampleBufferPtr)
Q_DECLARE_METATYPE(olive::SampleBufferPtr)
#endif // SAMPLEBUFFER_H
app/codec/waveinput.cpp
+2 -2
View File
@@ -27,7 +27,7 @@ extern "C" {
#include <QDataStream>
#include <QtMath>
OLIVE_NAMESPACE_ENTER
namespace olive {
WaveInput::WaveInput(const QString &f) :
file_(f)
@@ -239,4 +239,4 @@ qint64 WaveInput::calculate_max_read() const
return data_size_ - (file_.pos() - data_position_ );
}
OLIVE_NAMESPACE_EXIT
}
app/codec/waveinput.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "render/audioparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class WaveInput
{
@@ -70,6 +70,6 @@ private:
quint32 data_size_;
};
OLIVE_NAMESPACE_EXIT
}
#endif // WAVEINPUT_H
app/codec/waveoutput.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include "render/audioparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
const int16_t kWAVIntegerFormat = 1;
const int16_t kWAVFloatFormat = 3;
@@ -177,4 +177,4 @@ void WaveOutput::write_int(QFile *file, T integer)
file->write(bytes);
}
OLIVE_NAMESPACE_EXIT
}
app/codec/waveoutput.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include "render/audioparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class WaveOutput
{
@@ -63,6 +63,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // WAVEAUDIO_H
app/common/autoscroll.h
+2 -2
View File
@@ -23,7 +23,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class AutoScroll {
public:
@@ -34,6 +34,6 @@ public:
};
};
OLIVE_NAMESPACE_EXIT
}
#endif // AUTOSCROLL_H
app/common/bezier.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
#include <QtMath>
OLIVE_NAMESPACE_ENTER
namespace olive {
double Bezier::QuadraticXtoT(double x, double a, double b, double c)
{
@@ -63,4 +63,4 @@ double Bezier::CubicTtoY(double a, double b, double c, double d, double t)
return qPow(1.0 - t, 3)*a + 3*qPow(1.0 - t, 2)*t*b + 3*(1.0 - t)*qPow(t, 2)*c + qPow(t, 3)*d;
}
OLIVE_NAMESPACE_EXIT
}
app/common/bezier.h
+2 -2
View File
@@ -23,7 +23,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class Bezier
{
@@ -37,6 +37,6 @@ public:
static double CubicTtoY(double a, double b, double c, double d, double t);
};
OLIVE_NAMESPACE_EXIT
}
#endif // BEZIER_H
app/common/cancelableobject.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class CancelableObject {
public:
@@ -53,6 +53,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // CANCELABLEOBJECT_H
app/common/crashpadinterface.cpp
+2 -2
View File
@@ -40,7 +40,7 @@ crashpad::CrashpadClient *client;
QString GenerateReportPath()
{
return QDir(OLIVE_NAMESPACE::FileFunctions::GetTempFilePath()).filePath(QStringLiteral("reports"));
return QDir(olive::FileFunctions::GetTempFilePath()).filePath(QStringLiteral("reports"));
}
base::FilePath GenerateReportPathForCrashpad()
@@ -90,7 +90,7 @@ bool InitializeCrashpad()
base::FilePath reports_dir = GenerateReportPathForCrashpad();
base::FilePath metrics_dir(QSTRING_TO_BASE_STRING(QDir(OLIVE_NAMESPACE::FileFunctions::GetTempFilePath()).filePath(QStringLiteral("metrics"))));
base::FilePath metrics_dir(QSTRING_TO_BASE_STRING(QDir(olive::FileFunctions::GetTempFilePath()).filePath(QStringLiteral("metrics"))));
// Metadata that will be posted to the server with the crash report map
std::map<std::string, std::string> annotations;
app/common/debug.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "debug.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
@@ -54,4 +54,4 @@ void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QStri
#endif
}
OLIVE_NAMESPACE_EXIT
}
app/common/debug.h
+2 -2
View File
@@ -25,10 +25,10 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg);
OLIVE_NAMESPACE_EXIT
}
#endif // DEBUG_H
app/common/define.h
+5 -11
View File
@@ -21,13 +21,7 @@
#ifndef OLIVECOMMONDEFINE_H
#define OLIVECOMMONDEFINE_H
#define OLIVE_NAMESPACE olive
#define OLIVE_NAMESPACE_ENTER namespace OLIVE_NAMESPACE {
#define OLIVE_NAMESPACE_EXIT }
OLIVE_NAMESPACE_ENTER
namespace olive {
/// The minimum size an icon in ProjectExplorer can be
const int kProjectIconSizeMinimum = 16;
@@ -40,14 +34,14 @@ const int kProjectIconSizeDefault = 64;
const int kBytesInGigabyte = 1073741824;
OLIVE_NAMESPACE_EXIT
}
#define MACRO_NAME_AS_STR(s) #s
#define MACRO_VAL_AS_STR(s) MACRO_NAME_AS_STR(s)
#define OLIVE_NS_CONST_ARG(x, y) QArgument<const OLIVE_NAMESPACE::x>("const " MACRO_VAL_AS_STR(OLIVE_NAMESPACE) "::" #x, y)
#define OLIVE_NS_ARG(x, y) QArgument<OLIVE_NAMESPACE::x>(MACRO_VAL_AS_STR(OLIVE_NAMESPACE) "::" #x, y)
#define OLIVE_NS_RETURN_ARG(x, y) QReturnArgument<OLIVE_NAMESPACE::x>(MACRO_VAL_AS_STR(OLIVE_NAMESPACE) "::" #x, y)
#define OLIVE_NS_CONST_ARG(x, y) QArgument<const olive::x>("const " MACRO_VAL_AS_STR(olive) "::" #x, y)
#define OLIVE_NS_ARG(x, y) QArgument<olive::x>(MACRO_VAL_AS_STR(olive) "::" #x, y)
#define OLIVE_NS_RETURN_ARG(x, y) QReturnArgument<olive::x>(MACRO_VAL_AS_STR(olive) "::" #x, y)
/**
* Copy/move deleters. Similar to Q_DISABLE_COPY_MOVE, et al. but those functions are not present in Qt < 5.13 so we
app/common/ffmpegutils.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "common/ffmpegutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
AVPixelFormat FFmpegUtils::GetCompatiblePixelFormat(const AVPixelFormat &pix_fmt)
{
@@ -138,4 +138,4 @@ VideoParams::Format FFmpegUtils::GetCompatiblePixelFormat(const VideoParams::For
return VideoParams::kFormatInvalid;
}
OLIVE_NAMESPACE_EXIT
}
app/common/ffmpegutils.h
+2 -2
View File
@@ -28,7 +28,7 @@ extern "C" {
#include "render/audioparams.h"
#include "render/videoparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class FFmpegUtils {
public:
@@ -58,6 +58,6 @@ public:
static AVSampleFormat GetFFmpegSampleFormat(const AudioParams::Format &smp_fmt);
};
OLIVE_NAMESPACE_EXIT
}
#endif // FFMPEGABSTRACTION_H
app/common/filefunctions.cpp
+2 -2
View File
@@ -29,7 +29,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
QString FileFunctions::GetUniqueFileIdentifier(const QString &filename)
{
@@ -240,4 +240,4 @@ bool FileFunctions::RenameFileAllowOverwrite(const QString &from, const QString
return true;
}
OLIVE_NAMESPACE_EXIT
}
app/common/filefunctions.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A collection of static file and directory functions
@@ -88,6 +88,6 @@ public:
OLIVE_NAMESPACE_EXIT
}
#endif // FILEFUNCTIONS_H
app/common/flipmodifiers.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "flipmodifiers.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e) {
if (e & Qt::ControlModifier & Qt::ShiftModifier) {
@@ -38,4 +38,4 @@ Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e) {
return e;
}
OLIVE_NAMESPACE_EXIT
}
app/common/flipmodifiers.h
+2 -2
View File
@@ -25,10 +25,10 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e);
OLIVE_NAMESPACE_EXIT
}
#endif // FLIPMODIFIERS_H
app/common/memorypool.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
#include "memorypool.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
size_t memory_pool_consumption = 0;
QMutex memory_pool_consumption_lock;
@@ -11,4 +11,4 @@ bool MemoryPoolLimitReached()
return (memory_pool_consumption >= 2147483648);
}
OLIVE_NAMESPACE_EXIT
}
app/common/memorypool.h
+2 -2
View File
@@ -30,7 +30,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
extern size_t memory_pool_consumption;
extern QMutex memory_pool_consumption_lock;
@@ -397,6 +397,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // MEMORYPOOL_H
app/common/ocioutils.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "ocioutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
OCIO::BitDepth OCIOUtils::GetOCIOBitDepthFromPixelFormat(VideoParams::Format format)
{
@@ -44,4 +44,4 @@ OCIO::BitDepth OCIOUtils::GetOCIOBitDepthFromPixelFormat(VideoParams::Format for
return OCIO::BIT_DEPTH_UNKNOWN;
}
OLIVE_NAMESPACE_EXIT
}
app/common/ocioutils.h
+2 -2
View File
@@ -26,7 +26,7 @@ namespace OCIO = OpenColorIO_v2_0dev;
#include "render/videoparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class OCIOUtils
{
@@ -34,6 +34,6 @@ public:
static OCIO::BitDepth GetOCIOBitDepthFromPixelFormat(VideoParams::Format format);
};
OLIVE_NAMESPACE_EXIT
}
#endif // OCIOUTILS_H
app/common/oiioutils.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "oiioutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
void OIIOUtils::FrameToBuffer(const Frame* frame, OIIO::ImageBuf *buf)
{
@@ -117,4 +117,4 @@ VideoParams::Format OIIOUtils::GetFormatFromOIIOBasetype(OIIO::TypeDesc::BASETYP
return VideoParams::kFormatInvalid;
}
OLIVE_NAMESPACE_EXIT
}
app/common/oiioutils.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include "codec/frame.h"
#include "render/videoparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class OIIOUtils {
public:
@@ -60,6 +60,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // OIIOUTILS_H
app/common/power.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
uint32_t ceil_to_power_of_2(uint32_t v)
{
@@ -51,6 +51,6 @@ uint32_t floor_to_power_of_2(uint32_t x)
return x - (x >> 1);
}
OLIVE_NAMESPACE_EXIT
}
#endif // POWER_H
app/common/qtutils.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "qtutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
int QtUtils::QFontMetricsWidth(QFontMetrics fm, const QString& s) {
#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
@@ -38,4 +38,4 @@ QFrame *QtUtils::CreateHorizontalLine()
return horizontal_line;
}
OLIVE_NAMESPACE_EXIT
}
app/common/qtutils.h
+2 -2
View File
@@ -32,7 +32,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class QtUtils {
public:
@@ -49,6 +49,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // QTVERSIONABSTRACTION_H
app/common/ratiodialog.cpp
+2 -2
View File
@@ -23,7 +23,7 @@
#include <QCoreApplication>
#include <QMessageBox>
OLIVE_NAMESPACE_ENTER
namespace olive {
double GetFloatRatioFromUser(QWidget* parent,
const QString& title,
@@ -88,4 +88,4 @@ double GetFloatRatioFromUser(QWidget* parent,
}
}
OLIVE_NAMESPACE_EXIT
}
app/common/ratiodialog.h
+2 -2
View File
@@ -25,12 +25,12 @@
#include "common/rational.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
double GetFloatRatioFromUser(QWidget* parent,
const QString& title,
bool* ok_in);
OLIVE_NAMESPACE_EXIT
}
#endif // RATIODIALOG_H
app/common/rational.cpp
+3 -3
View File
@@ -3,7 +3,7 @@
#include "rational.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
rational rational::fromDouble(const double &flt)
{
@@ -391,9 +391,9 @@ uint qHash(const rational &r, uint seed)
return ::qHash(r.toDouble(), seed);
}
OLIVE_NAMESPACE_EXIT
}
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::rational &r)
QDebug operator<<(QDebug debug, const olive::rational &r)
{
return debug.space() << r.toDouble();
/*
app/common/rational.h
+4 -4
View File
@@ -20,7 +20,7 @@ extern "C" {
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
typedef int64_t intType;
/*
@@ -140,10 +140,10 @@ private:
uint qHash(const rational& r, uint seed);
OLIVE_NAMESPACE_EXIT
}
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::rational& r);
QDebug operator<<(QDebug debug, const olive::rational& r);
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::rational)
Q_DECLARE_METATYPE(olive::rational)
#endif // RATIONAL_H
app/common/threadedobject.cpp
+2 -2
View File
@@ -20,7 +20,7 @@
#include "threadedobject.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
void ThreadedObject::LockDeletes()
{
@@ -54,4 +54,4 @@ bool ThreadedObject::TryLockMutex(int timeout)
return threadobj_main_lock_.tryLock(timeout);
}
OLIVE_NAMESPACE_EXIT
}
app/common/threadedobject.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ThreadedObject
{
@@ -45,6 +45,6 @@ private:
QAtomicInt threadobj_delete_lock_;
};
OLIVE_NAMESPACE_EXIT
}
#endif // THREADEDOBJECT_H
app/common/timecodefunctions.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
QString padded(int64_t arg, int padding) {
return QStringLiteral("%1").arg(arg, padding, 10, QChar('0'));
@@ -289,4 +289,4 @@ int64_t Timecode::rescale_timestamp_ceil(const int64_t &ts, const rational &sour
return qCeil(static_cast<double>(ts) * source.toDouble() / dest.toDouble());
}
OLIVE_NAMESPACE_EXIT
}
app/common/timecodefunctions.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/rational.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief Functions for converting times/timecodes/timestamps
@@ -72,6 +72,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // TIMECODEFUNCTIONS_H
app/common/timerange.cpp
+3 -3
View File
@@ -23,7 +23,7 @@
#include <QtMath>
#include <utility>
OLIVE_NAMESPACE_ENTER
namespace olive {
TimeRange::TimeRange(const rational &in, const rational &out) :
in_(in),
@@ -296,9 +296,9 @@ uint qHash(const TimeRange &r, uint seed)
return qHash(r.in(), seed) ^ qHash(r.out(), seed);
}
OLIVE_NAMESPACE_EXIT
}
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::TimeRange &r)
QDebug operator<<(QDebug debug, const olive::TimeRange &r)
{
debug.nospace() << r.in().toDouble() << " - " << r.out().toDouble();
return debug.space();
app/common/timerange.h
+5 -5
View File
@@ -23,7 +23,7 @@
#include "rational.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TimeRange {
public:
@@ -139,11 +139,11 @@ private:
uint qHash(const TimeRange& r, uint seed);
OLIVE_NAMESPACE_EXIT
}
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::TimeRange& r);
QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::TimeRangeList& r);
QDebug operator<<(QDebug debug, const olive::TimeRange& r);
QDebug operator<<(QDebug debug, const olive::TimeRangeList& r);
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::TimeRange)
Q_DECLARE_METATYPE(olive::TimeRange)
#endif // TIMERANGE_H
app/common/tohex.h
+2 -2
View File
@@ -5,12 +5,12 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
inline QString ToHex(quint64 t) {
return QStringLiteral("%1").arg(t, 0, 16);
}
OLIVE_NAMESPACE_EXIT
}
#endif // TOHEX_H
app/common/xmlutils.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "node/factory.h"
#include "widget/nodeview/nodeviewundo.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
void XMLConnectNodes(const XMLNodeData &xml_node_data, QUndoCommand *command)
{
@@ -64,4 +64,4 @@ void XMLLinkBlocks(const XMLNodeData &xml_node_data)
}
}
OLIVE_NAMESPACE_EXIT
}
app/common/xmlutils.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include "project/item/footage/stream.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class Block;
class Node;
@@ -71,6 +71,6 @@ bool XMLReadNextStartElement(QXmlStreamReader* reader);
void XMLLinkBlocks(const XMLNodeData& xml_node_data);
OLIVE_NAMESPACE_EXIT
}
#endif // XMLREADLOOP_H
app/config/config.cpp
+2 -2
View File
@@ -34,7 +34,7 @@
#include "ui/style/style.h"
#include "window/mainwindow/mainwindow.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
Config Config::current_config_;
@@ -268,4 +268,4 @@ NodeParam::DataType Config::GetConfigEntryType(const QString &key) const
return config_map_[key].type;
}
OLIVE_NAMESPACE_EXIT
}
app/config/config.h
+2 -2
View File
@@ -28,7 +28,7 @@
#include "common/timecodefunctions.h"
#include "node/param.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class Config {
public:
@@ -63,6 +63,6 @@ private:
static QString GetConfigFilePath();
};
OLIVE_NAMESPACE_EXIT
}
#endif // CONFIG_H
app/core.cpp
+12 -12
View File
@@ -68,7 +68,7 @@
#include "widget/viewer/viewer.h"
#include "window/mainwindow/mainwindow.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
Core* Core::instance_ = nullptr;
const uint Core::kProjectVersion = 201003;
@@ -103,17 +103,17 @@ void Core::DeclareTypesForQt()
qRegisterMetaType<AudioParams>();
qRegisterMetaType<NodeKeyframe::Type>();
qRegisterMetaType<Decoder::RetrieveState>();
qRegisterMetaType<OLIVE_NAMESPACE::TimeRange>();
qRegisterMetaType<olive::TimeRange>();
qRegisterMetaType<Color>();
qRegisterMetaType<OLIVE_NAMESPACE::ProjectPtr>();
qRegisterMetaType<OLIVE_NAMESPACE::AudioVisualWaveform>();
qRegisterMetaType<OLIVE_NAMESPACE::SampleJob>();
qRegisterMetaType<OLIVE_NAMESPACE::ShaderJob>();
qRegisterMetaType<OLIVE_NAMESPACE::GenerateJob>();
qRegisterMetaType<OLIVE_NAMESPACE::VideoParams>();
qRegisterMetaType<OLIVE_NAMESPACE::VideoParams::Interlacing>();
qRegisterMetaType<OLIVE_NAMESPACE::MainWindowLayoutInfo>();
qRegisterMetaType<OLIVE_NAMESPACE::RenderTicketPtr>();
qRegisterMetaType<olive::ProjectPtr>();
qRegisterMetaType<olive::AudioVisualWaveform>();
qRegisterMetaType<olive::SampleJob>();
qRegisterMetaType<olive::ShaderJob>();
qRegisterMetaType<olive::GenerateJob>();
qRegisterMetaType<olive::VideoParams>();
qRegisterMetaType<olive::VideoParams::Interlacing>();
qRegisterMetaType<olive::MainWindowLayoutInfo>();
qRegisterMetaType<olive::RenderTicketPtr>();
}
void Core::Start()
@@ -1375,4 +1375,4 @@ Core::CoreParams::CoreParams() :
{
}
OLIVE_NAMESPACE_EXIT
}
app/core.h
+3 -3
View File
@@ -36,7 +36,7 @@
#include "tool/tool.h"
#include "undo/undostack.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class MainWindow;
@@ -563,7 +563,7 @@ private slots:
/**
* @brief Adds a project to the "open projects" list
*/
void AddOpenProject(OLIVE_NAMESPACE::ProjectPtr p);
void AddOpenProject(olive::ProjectPtr p);
void AddOpenProjectFromTask(Task* task);
@@ -584,6 +584,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // CORE_H
app/dialog/about/about.cpp
+2 -2
View File
@@ -25,7 +25,7 @@
#include <QLabel>
#include <QVBoxLayout>
OLIVE_NAMESPACE_ENTER
namespace olive {
AboutDialog::AboutDialog(QWidget *parent) :
QDialog(parent)
@@ -67,4 +67,4 @@ AboutDialog::AboutDialog(QWidget *parent) :
connect(buttons, &QDialogButtonBox::accepted, this, &QDialog::accept);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/about/about.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief The AboutDialog class
@@ -49,6 +49,6 @@ public:
explicit AboutDialog(QWidget *parent = nullptr);
};
OLIVE_NAMESPACE_EXIT
}
#endif // ABOUTDIALOG_H
app/dialog/actionsearch/actionsearch.cpp
+2 -2
View File
@@ -25,7 +25,7 @@
#include <QMenuBar>
#include <QLabel>
OLIVE_NAMESPACE_ENTER
namespace olive {
ActionSearch::ActionSearch(QWidget *parent) :
QDialog(parent),
@@ -254,4 +254,4 @@ void ActionSearchList::mouseDoubleClickEvent(QMouseEvent *) {
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/actionsearch/actionsearch.h
+2 -2
View File
@@ -29,7 +29,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ActionSearchList;
@@ -182,6 +182,6 @@ signals:
void moveSelectionDown();
};
OLIVE_NAMESPACE_EXIT
}
#endif // ACTIONSEARCH_H
app/dialog/color/colordialog.cpp
+2 -2
View File
@@ -26,7 +26,7 @@
#include "common/qtutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ColorDialog::ColorDialog(ColorManager* color_manager, const ManagedColor& start, QWidget *parent) :
QDialog(parent),
@@ -160,4 +160,4 @@ void ColorDialog::ColorSpaceChanged(const QString &input, const ColorTransform &
color_values_widget_->SetColorProcessor(input_to_ref_processor_, ref_to_display, nullptr, ref_to_input);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/color/colordialog.h
+2 -2
View File
@@ -31,7 +31,7 @@
#include "widget/colorwheel/colorvalueswidget.h"
#include "widget/colorwheel/colorwheelwidget.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ColorDialog : public QDialog
{
@@ -87,6 +87,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // COLORDIALOG_H
app/dialog/crashhandler/crashhandler.cpp
+2 -2
View File
@@ -36,7 +36,7 @@
#include "common/crashpadutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
CrashHandlerDialog::CrashHandlerDialog(const char *report_dir, const char* crash_time)
{
@@ -208,4 +208,4 @@ void CrashHandlerDialog::SendErrorReport()
manager->post(request, multipart);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/crashhandler/crashhandler.h
+2 -2
View File
@@ -30,7 +30,7 @@
#include "common/define.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class CrashHandlerDialog : public QDialog
{
@@ -72,6 +72,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // CRASHHANDLERDIALOG_H
app/dialog/crashhandler/crashhandlermain.cpp
+1 -1
View File
@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
QApplication a(argc, argv);
OLIVE_NAMESPACE::CrashHandlerDialog chd(argv[1], argv[2]);
olive::CrashHandlerDialog chd(argv[1], argv[2]);
chd.open();
return a.exec();
app/dialog/diskcache/diskcachedialog.cpp
+2 -2
View File
@@ -27,7 +27,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
DiskCacheDialog::DiskCacheDialog(DiskCacheFolder *folder, QWidget* parent) :
QDialog(parent),
@@ -104,4 +104,4 @@ void DiskCacheDialog::ClearDiskCache()
}
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/diskcache/diskcachedialog.h
+2 -2
View File
@@ -28,7 +28,7 @@
#include "render/diskmanager.h"
#include "widget/slider/floatslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class DiskCacheDialog : public QDialog
{
@@ -53,6 +53,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // DISKCACHEDIALOG_H
app/dialog/export/codec/codecsection.cpp
+2 -2
View File
@@ -20,11 +20,11 @@
#include "codecsection.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
CodecSection::CodecSection(QWidget *parent) :
QWidget(parent)
{
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/export/codec/codecsection.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "codec/encoder.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class CodecSection : public QWidget
{
@@ -37,6 +37,6 @@ public:
};
OLIVE_NAMESPACE_EXIT
}
#endif // CODECSECTION_H
app/dialog/export/codec/h264section.cpp
+2 -2
View File
@@ -28,7 +28,7 @@
#include "common/qtutils.h"
#include "widget/slider/integerslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
H264Section::H264Section(QWidget *parent) :
CodecSection(parent)
@@ -208,4 +208,4 @@ int64_t H264FileSizeSection::GetFileSize() const
return qRound64(file_size_->GetValue() * 1024.0 * 1024.0 * 8.0);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/export/codec/h264section.h
+2 -2
View File
@@ -27,7 +27,7 @@
#include "codecsection.h"
#include "widget/slider/floatslider.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class H264CRFSection : public QWidget
{
@@ -112,6 +112,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // H264SECTION_H
app/dialog/export/codec/imagesection.cpp
+2 -2
View File
@@ -23,7 +23,7 @@
#include <QGridLayout>
#include <QLabel>
OLIVE_NAMESPACE_ENTER
namespace olive {
ImageSection::ImageSection(QWidget* parent) :
CodecSection(parent)
@@ -44,4 +44,4 @@ QCheckBox *ImageSection::image_sequence_checkbox() const
return image_sequence_checkbox_;
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/export/codec/imagesection.h
+2 -2
View File
@@ -25,7 +25,7 @@
#include "codecsection.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ImageSection : public CodecSection
{
@@ -40,6 +40,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // IMAGESECTION_H
app/dialog/export/export.cpp
+2 -2
View File
@@ -37,7 +37,7 @@
#include "project/project.h"
#include "ui/icons/icons.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
ExportDialog::ExportDialog(ViewerOutput *viewer_node, TimelinePoints *points, QWidget *parent) :
QDialog(parent),
@@ -507,4 +507,4 @@ void ExportDialog::UpdateViewerDimensions()
preview_viewer_->SetMatrix(transform);
}
OLIVE_NAMESPACE_EXIT
}
app/dialog/export/export.h
+2 -2
View File
@@ -34,7 +34,7 @@
#include "task/export/export.h"
#include "widget/viewer/viewer.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class ExportDialog : public QDialog
{
@@ -95,6 +95,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // EXPORTDIALOG_H

Some files were not shown because too many files have changed in this diff Show More