diff --git a/app/audio/audiomanager.cpp b/app/audio/audiomanager.cpp index 956c4a624..aee368c84 100644 --- a/app/audio/audiomanager.cpp +++ b/app/audio/audiomanager.cpp @@ -24,6 +24,8 @@ #include "config/config.h" +OLIVE_NAMESPACE_ENTER + AudioManager* AudioManager::instance_ = nullptr; void AudioManager::CreateInstance() @@ -282,3 +284,5 @@ void AudioRefreshDevicesObject::Refresh() emit ListsReady(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/audio/audiomanager.h b/app/audio/audiomanager.h index 73e990114..79faef13e 100644 --- a/app/audio/audiomanager.h +++ b/app/audio/audiomanager.h @@ -26,9 +26,12 @@ #include #include +#include "common/define.h" #include "outputmanager.h" #include "render/audioparams.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A thread for refreshing the total list of devices on the system * @@ -133,4 +136,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // AUDIOMANAGER_H diff --git a/app/audio/bufferaverage.cpp b/app/audio/bufferaverage.cpp index acfc0b347..4d47bee3b 100644 --- a/app/audio/bufferaverage.cpp +++ b/app/audio/bufferaverage.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "bufferaverage.h" +OLIVE_NAMESPACE_ENTER + QVector AudioBufferAverage::ProcessAverages(const char *data, int length) { // FIXME: Assumes float and stereo @@ -18,3 +40,5 @@ QVector AudioBufferAverage::ProcessAverages(const char *data, int length return averages; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/audio/bufferaverage.h b/app/audio/bufferaverage.h index 62d07066c..b2b31ebd5 100644 --- a/app/audio/bufferaverage.h +++ b/app/audio/bufferaverage.h @@ -1,8 +1,32 @@ +/*** + + 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 . + +***/ + #ifndef AUDIOBUFFERAVERAGE_H #define AUDIOBUFFERAVERAGE_H #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class AudioBufferAverage { public: @@ -11,4 +35,6 @@ public: static QVector ProcessAverages(const char* data, int length); }; +OLIVE_NAMESPACE_EXIT + #endif // AUDIOBUFFERAVERAGE_H diff --git a/app/audio/outputdeviceproxy.cpp b/app/audio/outputdeviceproxy.cpp index 7f2625bea..3b48cb6c5 100644 --- a/app/audio/outputdeviceproxy.cpp +++ b/app/audio/outputdeviceproxy.cpp @@ -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 . + +***/ + #include "outputdeviceproxy.h" #include "audiomanager.h" #include "bufferaverage.h" +OLIVE_NAMESPACE_ENTER + AudioOutputDeviceProxy::AudioOutputDeviceProxy() : device_(nullptr), send_averages_(false) @@ -117,3 +139,5 @@ qint64 AudioOutputDeviceProxy::ReverseAwareRead(char *data, qint64 maxlen) return read_count; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/audio/outputdeviceproxy.h b/app/audio/outputdeviceproxy.h index 48332282e..515f27a2e 100644 --- a/app/audio/outputdeviceproxy.h +++ b/app/audio/outputdeviceproxy.h @@ -1,10 +1,33 @@ +/*** + + 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 . + +***/ + #ifndef AUDIOOUTPUTDEVICEPROXY_H #define AUDIOOUTPUTDEVICEPROXY_H #include +#include "common/define.h" #include "tempoprocessor.h" +OLIVE_NAMESPACE_ENTER + class AudioOutputDeviceProxy : public QIODevice { Q_OBJECT @@ -42,4 +65,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // AUDIOOUTPUTDEVICEPROXY_H diff --git a/app/audio/outputmanager.cpp b/app/audio/outputmanager.cpp index 8d601f07c..d92ad4934 100644 --- a/app/audio/outputmanager.cpp +++ b/app/audio/outputmanager.cpp @@ -25,6 +25,8 @@ #include "bufferaverage.h" +OLIVE_NAMESPACE_ENTER + AudioOutputManager::AudioOutputManager(QObject *parent) : QObject(parent), output_(nullptr), @@ -151,3 +153,5 @@ void AudioOutputManager::ProcessAverages(const char *data, int length) emit SentSamples(AudioBufferAverage::ProcessAverages(data, length)); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/audio/outputmanager.h b/app/audio/outputmanager.h index 06024f4d1..c10af3bc1 100644 --- a/app/audio/outputmanager.h +++ b/app/audio/outputmanager.h @@ -29,6 +29,8 @@ #include "outputdeviceproxy.h" +OLIVE_NAMESPACE_ENTER + class AudioOutputManager : public QObject { Q_OBJECT @@ -88,4 +90,6 @@ private slots: void PushMoreSamples(); }; +OLIVE_NAMESPACE_EXIT + #endif // AUDIOHYBRIDDEVICE_H diff --git a/app/audio/sampleformat.cpp b/app/audio/sampleformat.cpp index 6954c0a4a..e8ed5f2e1 100644 --- a/app/audio/sampleformat.cpp +++ b/app/audio/sampleformat.cpp @@ -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 . + +***/ + #include "sampleformat.h" #include "core.h" +OLIVE_NAMESPACE_ENTER + QString SampleFormat::GetSampleFormatName(const SampleFormat::Format &f) { switch (f) { @@ -35,3 +57,5 @@ void SampleFormat::SetConfiguredFormatForMode(RenderMode::Mode mode, SampleForma { Core::SetPreferenceForRenderMode(mode, QStringLiteral("SampleFormat"), format); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/audio/sampleformat.h b/app/audio/sampleformat.h index 2c03227ba..e2a1ada66 100644 --- a/app/audio/sampleformat.h +++ b/app/audio/sampleformat.h @@ -23,8 +23,11 @@ #include +#include "common/define.h" #include "render/rendermodes.h" +OLIVE_NAMESPACE_ENTER + class SampleFormat : public QObject { Q_OBJECT @@ -51,4 +54,6 @@ public: }; +OLIVE_NAMESPACE_EXIT + #endif // SAMPLEFORMAT_H diff --git a/app/audio/sumsamples.cpp b/app/audio/sumsamples.cpp index 92c60efc0..3aa5db702 100644 --- a/app/audio/sumsamples.cpp +++ b/app/audio/sumsamples.cpp @@ -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 . + +***/ + #include "sumsamples.h" #include +OLIVE_NAMESPACE_ENTER + const int SampleSummer::kSumSampleRate = 200; QVector SampleSummer::SumSamples(const float *samples, int nb_samples, int nb_channels) @@ -84,3 +106,5 @@ SampleSummer::Info::Info() { channels = 0; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/audio/sumsamples.h b/app/audio/sumsamples.h index 0985909c4..00d8b4e92 100644 --- a/app/audio/sumsamples.h +++ b/app/audio/sumsamples.h @@ -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 . + +***/ + #ifndef SUMSAMPLES_H #define SUMSAMPLES_H @@ -6,6 +26,8 @@ #include "codec/samplebuffer.h" +OLIVE_NAMESPACE_ENTER + class SampleSummer { public: struct Sum { @@ -39,4 +61,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // SUMSAMPLES_H diff --git a/app/audio/tempoprocessor.cpp b/app/audio/tempoprocessor.cpp index 196476b43..f717aa71a 100644 --- a/app/audio/tempoprocessor.cpp +++ b/app/audio/tempoprocessor.cpp @@ -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 . + +***/ + #include "tempoprocessor.h" extern "C" { @@ -10,6 +30,8 @@ extern "C" { #include "codec/ffmpeg/ffmpegcommon.h" +OLIVE_NAMESPACE_ENTER + TempoProcessor::TempoProcessor() : filter_graph_(nullptr), buffersrc_ctx_(nullptr), @@ -251,3 +273,5 @@ AVFilterContext *TempoProcessor::CreateTempoFilter(AVFilterGraph* graph, AVFilte return nullptr; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/audio/tempoprocessor.h b/app/audio/tempoprocessor.h index e99aaca77..3fd3c10b0 100644 --- a/app/audio/tempoprocessor.h +++ b/app/audio/tempoprocessor.h @@ -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 . + +***/ + #ifndef TEMPOPROCESSOR_H #define TEMPOPROCESSOR_H @@ -15,6 +35,8 @@ extern "C" { #include "render/audioparams.h" +OLIVE_NAMESPACE_ENTER + class TempoProcessor { public: @@ -56,4 +78,6 @@ private: bool flushed_; }; +OLIVE_NAMESPACE_EXIT + #endif // TEMPOPROCESSOR_H diff --git a/app/codec/decoder.cpp b/app/codec/decoder.cpp index 1ebdf9d35..193d675a9 100644 --- a/app/codec/decoder.cpp +++ b/app/codec/decoder.cpp @@ -33,6 +33,8 @@ #include "task/index/index.h" #include "task/taskmanager.h" +OLIVE_NAMESPACE_ENTER + Decoder::Decoder() : open_(false), stream_(nullptr) @@ -142,7 +144,7 @@ bool Decoder::ProbeMedia(Footage *f, const QAtomicInt* cancelled) QMetaObject::invokeMethod(IndexManager::instance(), "StartIndexingStream", Qt::QueuedConnection, - Q_ARG(StreamPtr, stream)); + OLIVE_NS_ARG(StreamPtr, stream)); } } @@ -357,3 +359,5 @@ void Decoder::SignalIndexProgress(const int64_t &ts) emit IndexProgress(qRound(100.0 * static_cast(ts) / static_cast(stream()->duration()))); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/codec/decoder.h b/app/codec/decoder.h index 1517ebaa3..de617955f 100644 --- a/app/codec/decoder.h +++ b/app/codec/decoder.h @@ -21,6 +21,10 @@ #ifndef DECODER_H #define DECODER_H +extern "C" { +#include +} + #include #include #include @@ -32,11 +36,11 @@ #include "common/rational.h" #include "project/item/footage/footage.h" +OLIVE_NAMESPACE_ENTER + class Decoder; using DecoderPtr = std::shared_ptr; -struct SwrContext; - /** * @brief A decoder's is the main class for bringing external media into Olive * @@ -276,6 +280,8 @@ private: }; -Q_DECLARE_METATYPE(Decoder::RetrieveState) +OLIVE_NAMESPACE_EXIT + +Q_DECLARE_METATYPE(OLIVE_NAMESPACE::Decoder::RetrieveState) #endif // DECODER_H diff --git a/app/codec/encoder.cpp b/app/codec/encoder.cpp index 122b97609..301232219 100644 --- a/app/codec/encoder.cpp +++ b/app/codec/encoder.cpp @@ -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 . + +***/ + #include "encoder.h" #include "ffmpeg/ffmpegencoder.h" +OLIVE_NAMESPACE_ENTER + Encoder::Encoder(const EncodingParams ¶ms) : params_(params), open_(false) @@ -168,3 +190,5 @@ void Encoder::Close() emit Closed(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/codec/encoder.h b/app/codec/encoder.h index 3b7bfdb39..7b897d15b 100644 --- a/app/codec/encoder.h +++ b/app/codec/encoder.h @@ -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 . + +***/ + #ifndef ENCODER_H #define ENCODER_H @@ -10,6 +30,8 @@ #include "render/audioparams.h" #include "render/videoparams.h" +OLIVE_NAMESPACE_ENTER + class Encoder; using EncoderPtr = std::shared_ptr; @@ -82,8 +104,8 @@ public: public slots: void Open(); - void WriteFrame(FramePtr frame); - virtual void WriteAudio(const AudioRenderingParams& pcm_info, const QString& pcm_filename, const TimeRange &range) = 0; + void WriteFrame(OLIVE_NAMESPACE::FramePtr frame); + virtual void WriteAudio(OLIVE_NAMESPACE::AudioRenderingParams pcm_info, const QString& pcm_filename, OLIVE_NAMESPACE::TimeRange range) = 0; void Close(); signals: @@ -107,4 +129,6 @@ private: bool open_; }; +OLIVE_NAMESPACE_EXIT + #endif // ENCODER_H diff --git a/app/codec/ffmpeg/ffmpegcommon.cpp b/app/codec/ffmpeg/ffmpegcommon.cpp index 7d560d28c..f66804048 100644 --- a/app/codec/ffmpeg/ffmpegcommon.cpp +++ b/app/codec/ffmpeg/ffmpegcommon.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "ffmpegcommon.h" +OLIVE_NAMESPACE_ENTER + AVPixelFormat FFmpegCommon::GetCompatiblePixelFormat(const AVPixelFormat &pix_fmt) { AVPixelFormat possible_pix_fmts[] = { @@ -113,3 +135,5 @@ PixelFormat::Format FFmpegCommon::GetCompatiblePixelFormat(const PixelFormat::Fo return PixelFormat::PIX_FMT_INVALID; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/codec/ffmpeg/ffmpegcommon.h b/app/codec/ffmpeg/ffmpegcommon.h index 5383e1e97..106452fad 100644 --- a/app/codec/ffmpeg/ffmpegcommon.h +++ b/app/codec/ffmpeg/ffmpegcommon.h @@ -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 . + +***/ + #ifndef FFMPEGABSTRACTION_H #define FFMPEGABSTRACTION_H @@ -8,6 +28,8 @@ extern "C" { #include "audio/sampleformat.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + class FFmpegCommon { public: /** @@ -36,4 +58,6 @@ public: static AVSampleFormat GetFFmpegSampleFormat(const SampleFormat::Format &smp_fmt); }; +OLIVE_NAMESPACE_EXIT + #endif // FFMPEGABSTRACTION_H diff --git a/app/codec/ffmpeg/ffmpegdecoder.cpp b/app/codec/ffmpeg/ffmpegdecoder.cpp index ab9c290ae..3117b0fb6 100644 --- a/app/codec/ffmpeg/ffmpegdecoder.cpp +++ b/app/codec/ffmpeg/ffmpegdecoder.cpp @@ -42,6 +42,8 @@ extern "C" { #include "render/diskmanager.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + FFmpegDecoder::FFmpegDecoder() : fmt_ctx_(nullptr), codec_ctx_(nullptr), @@ -992,3 +994,5 @@ void FFmpegDecoder::ClearTimerEvent() cache_at_zero_ = false; cached_frames_.remove_old_frames(QDateTime::currentMSecsSinceEpoch() - clear_timer_.interval()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/codec/ffmpeg/ffmpegdecoder.h b/app/codec/ffmpeg/ffmpegdecoder.h index 8a95d7544..8213426c1 100644 --- a/app/codec/ffmpeg/ffmpegdecoder.h +++ b/app/codec/ffmpeg/ffmpegdecoder.h @@ -37,6 +37,8 @@ extern "C" { #include "ffmpegframecache.h" #include "project/item/footage/videostream.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A Decoder derivative that wraps FFmpeg functions as on Olive decoder */ @@ -134,4 +136,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // FFMPEGDECODER_H diff --git a/app/codec/ffmpeg/ffmpegencoder.cpp b/app/codec/ffmpeg/ffmpegencoder.cpp index 3e21054e4..128744755 100644 --- a/app/codec/ffmpeg/ffmpegencoder.cpp +++ b/app/codec/ffmpeg/ffmpegencoder.cpp @@ -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 . + +***/ + #include "ffmpegencoder.h" #include @@ -5,6 +25,8 @@ #include "ffmpegcommon.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + FFmpegEncoder::FFmpegEncoder(const EncodingParams ¶ms) : Encoder(params), fmt_ctx_(nullptr), @@ -17,7 +39,7 @@ FFmpegEncoder::FFmpegEncoder(const EncodingParams ¶ms) : { } -void FFmpegEncoder::WriteAudio(const AudioRenderingParams &pcm_info, const QString &pcm_filename, const TimeRange& range) +void FFmpegEncoder::WriteAudio(AudioRenderingParams pcm_info, const QString &pcm_filename, TimeRange range) { QFile pcm(pcm_filename); if (pcm.open(QFile::ReadOnly)) { @@ -504,3 +526,5 @@ void FFmpegEncoder::Error(const QString &s) Close(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/codec/ffmpeg/ffmpegencoder.h b/app/codec/ffmpeg/ffmpegencoder.h index 99cc01035..e995cb4ba 100644 --- a/app/codec/ffmpeg/ffmpegencoder.h +++ b/app/codec/ffmpeg/ffmpegencoder.h @@ -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 . + +***/ + #ifndef FFMPEGENCODER_H #define FFMPEGENCODER_H @@ -10,6 +30,8 @@ extern "C" { #include "codec/encoder.h" +OLIVE_NAMESPACE_ENTER + class FFmpegEncoder : public Encoder { Q_OBJECT @@ -17,7 +39,7 @@ public: FFmpegEncoder(const EncodingParams ¶ms); public slots: - virtual void WriteAudio(const AudioRenderingParams& pcm_info, const QString& pcm_filename, const TimeRange &range) override; + virtual void WriteAudio(OLIVE_NAMESPACE::AudioRenderingParams pcm_info, const QString& pcm_filename, OLIVE_NAMESPACE::TimeRange range) override; protected: virtual bool OpenInternal() override; @@ -66,4 +88,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // FFMPEGENCODER_H diff --git a/app/codec/ffmpeg/ffmpegframecache.cpp b/app/codec/ffmpeg/ffmpegframecache.cpp index e56d61fad..6f0a0313b 100644 --- a/app/codec/ffmpeg/ffmpegframecache.cpp +++ b/app/codec/ffmpeg/ffmpegframecache.cpp @@ -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 . + +***/ + #include "ffmpegframecache.h" #include #include +OLIVE_NAMESPACE_ENTER + QMutex FFmpegFrameCache::pool_lock_; QList FFmpegFrameCache::frame_pool_; @@ -97,3 +119,5 @@ void FFmpegFrameCache::Release(Frame *f) frame_pool_.append(f); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/codec/ffmpeg/ffmpegframecache.h b/app/codec/ffmpeg/ffmpegframecache.h index dde66744c..20d75a5f9 100644 --- a/app/codec/ffmpeg/ffmpegframecache.h +++ b/app/codec/ffmpeg/ffmpegframecache.h @@ -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 . + +***/ + #ifndef FFMPEGFRAMECACHE_H #define FFMPEGFRAMECACHE_H @@ -7,6 +27,8 @@ #include "codec/frame.h" #include "render/videoparams.h" +OLIVE_NAMESPACE_ENTER + class FFmpegFrameCache { public: @@ -53,4 +75,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // FFMPEGFRAMECACHE_H diff --git a/app/codec/frame.cpp b/app/codec/frame.cpp index b19ae2b04..0b23ce968 100644 --- a/app/codec/frame.cpp +++ b/app/codec/frame.cpp @@ -23,6 +23,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + Frame::Frame() : timestamp_(0), sample_aspect_ratio_(1) @@ -147,3 +149,5 @@ int Frame::allocated_size() const { return data_.size(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/codec/frame.h b/app/codec/frame.h index adf1bab82..0c3e1e8ed 100644 --- a/app/codec/frame.h +++ b/app/codec/frame.h @@ -29,6 +29,8 @@ #include "render/pixelformat.h" #include "render/videoparams.h" +OLIVE_NAMESPACE_ENTER + class Frame; using FramePtr = std::shared_ptr; @@ -122,6 +124,8 @@ private: }; -Q_DECLARE_METATYPE(FramePtr) +OLIVE_NAMESPACE_EXIT + +Q_DECLARE_METATYPE(OLIVE_NAMESPACE::FramePtr) #endif // FRAME_H diff --git a/app/codec/oiio/oiiodecoder.cpp b/app/codec/oiio/oiiodecoder.cpp index 1712829b8..d097a2648 100644 --- a/app/codec/oiio/oiiodecoder.cpp +++ b/app/codec/oiio/oiiodecoder.cpp @@ -30,6 +30,8 @@ #include "config/config.h" #include "core.h" +OLIVE_NAMESPACE_ENTER + QStringList OIIODecoder::supported_formats_; OIIODecoder::OIIODecoder() : @@ -347,3 +349,5 @@ void OIIODecoder::CloseImageHandle() buffer_ = nullptr; } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/codec/oiio/oiiodecoder.h b/app/codec/oiio/oiiodecoder.h index 657758bd8..51d27de32 100644 --- a/app/codec/oiio/oiiodecoder.h +++ b/app/codec/oiio/oiiodecoder.h @@ -27,6 +27,8 @@ #include "codec/decoder.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + class OIIODecoder : public Decoder { Q_OBJECT @@ -78,4 +80,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // OIIODECODER_H diff --git a/app/codec/samplebuffer.cpp b/app/codec/samplebuffer.cpp index 54306e8cf..1c5053f33 100644 --- a/app/codec/samplebuffer.cpp +++ b/app/codec/samplebuffer.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "samplebuffer.h" +OLIVE_NAMESPACE_ENTER + SampleBuffer::SampleBuffer() : sample_count_per_channel_(0), data_(nullptr) @@ -252,3 +274,5 @@ void SampleBuffer::destroy_sample_buffer(float ***data, int nb_channels) *data = nullptr; } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/codec/samplebuffer.h b/app/codec/samplebuffer.h index feb2541a3..0a68c533f 100644 --- a/app/codec/samplebuffer.h +++ b/app/codec/samplebuffer.h @@ -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 . + +***/ + #ifndef SAMPLEBUFFER_H #define SAMPLEBUFFER_H @@ -6,6 +26,8 @@ #include "common/constructors.h" #include "render/audioparams.h" +OLIVE_NAMESPACE_ENTER + class SampleBuffer; using SampleBufferPtr = std::shared_ptr; @@ -69,6 +91,8 @@ private: }; -Q_DECLARE_METATYPE(SampleBufferPtr) +OLIVE_NAMESPACE_EXIT + +Q_DECLARE_METATYPE(OLIVE_NAMESPACE::SampleBufferPtr) #endif // SAMPLEBUFFER_H diff --git a/app/codec/waveinput.cpp b/app/codec/waveinput.cpp index 1bc2a23f9..f93c3c07f 100644 --- a/app/codec/waveinput.cpp +++ b/app/codec/waveinput.cpp @@ -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 . + +***/ + #include "waveinput.h" extern "C" { @@ -7,6 +27,8 @@ extern "C" { #include #include +OLIVE_NAMESPACE_ENTER + WaveInput::WaveInput(const QString &f) : file_(f) { @@ -216,3 +238,5 @@ qint64 WaveInput::calculate_max_read() const { return data_size_ - (file_.pos() - data_position_ ); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/codec/waveinput.h b/app/codec/waveinput.h index 1afb49f11..bd4e7e5d8 100644 --- a/app/codec/waveinput.h +++ b/app/codec/waveinput.h @@ -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 . + +***/ + #ifndef WAVEINPUT_H #define WAVEINPUT_H @@ -6,6 +26,8 @@ #include "common/constructors.h" #include "render/audioparams.h" +OLIVE_NAMESPACE_ENTER + class WaveInput { public: @@ -49,4 +71,6 @@ private: quint32 data_size_; }; +OLIVE_NAMESPACE_EXIT + #endif // WAVEINPUT_H diff --git a/app/codec/waveoutput.cpp b/app/codec/waveoutput.cpp index 21f749be2..fb71bbcab 100644 --- a/app/codec/waveoutput.cpp +++ b/app/codec/waveoutput.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "waveoutput.h" +OLIVE_NAMESPACE_ENTER + const int16_t kWAVIntegerFormat = 1; const int16_t kWAVFloatFormat = 3; @@ -152,3 +174,5 @@ void WaveOutput::write_int(QFile *file, T integer) file->write(bytes); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/codec/waveoutput.h b/app/codec/waveoutput.h index 8d12df0ce..71eb1cd8e 100644 --- a/app/codec/waveoutput.h +++ b/app/codec/waveoutput.h @@ -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 . + +***/ + #ifndef WAVEAUDIO_H #define WAVEAUDIO_H @@ -8,6 +28,8 @@ #include "common/constructors.h" #include "render/audioparams.h" +OLIVE_NAMESPACE_ENTER + class WaveOutput { public: @@ -43,4 +65,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // WAVEAUDIO_H diff --git a/app/common/autoscroll.h b/app/common/autoscroll.h index 5331267d2..b4e8e34ef 100644 --- a/app/common/autoscroll.h +++ b/app/common/autoscroll.h @@ -1,6 +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 . + +***/ + #ifndef AUTOSCROLL_H #define AUTOSCROLL_H +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class AutoScroll { public: enum Method { @@ -10,4 +34,6 @@ public: }; }; +OLIVE_NAMESPACE_EXIT + #endif // AUTOSCROLL_H diff --git a/app/common/bezier.cpp b/app/common/bezier.cpp index 9e287f9a7..46d5b8e3e 100644 --- a/app/common/bezier.cpp +++ b/app/common/bezier.cpp @@ -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 . + +***/ + #include "bezier.h" #include +OLIVE_NAMESPACE_ENTER + double Bezier::QuadraticXtoT(double x, double a, double b, double c) { return (a - b + qSqrt(a*x + c*x - 2*b*x + qPow(b, 2) - a*c))/(a - 2*b + c); @@ -40,3 +62,5 @@ 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 diff --git a/app/common/bezier.h b/app/common/bezier.h index b5991d1bd..b353fba95 100644 --- a/app/common/bezier.h +++ b/app/common/bezier.h @@ -1,6 +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 . + +***/ + #ifndef BEZIER_H #define BEZIER_H +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER class Bezier { @@ -14,4 +37,6 @@ public: static double CubicTtoY(double a, double b, double c, double d, double t); }; +OLIVE_NAMESPACE_EXIT + #endif // BEZIER_H diff --git a/app/common/cancelableobject.h b/app/common/cancelableobject.h index 008a97bfe..19364a521 100644 --- a/app/common/cancelableobject.h +++ b/app/common/cancelableobject.h @@ -1,8 +1,32 @@ +/*** + + 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 . + +***/ + #ifndef CANCELABLEOBJECT_H #define CANCELABLEOBJECT_H #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class CancelableObject { public: CancelableObject() : @@ -23,4 +47,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // CANCELABLEOBJECT_H diff --git a/app/common/constructors.h b/app/common/constructors.h index 592020687..07743c41c 100644 --- a/app/common/constructors.h +++ b/app/common/constructors.h @@ -1,6 +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 . + +***/ + #ifndef CONSTRUCTORS_H #define CONSTRUCTORS_H +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + /** * Copy/move deleters. Similar to Q_DISABLE_COPY_MOVE, et al. but those functions are not present in Qt < 5.13 so we * use our own functions for portability. @@ -18,4 +42,6 @@ DISABLE_COPY(Class) \ DISABLE_MOVE(Class) +OLIVE_NAMESPACE_EXIT + #endif // CONSTRUCTORS_H diff --git a/app/common/crashhandler.cpp b/app/common/crashhandler.cpp index 27958f543..df8156525 100644 --- a/app/common/crashhandler.cpp +++ b/app/common/crashhandler.cpp @@ -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 . + +***/ + #include "crashhandler.h" #include @@ -17,6 +37,8 @@ #include #endif +OLIVE_NAMESPACE_ENTER + void crash_handler(int sig) { QString log_path = QDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation)).filePath(QStringLiteral("olive_crash")); QFile output(log_path); @@ -118,3 +140,5 @@ void crash_handler(int sig) { exit(1); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/common/crashhandler.h b/app/common/crashhandler.h index 4044cdc5e..10ed30627 100644 --- a/app/common/crashhandler.h +++ b/app/common/crashhandler.h @@ -1,6 +1,32 @@ +/*** + + 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 . + +***/ + #ifndef CRASHHANDLER_H #define CRASHHANDLER_H +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + void crash_handler(int sig); +OLIVE_NAMESPACE_EXIT + #endif // CRASHHANDLER_H diff --git a/app/common/debug.cpp b/app/common/debug.cpp index 644917dda..b2e79ab6e 100644 --- a/app/common/debug.cpp +++ b/app/common/debug.cpp @@ -1,5 +1,26 @@ +/*** + + 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 . + +***/ + #include "debug.h" +OLIVE_NAMESPACE_ENTER void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { @@ -32,3 +53,5 @@ void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QStri fflush(stderr); #endif } + +OLIVE_NAMESPACE_EXIT diff --git a/app/common/debug.h b/app/common/debug.h index 39446adb8..a916e1857 100644 --- a/app/common/debug.h +++ b/app/common/debug.h @@ -1,8 +1,34 @@ +/*** + + 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 . + +***/ + #ifndef DEBUG_H #define DEBUG_H #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + void DebugHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg); +OLIVE_NAMESPACE_EXIT + #endif // DEBUG_H diff --git a/app/common/define.h b/app/common/define.h index 5f5dc8fc8..294388c17 100644 --- a/app/common/define.h +++ b/app/common/define.h @@ -21,6 +21,14 @@ #ifndef OLIVECOMMONDEFINE_H #define OLIVECOMMONDEFINE_H +#define OLIVE_NAMESPACE olive + +#define OLIVE_NAMESPACE_ENTER namespace OLIVE_NAMESPACE { + +#define OLIVE_NAMESPACE_EXIT } + +OLIVE_NAMESPACE_ENTER + const int kHSVChannels = 3; const int kRGBChannels = 3; const int kRGBAChannels = 4; @@ -34,8 +42,11 @@ const int kProjectIconSizeMaximum = 256; /// The default size an icon in ProjectExplorer can be const int kProjectIconSizeDefault = 64; -#define OLIVE_NAMESPACE_ENTER namespace olive { +OLIVE_NAMESPACE_EXIT -#define OLIVE_NAMESPACE_EXIT } +#define MACRO_NAME_AS_STR(s) #s +#define MACRO_VAL_AS_STR(s) MACRO_NAME_AS_STR(s) + +#define OLIVE_NS_ARG(x, y) QArgument(MACRO_VAL_AS_STR(OLIVE_NAMESPACE) "::" #x, y) #endif // OLIVECOMMONDEFINE_H diff --git a/app/common/filefunctions.cpp b/app/common/filefunctions.cpp index dcebb68db..4282e9d56 100644 --- a/app/common/filefunctions.cpp +++ b/app/common/filefunctions.cpp @@ -29,6 +29,8 @@ #include "config/config.h" +OLIVE_NAMESPACE_ENTER + QString GetUniqueFileIdentifier(const QString &filename) { QFileInfo info(filename); @@ -95,3 +97,5 @@ QString GetApplicationPath() { return QCoreApplication::applicationDirPath(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/common/filefunctions.h b/app/common/filefunctions.h index d1f79abf9..9fd8fd009 100644 --- a/app/common/filefunctions.h +++ b/app/common/filefunctions.h @@ -23,6 +23,10 @@ #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + bool IsPortable(); QString GetUniqueFileIdentifier(const QString& filename); @@ -37,4 +41,6 @@ QString GetConfigurationLocation(); QString GetApplicationPath(); +OLIVE_NAMESPACE_EXIT + #endif // FILEFUNCTIONS_H diff --git a/app/common/flipmodifiers.cpp b/app/common/flipmodifiers.cpp index 3652babcf..d7314fd11 100644 --- a/app/common/flipmodifiers.cpp +++ b/app/common/flipmodifiers.cpp @@ -20,6 +20,8 @@ #include "flipmodifiers.h" +OLIVE_NAMESPACE_ENTER + Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e) { if (e & Qt::ControlModifier & Qt::ShiftModifier) { return e; @@ -35,3 +37,5 @@ Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e) { return e; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/common/flipmodifiers.h b/app/common/flipmodifiers.h index 8fb754eda..b34727327 100644 --- a/app/common/flipmodifiers.h +++ b/app/common/flipmodifiers.h @@ -23,6 +23,12 @@ #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + Qt::KeyboardModifiers FlipControlAndShiftModifiers(Qt::KeyboardModifiers e); +OLIVE_NAMESPACE_EXIT + #endif // FLIPMODIFIERS_H diff --git a/app/common/functiontimer.h b/app/common/functiontimer.h index 119aecd1d..87735bd6e 100644 --- a/app/common/functiontimer.h +++ b/app/common/functiontimer.h @@ -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 . + +***/ + #ifndef FUNCTIONTIMER_H #define FUNCTIONTIMER_H diff --git a/app/common/qtutils.cpp b/app/common/qtutils.cpp index 0dc8090ec..a745d5443 100644 --- a/app/common/qtutils.cpp +++ b/app/common/qtutils.cpp @@ -20,6 +20,8 @@ #include "qtutils.h" +OLIVE_NAMESPACE_ENTER + int QFontMetricsWidth(QFontMetrics fm, const QString& s) { #if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) return fm.width(s); @@ -27,3 +29,5 @@ int QFontMetricsWidth(QFontMetrics fm, const QString& s) { return fm.horizontalAdvance(s); #endif } + +OLIVE_NAMESPACE_EXIT diff --git a/app/common/qtutils.h b/app/common/qtutils.h index c4ed17e7f..10f30f21b 100644 --- a/app/common/qtutils.h +++ b/app/common/qtutils.h @@ -29,6 +29,10 @@ #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + /** * @brief Retrieves the width of a string according to certain QFontMetrics * @@ -37,4 +41,6 @@ */ int QFontMetricsWidth(QFontMetrics fm, const QString& s); +OLIVE_NAMESPACE_EXIT + #endif // QTVERSIONABSTRACTION_H diff --git a/app/common/rational.cpp b/app/common/rational.cpp index 5be6f04f3..06793cba1 100644 --- a/app/common/rational.cpp +++ b/app/common/rational.cpp @@ -3,6 +3,8 @@ #include "rational.h" +OLIVE_NAMESPACE_ENTER + rational::rational(const AVRational &r) : numer(r.num), denom(r.den) @@ -32,7 +34,7 @@ rational rational::fromString(const QString &str) //Function: print number to cout -void rational::print(ostream &out) const +void rational::print(std::ostream &out) const { out << this->numer << "/" << this->denom; } @@ -425,7 +427,7 @@ bool rational::operator!() const //IO -ostream& operator<<(ostream &out, const rational &value) +std::ostream& operator<<(std::ostream &out, const rational &value) { out << value.numer; if(value.denom != 1) @@ -436,7 +438,7 @@ ostream& operator<<(ostream &out, const rational &value) return out; } -istream& operator>>(istream &in, rational &value) +std::istream& operator>>(std::istream &in, rational &value) { in >> value.numer; value.denom = 1; @@ -458,13 +460,16 @@ istream& operator>>(istream &in, rational &value) return in; } -QDebug operator<<(QDebug debug, const rational &r) +uint qHash(const rational &r, uint seed) +{ + return ::qHash(r.toDouble(), seed); +} + +OLIVE_NAMESPACE_EXIT + +QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::rational &r) { debug.nospace() << r.numerator() << "/" << r.denominator(); return debug.space(); } -uint qHash(const rational &r, uint seed) -{ - return qHash(r.toDouble(), seed); -} diff --git a/app/common/rational.h b/app/common/rational.h index 505ac313f..a5937f9d3 100644 --- a/app/common/rational.h +++ b/app/common/rational.h @@ -14,7 +14,9 @@ extern "C" { #include } -using namespace std; +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER typedef int64_t intType; /* @@ -90,11 +92,11 @@ public: bool isNull() const; //Function: print number to cout - void print(ostream &out = cout) const; + void print(std::ostream &out = std::cout) const; //IO - friend ostream& operator<<(ostream &out, const rational &value); - friend istream& operator>>(istream &in, rational &value); + friend std::ostream& operator<<(std::ostream &out, const rational &value); + friend std::istream& operator>>(std::istream &in, rational &value); const intType& numerator() const; const intType& denominator() const; @@ -116,14 +118,16 @@ private: intType gcd(intType &x, intType &y); }; -QDebug operator<<(QDebug debug, const rational& r); - // We define these limits at 32-bit to try avoiding integer overflow #define RATIONAL_MIN rational(INT32_MIN, 1) #define RATIONAL_MAX rational(INT32_MAX, 1) -Q_DECLARE_METATYPE(rational) - uint qHash(const rational& r, uint seed); +OLIVE_NAMESPACE_EXIT + +QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::rational& r); + +Q_DECLARE_METATYPE(OLIVE_NAMESPACE::rational) + #endif // RATIONAL_H diff --git a/app/common/threadedobject.cpp b/app/common/threadedobject.cpp index a180cfeba..4f331c710 100644 --- a/app/common/threadedobject.cpp +++ b/app/common/threadedobject.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "threadedobject.h" +OLIVE_NAMESPACE_ENTER + void ThreadedObject::LockDeletes() { threadobj_delete_lock_++; @@ -31,3 +53,5 @@ bool ThreadedObject::TryLockMutex(int timeout) { return threadobj_main_lock_.tryLock(timeout); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/common/threadedobject.h b/app/common/threadedobject.h index d69577345..3210378fa 100644 --- a/app/common/threadedobject.h +++ b/app/common/threadedobject.h @@ -1,8 +1,32 @@ +/*** + + 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 . + +***/ + #ifndef THREADEDOBJECT_H #define THREADEDOBJECT_H #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class ThreadedObject { public: @@ -21,4 +45,6 @@ private: QAtomicInt threadobj_delete_lock_; }; +OLIVE_NAMESPACE_EXIT + #endif // THREADEDOBJECT_H diff --git a/app/common/timecodefunctions.cpp b/app/common/timecodefunctions.cpp index cdc958dbd..031b1478b 100644 --- a/app/common/timecodefunctions.cpp +++ b/app/common/timecodefunctions.cpp @@ -24,6 +24,8 @@ #include "config/config.h" +OLIVE_NAMESPACE_ENTER + QString padded(int64_t arg, int padding) { return QStringLiteral("%1").arg(arg, padding, 10, QChar('0')); } @@ -273,3 +275,5 @@ int64_t Timecode::rescale_timestamp_ceil(const int64_t &ts, const rational &sour { return qCeil(static_cast(ts) * source.toDouble() / dest.toDouble()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/common/timecodefunctions.h b/app/common/timecodefunctions.h index a48a93a57..e0e4dcf91 100644 --- a/app/common/timecodefunctions.h +++ b/app/common/timecodefunctions.h @@ -25,6 +25,8 @@ #include "common/rational.h" +OLIVE_NAMESPACE_ENTER + /** * @brief Functions for converting times/timecodes/timestamps * @@ -68,4 +70,6 @@ public: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMECODEFUNCTIONS_H diff --git a/app/common/timelinecommon.h b/app/common/timelinecommon.h index a0d492a74..98b2aeb42 100644 --- a/app/common/timelinecommon.h +++ b/app/common/timelinecommon.h @@ -1,6 +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 . + +***/ + #ifndef TIMELINECOMMON_H #define TIMELINECOMMON_H +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class Timeline { public: enum MovementMode { @@ -21,4 +45,6 @@ public: static bool IsATrimMode(MovementMode mode) {return mode == kTrimIn || mode == kTrimOut;} }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINECOMMON_H diff --git a/app/common/timerange.cpp b/app/common/timerange.cpp index 6af6f9a35..b5d238c33 100644 --- a/app/common/timerange.cpp +++ b/app/common/timerange.cpp @@ -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 . + +***/ + #include "timerange.h" #include +OLIVE_NAMESPACE_ENTER + TimeRange::TimeRange(const rational &in, const rational &out) : in_(in), out_(out) @@ -94,11 +116,6 @@ void TimeRange::normalize() length_ = out_ - in_; } -uint qHash(const TimeRange &r, uint seed) -{ - return qHash(r.in(), seed) ^ qHash(r.out(), seed); -} - void TimeRangeList::InsertTimeRange(const TimeRange &range) { for (int i=0;i. + +***/ + #ifndef TIMERANGE_H #define TIMERANGE_H #include "rational.h" +OLIVE_NAMESPACE_ENTER + class TimeRange { public: TimeRange() = default; @@ -34,10 +56,6 @@ private: }; -Q_DECLARE_METATYPE(TimeRange) - -uint qHash(const TimeRange& r, uint seed); - class TimeRangeList : public QList { public: TimeRangeList() = default; @@ -52,4 +70,10 @@ public: }; +uint qHash(const TimeRange& r, uint seed); + +OLIVE_NAMESPACE_EXIT + +Q_DECLARE_METATYPE(OLIVE_NAMESPACE::TimeRange) + #endif // TIMERANGE_H diff --git a/app/common/xmlutils.cpp b/app/common/xmlutils.cpp index c80096193..0b39e6d32 100644 --- a/app/common/xmlutils.cpp +++ b/app/common/xmlutils.cpp @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #include "xmlutils.h" #include "node/block/block.h" #include "node/factory.h" #include "widget/nodeview/nodeviewundo.h" +OLIVE_NAMESPACE_ENTER + Node* XMLLoadNode(QXmlStreamReader* reader) { QString node_id; quintptr node_ptr = 0; @@ -74,3 +96,5 @@ void XMLLinkBlocks(const XMLNodeData &xml_node_data) } } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/common/xmlutils.h b/app/common/xmlutils.h index d549c7eb3..67a881a0c 100644 --- a/app/common/xmlutils.h +++ b/app/common/xmlutils.h @@ -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 . + +***/ + #ifndef XMLREADLOOP_H #define XMLREADLOOP_H @@ -6,6 +26,8 @@ #include "project/item/footage/stream.h" +OLIVE_NAMESPACE_ENTER + class Block; class Node; class NodeParam; @@ -48,4 +70,6 @@ bool XMLReadNextStartElement(QXmlStreamReader* reader); void XMLLinkBlocks(const XMLNodeData& xml_node_data); +OLIVE_NAMESPACE_EXIT + #endif // XMLREADLOOP_H diff --git a/app/config/config.cpp b/app/config/config.cpp index 88d80d4c0..c25cc90cc 100644 --- a/app/config/config.cpp +++ b/app/config/config.cpp @@ -33,6 +33,8 @@ #include "core.h" #include "window/mainwindow/mainwindow.h" +OLIVE_NAMESPACE_ENTER + Config Config::current_config_; Config::Config() @@ -225,3 +227,5 @@ QVariant &Config::operator[](const QString &key) { return config_map_[key]; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/config/config.h b/app/config/config.h index d7e99eadd..342d50484 100644 --- a/app/config/config.h +++ b/app/config/config.h @@ -27,6 +27,8 @@ #include "common/timecodefunctions.h" +OLIVE_NAMESPACE_ENTER + class Config { public: static Config& Current(); @@ -51,4 +53,6 @@ private: static QString GetConfigFilePath(); }; +OLIVE_NAMESPACE_EXIT + #endif // CONFIG_H diff --git a/app/core.cpp b/app/core.cpp index 2eabcf9ba..c22a6c9c6 100644 --- a/app/core.cpp +++ b/app/core.cpp @@ -58,6 +58,8 @@ #include "widget/taskview/taskviewitem.h" #include "window/mainwindow/mainwindow.h" +OLIVE_NAMESPACE_ENTER + Core Core::instance_; Core::Core() : @@ -736,3 +738,5 @@ void Core::OpenProject() OpenProjectInternal(file); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/core.h b/app/core.h index 7ca3708e5..b3cc766d7 100644 --- a/app/core.h +++ b/app/core.h @@ -35,6 +35,8 @@ #include "tool/tool.h" #include "undo/undostack.h" +OLIVE_NAMESPACE_ENTER + class MainWindow; /** @@ -403,4 +405,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // CORE_H diff --git a/app/dialog/about/about.cpp b/app/dialog/about/about.cpp index d406aa4a7..489642c77 100644 --- a/app/dialog/about/about.cpp +++ b/app/dialog/about/about.cpp @@ -25,6 +25,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent) { @@ -64,3 +66,5 @@ AboutDialog::AboutDialog(QWidget *parent) : connect(buttons, SIGNAL(accepted()), this, SLOT(accept())); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/about/about.h b/app/dialog/about/about.h index 1c4839b56..c430d9ee7 100644 --- a/app/dialog/about/about.h +++ b/app/dialog/about/about.h @@ -23,6 +23,10 @@ #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + /** * @brief The AboutDialog class * @@ -45,4 +49,6 @@ public: explicit AboutDialog(QWidget *parent = nullptr); }; +OLIVE_NAMESPACE_EXIT + #endif // ABOUTDIALOG_H diff --git a/app/dialog/actionsearch/actionsearch.cpp b/app/dialog/actionsearch/actionsearch.cpp index 0c20cb44b..57c1cd2dc 100644 --- a/app/dialog/actionsearch/actionsearch.cpp +++ b/app/dialog/actionsearch/actionsearch.cpp @@ -25,6 +25,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + ActionSearch::ActionSearch(QWidget *parent) : QDialog(parent), menu_bar_(nullptr) @@ -251,3 +253,5 @@ void ActionSearchList::mouseDoubleClickEvent(QMouseEvent *) { emit dbl_click(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/actionsearch/actionsearch.h b/app/dialog/actionsearch/actionsearch.h index ff48717e3..386a0cd07 100644 --- a/app/dialog/actionsearch/actionsearch.h +++ b/app/dialog/actionsearch/actionsearch.h @@ -27,6 +27,10 @@ #include #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class ActionSearchList; /** @@ -178,4 +182,6 @@ signals: void moveSelectionDown(); }; +OLIVE_NAMESPACE_EXIT + #endif // ACTIONSEARCH_H diff --git a/app/dialog/color/colordialog.cpp b/app/dialog/color/colordialog.cpp index 1591fd735..bad216cf8 100644 --- a/app/dialog/color/colordialog.cpp +++ b/app/dialog/color/colordialog.cpp @@ -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 . + +***/ + #include "colordialog.h" #include @@ -6,6 +26,8 @@ #include "common/qtutils.h" +OLIVE_NAMESPACE_ENTER + ColorDialog::ColorDialog(ColorManager* color_manager, Color start, QString input_cs, QWidget *parent) : QDialog(parent), color_manager_(color_manager) @@ -127,3 +149,5 @@ void ColorDialog::ColorSpaceChanged(const QString &input, const QString &display hsv_value_gradient_->SetColorProcessor(to_linear_processor_, to_display); color_values_widget_->preview_box()->SetColorProcessor(to_linear_processor_, to_display); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/color/colordialog.h b/app/dialog/color/colordialog.h index eb7e23735..95f5e6310 100644 --- a/app/dialog/color/colordialog.h +++ b/app/dialog/color/colordialog.h @@ -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 . + +***/ + #ifndef COLORDIALOG_H #define COLORDIALOG_H @@ -10,6 +30,8 @@ #include "widget/colorwheel/colorwheelwidget.h" #include "widget/colorwheel/colorgradientwidget.h" +OLIVE_NAMESPACE_ENTER + class ColorDialog : public QDialog { Q_OBJECT @@ -68,4 +90,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // COLORDIALOG_H diff --git a/app/dialog/color/colorpreviewbox.cpp b/app/dialog/color/colorpreviewbox.cpp index 68ac3727b..f9f2eae1f 100644 --- a/app/dialog/color/colorpreviewbox.cpp +++ b/app/dialog/color/colorpreviewbox.cpp @@ -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 . + +***/ + #include "colorpreviewbox.h" #include +OLIVE_NAMESPACE_ENTER + ColorPreviewBox::ColorPreviewBox(QWidget *parent) : QWidget(parent) { @@ -41,3 +63,5 @@ void ColorPreviewBox::paintEvent(QPaintEvent *e) p.drawRect(rect()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/color/colorpreviewbox.h b/app/dialog/color/colorpreviewbox.h index 936675884..ab6a6e084 100644 --- a/app/dialog/color/colorpreviewbox.h +++ b/app/dialog/color/colorpreviewbox.h @@ -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 . + +***/ + #ifndef COLORPREVIEWBOX_H #define COLORPREVIEWBOX_H @@ -6,6 +26,8 @@ #include "render/color.h" #include "render/colorprocessor.h" +OLIVE_NAMESPACE_ENTER + class ColorPreviewBox : public QWidget { Q_OBJECT @@ -29,4 +51,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // COLORPREVIEWBOX_H diff --git a/app/dialog/color/colorspacechooser.cpp b/app/dialog/color/colorspacechooser.cpp index efaf3c06c..149cd45a2 100644 --- a/app/dialog/color/colorspacechooser.cpp +++ b/app/dialog/color/colorspacechooser.cpp @@ -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 . + +***/ + #include "colorspacechooser.h" #include #include +OLIVE_NAMESPACE_ENTER + ColorSpaceChooser::ColorSpaceChooser(ColorManager* color_manager, bool enable_input_field, QWidget *parent): QGroupBox(parent), color_manager_(color_manager) @@ -145,3 +167,5 @@ void ColorSpaceChooser::ComboBoxChanged() emit DisplayColorSpaceChanged(display(), view(), look()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/color/colorspacechooser.h b/app/dialog/color/colorspacechooser.h index e42b2eecc..10be1f3ed 100644 --- a/app/dialog/color/colorspacechooser.h +++ b/app/dialog/color/colorspacechooser.h @@ -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 . + +***/ + #ifndef COLORSPACECHOOSER_H #define COLORSPACECHOOSER_H @@ -6,6 +26,8 @@ #include "render/colormanager.h" +OLIVE_NAMESPACE_ENTER + class ColorSpaceChooser : public QGroupBox { Q_OBJECT @@ -43,4 +65,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // COLORSPACECHOOSER_H diff --git a/app/dialog/color/colorvalueswidget.cpp b/app/dialog/color/colorvalueswidget.cpp index 0b815b21d..91a1a1ea8 100644 --- a/app/dialog/color/colorvalueswidget.cpp +++ b/app/dialog/color/colorvalueswidget.cpp @@ -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 . + +***/ + #include "colorvalueswidget.h" #include +OLIVE_NAMESPACE_ENTER + ColorValuesWidget::ColorValuesWidget(QWidget *parent) : QWidget(parent) { @@ -76,3 +98,5 @@ void ColorValuesWidget::SliderChanged() emit ColorChanged(c); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/color/colorvalueswidget.h b/app/dialog/color/colorvalueswidget.h index 2307bf469..c8dfaf562 100644 --- a/app/dialog/color/colorvalueswidget.h +++ b/app/dialog/color/colorvalueswidget.h @@ -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 . + +***/ + #ifndef COLORVALUESWIDGET_H #define COLORVALUESWIDGET_H @@ -7,6 +27,8 @@ #include "render/color.h" #include "widget/slider/floatslider.h" +OLIVE_NAMESPACE_ENTER + class ColorValuesWidget : public QWidget { Q_OBJECT @@ -37,4 +59,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // COLORVALUESWIDGET_H diff --git a/app/dialog/crashhandler/crashhandler.cpp b/app/dialog/crashhandler/crashhandler.cpp index ac3867795..7645eb5f9 100644 --- a/app/dialog/crashhandler/crashhandler.cpp +++ b/app/dialog/crashhandler/crashhandler.cpp @@ -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 . + +***/ + #include "crashhandler.h" #include @@ -7,6 +27,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + CrashHandlerDialog::CrashHandlerDialog(const char *log_file) { setWindowTitle(tr("Olive")); @@ -59,3 +81,5 @@ void CrashHandlerDialog::reject() { QDialog::reject(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/crashhandler/crashhandler.h b/app/dialog/crashhandler/crashhandler.h index 80aed6143..485f1d543 100644 --- a/app/dialog/crashhandler/crashhandler.h +++ b/app/dialog/crashhandler/crashhandler.h @@ -1,8 +1,32 @@ +/*** + + 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 . + +***/ + #ifndef CRASHHANDLERDIALOG_H #define CRASHHANDLERDIALOG_H #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class CrashHandlerDialog : public QDialog { Q_OBJECT @@ -16,4 +40,6 @@ public slots: }; +OLIVE_NAMESPACE_EXIT + #endif // CRASHHANDLERDIALOG_H diff --git a/app/dialog/crashhandler/crashhandlermain.cpp b/app/dialog/crashhandler/crashhandlermain.cpp index 945835d6d..88032fff4 100644 --- a/app/dialog/crashhandler/crashhandlermain.cpp +++ b/app/dialog/crashhandler/crashhandlermain.cpp @@ -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 . + +***/ + #include "crashhandler.h" #include @@ -10,7 +30,7 @@ int main(int argc, char *argv[]) QApplication a(argc, argv); - CrashHandlerDialog chd(argv[1]); + OLIVE_NAMESPACE::CrashHandlerDialog chd(argv[1]); chd.open(); return a.exec(); diff --git a/app/dialog/export/codec/codecsection.cpp b/app/dialog/export/codec/codecsection.cpp index ab1cd80e7..309facaba 100644 --- a/app/dialog/export/codec/codecsection.cpp +++ b/app/dialog/export/codec/codecsection.cpp @@ -1,6 +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 . + +***/ + #include "codecsection.h" +OLIVE_NAMESPACE_ENTER + CodecSection::CodecSection(QWidget *parent) : QWidget(parent) { } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/export/codec/codecsection.h b/app/dialog/export/codec/codecsection.h index 147f5870d..e187b0df7 100644 --- a/app/dialog/export/codec/codecsection.h +++ b/app/dialog/export/codec/codecsection.h @@ -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 . + +***/ + #ifndef CODECSECTION_H #define CODECSECTION_H @@ -5,6 +25,8 @@ #include "codec/encoder.h" +OLIVE_NAMESPACE_ENTER + class CodecSection : public QWidget { public: @@ -14,4 +36,6 @@ public: }; +OLIVE_NAMESPACE_EXIT + #endif // CODECSECTION_H diff --git a/app/dialog/export/codec/h264section.cpp b/app/dialog/export/codec/h264section.cpp index 97419b827..8d64647a2 100644 --- a/app/dialog/export/codec/h264section.cpp +++ b/app/dialog/export/codec/h264section.cpp @@ -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 . + +***/ + #include "h264section.h" #include @@ -8,6 +28,8 @@ #include "common/qtutils.h" #include "widget/slider/integerslider.h" +OLIVE_NAMESPACE_ENTER + H264Section::H264Section(QWidget *parent) : CodecSection(parent) { @@ -184,3 +206,5 @@ int64_t H264FileSizeSection::GetFileSize() const // Convert megabytes to BITS return qRound64(file_size_->GetValue() * 1024.0 * 1024.0 * 8.0); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/export/codec/h264section.h b/app/dialog/export/codec/h264section.h index 22260ed1a..6e85e632a 100644 --- a/app/dialog/export/codec/h264section.h +++ b/app/dialog/export/codec/h264section.h @@ -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 . + +***/ + #ifndef H264SECTION_H #define H264SECTION_H @@ -7,6 +27,8 @@ #include "codecsection.h" #include "widget/slider/floatslider.h" +OLIVE_NAMESPACE_ENTER + class H264CRFSection : public QWidget { public: @@ -86,4 +108,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // H264SECTION_H diff --git a/app/dialog/export/codec/imagesection.cpp b/app/dialog/export/codec/imagesection.cpp index 4bc10c3b0..8b373796e 100644 --- a/app/dialog/export/codec/imagesection.cpp +++ b/app/dialog/export/codec/imagesection.cpp @@ -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 . + +***/ + #include "imagesection.h" #include #include +OLIVE_NAMESPACE_ENTER + ImageSection::ImageSection(QWidget* parent) : CodecSection(parent) { @@ -21,3 +43,5 @@ QCheckBox *ImageSection::image_sequence_checkbox() const { return image_sequence_checkbox_; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/export/codec/imagesection.h b/app/dialog/export/codec/imagesection.h index deb75c407..a40d4dd8a 100644 --- a/app/dialog/export/codec/imagesection.h +++ b/app/dialog/export/codec/imagesection.h @@ -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 . + +***/ + #ifndef IMAGESECTION_H #define IMAGESECTION_H @@ -5,6 +25,8 @@ #include "codecsection.h" +OLIVE_NAMESPACE_ENTER + class ImageSection : public CodecSection { public: @@ -17,4 +39,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // IMAGESECTION_H diff --git a/app/dialog/export/export.cpp b/app/dialog/export/export.cpp index a2163f3d9..c1514fafa 100644 --- a/app/dialog/export/export.cpp +++ b/app/dialog/export/export.cpp @@ -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 . + +***/ + #include "export.h" #include @@ -15,6 +35,8 @@ #include "render/pixelformat.h" #include "ui/icons/icons.h" +OLIVE_NAMESPACE_ENTER + ExportDialog::ExportDialog(ViewerOutput *viewer_node, QWidget *parent) : QDialog(parent), viewer_node_(viewer_node), @@ -613,3 +635,5 @@ void ExportDialog::UpdateTaskbarProgress(int progress) } } #endif + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/export/export.h b/app/dialog/export/export.h index ce8cc4aac..61fb49679 100644 --- a/app/dialog/export/export.h +++ b/app/dialog/export/export.h @@ -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 . + +***/ + #ifndef EXPORTDIALOG_H #define EXPORTDIALOG_H @@ -18,6 +38,8 @@ #include "render/backend/exporter.h" #include "widget/viewer/viewer.h" +OLIVE_NAMESPACE_ENTER + class ExportDialog : public QDialog { Q_OBJECT @@ -124,4 +146,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // EXPORTDIALOG_H diff --git a/app/dialog/export/exportaudiotab.cpp b/app/dialog/export/exportaudiotab.cpp index 359231587..d83cdf39f 100644 --- a/app/dialog/export/exportaudiotab.cpp +++ b/app/dialog/export/exportaudiotab.cpp @@ -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 . + +***/ + #include "exportaudiotab.h" #include @@ -5,6 +25,8 @@ #include "core.h" +OLIVE_NAMESPACE_ENTER + ExportAudioTab::ExportAudioTab(QWidget* parent) : QWidget(parent) { @@ -74,3 +96,5 @@ void ExportAudioTab::set_channel_layout(uint64_t layout) { channel_layout_combobox_->setCurrentIndex(channel_layouts_.indexOf(layout)); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/export/exportaudiotab.h b/app/dialog/export/exportaudiotab.h index e28d22fd2..b14a1e3b9 100644 --- a/app/dialog/export/exportaudiotab.h +++ b/app/dialog/export/exportaudiotab.h @@ -1,9 +1,33 @@ +/*** + + 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 . + +***/ + #ifndef EXPORTAUDIOTAB_H #define EXPORTAUDIOTAB_H #include #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class ExportAudioTab : public QWidget { public: @@ -25,4 +49,6 @@ private: QList channel_layouts_; }; +OLIVE_NAMESPACE_EXIT + #endif // EXPORTAUDIOTAB_H diff --git a/app/dialog/export/exportcodec.h b/app/dialog/export/exportcodec.h index 8ce0ab759..61c651dc2 100644 --- a/app/dialog/export/exportcodec.h +++ b/app/dialog/export/exportcodec.h @@ -1,8 +1,32 @@ +/*** + + 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 . + +***/ + #ifndef EXPORTCODEC_H #define EXPORTCODEC_H #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class ExportCodec { public: enum Flag { @@ -28,4 +52,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // EXPORTCODEC_H diff --git a/app/dialog/export/exportformat.h b/app/dialog/export/exportformat.h index 064e74089..adb36bcbb 100644 --- a/app/dialog/export/exportformat.h +++ b/app/dialog/export/exportformat.h @@ -1,9 +1,33 @@ +/*** + + 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 . + +***/ + #ifndef EXPORTFORMAT_H #define EXPORTFORMAT_H #include #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class ExportFormat { public: ExportFormat(const QString& name, const QString& extension, const QString& encoder, const QList& vcodecs, const QList& acodecs) : @@ -30,4 +54,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // EXPORTFORMAT_H diff --git a/app/dialog/export/exportvideotab.cpp b/app/dialog/export/exportvideotab.cpp index 7f6b773e1..a52c41bd1 100644 --- a/app/dialog/export/exportvideotab.cpp +++ b/app/dialog/export/exportvideotab.cpp @@ -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 . + +***/ + #include "exportvideotab.h" #include @@ -8,6 +28,8 @@ #include "core.h" #include "render/colormanager.h" +OLIVE_NAMESPACE_ENTER + ExportVideoTab::ExportVideoTab(ColorManager* color_manager, QWidget *parent) : QWidget(parent), color_manager_(color_manager) @@ -190,3 +212,5 @@ void ExportVideoTab::MaintainAspectRatioChanged(bool val) { scaling_method_combobox_->setEnabled(!val); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/export/exportvideotab.h b/app/dialog/export/exportvideotab.h index 4edc8a525..a55ab59fe 100644 --- a/app/dialog/export/exportvideotab.h +++ b/app/dialog/export/exportvideotab.h @@ -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 . + +***/ + #ifndef EXPORTVIDEOTAB_H #define EXPORTVIDEOTAB_H @@ -12,6 +32,8 @@ #include "render/colormanager.h" #include "widget/slider/integerslider.h" +OLIVE_NAMESPACE_ENTER + class ExportVideoTab : public QWidget { Q_OBJECT @@ -74,4 +96,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // EXPORTVIDEOTAB_H diff --git a/app/dialog/footageproperties/footageproperties.cpp b/app/dialog/footageproperties/footageproperties.cpp index 37f2dc467..7e935d120 100644 --- a/app/dialog/footageproperties/footageproperties.cpp +++ b/app/dialog/footageproperties/footageproperties.cpp @@ -36,6 +36,8 @@ #include "streamproperties/audiostreamproperties.h" #include "streamproperties/videostreamproperties.h" +OLIVE_NAMESPACE_ENTER + FootagePropertiesDialog::FootagePropertiesDialog(QWidget *parent, Footage *footage) : QDialog(parent), footage_(footage) @@ -170,3 +172,5 @@ void FootagePropertiesDialog::StreamEnableChangeCommand::undo_internal() { stream_->set_enabled(old_enabled_); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/footageproperties/footageproperties.h b/app/dialog/footageproperties/footageproperties.h index 2cc39d78f..9aeaf6e22 100644 --- a/app/dialog/footageproperties/footageproperties.h +++ b/app/dialog/footageproperties/footageproperties.h @@ -32,6 +32,8 @@ #include "project/item/footage/footage.h" #include "undo/undocommand.h" +OLIVE_NAMESPACE_ENTER + /** * @brief The MediaPropertiesDialog class * @@ -126,4 +128,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // MEDIAPROPERTIESDIALOG_H diff --git a/app/dialog/footageproperties/streamproperties/audiostreamproperties.cpp b/app/dialog/footageproperties/streamproperties/audiostreamproperties.cpp index 24e475515..d09b5cff4 100644 --- a/app/dialog/footageproperties/streamproperties/audiostreamproperties.cpp +++ b/app/dialog/footageproperties/streamproperties/audiostreamproperties.cpp @@ -20,6 +20,8 @@ #include "audiostreamproperties.h" +OLIVE_NAMESPACE_ENTER + AudioStreamProperties::AudioStreamProperties(AudioStreamPtr stream) : stream_(stream) { @@ -28,3 +30,5 @@ AudioStreamProperties::AudioStreamProperties(AudioStreamPtr stream) : void AudioStreamProperties::Accept(QUndoCommand*) { } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/footageproperties/streamproperties/audiostreamproperties.h b/app/dialog/footageproperties/streamproperties/audiostreamproperties.h index 0942797cc..4afc506ba 100644 --- a/app/dialog/footageproperties/streamproperties/audiostreamproperties.h +++ b/app/dialog/footageproperties/streamproperties/audiostreamproperties.h @@ -24,6 +24,8 @@ #include "project/item/footage/audiostream.h" #include "streamproperties.h" +OLIVE_NAMESPACE_ENTER + class AudioStreamProperties : public StreamProperties { public: @@ -35,4 +37,6 @@ private: AudioStreamPtr stream_; }; +OLIVE_NAMESPACE_EXIT + #endif // AUDIOSTREAMPROPERTIES_H diff --git a/app/dialog/footageproperties/streamproperties/streamproperties.cpp b/app/dialog/footageproperties/streamproperties/streamproperties.cpp index 29d938948..2344a1277 100644 --- a/app/dialog/footageproperties/streamproperties/streamproperties.cpp +++ b/app/dialog/footageproperties/streamproperties/streamproperties.cpp @@ -20,7 +20,11 @@ #include "streamproperties.h" +OLIVE_NAMESPACE_ENTER + StreamProperties::StreamProperties(QWidget *parent) : QWidget(parent) { } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/footageproperties/streamproperties/streamproperties.h b/app/dialog/footageproperties/streamproperties/streamproperties.h index 30f8d7aa5..9e9e510f5 100644 --- a/app/dialog/footageproperties/streamproperties/streamproperties.h +++ b/app/dialog/footageproperties/streamproperties/streamproperties.h @@ -24,6 +24,10 @@ #include #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class StreamProperties : public QWidget { public: @@ -35,4 +39,6 @@ public: }; +OLIVE_NAMESPACE_EXIT + #endif // STREAMPROPERTIES_H diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp index d79c2e57e..a3a6ae53a 100644 --- a/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp +++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.cpp @@ -31,6 +31,8 @@ namespace OCIO = OCIO_NAMESPACE::v1; #include "project/project.h" #include "undo/undostack.h" +OLIVE_NAMESPACE_ENTER + VideoStreamProperties::VideoStreamProperties(ImageStreamPtr stream) : stream_(stream) { @@ -193,3 +195,5 @@ void VideoStreamProperties::ImageSequenceChangeCommand::undo_internal() video_stream_->set_start_time(old_start_index_); video_stream_->set_duration(old_duration_); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/footageproperties/streamproperties/videostreamproperties.h b/app/dialog/footageproperties/streamproperties/videostreamproperties.h index 183ab7e32..6472c6958 100644 --- a/app/dialog/footageproperties/streamproperties/videostreamproperties.h +++ b/app/dialog/footageproperties/streamproperties/videostreamproperties.h @@ -29,6 +29,8 @@ #include "undo/undocommand.h" #include "widget/slider/integerslider.h" +OLIVE_NAMESPACE_ENTER + class VideoStreamProperties : public StreamProperties { public: @@ -111,4 +113,6 @@ private: }; }; +OLIVE_NAMESPACE_EXIT + #endif // VIDEOSTREAMPROPERTIES_H diff --git a/app/dialog/keyframeproperties/keyframeproperties.cpp b/app/dialog/keyframeproperties/keyframeproperties.cpp index c7aea9760..090902cd0 100644 --- a/app/dialog/keyframeproperties/keyframeproperties.cpp +++ b/app/dialog/keyframeproperties/keyframeproperties.cpp @@ -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 . + +***/ + #include "keyframeproperties.h" #include @@ -8,6 +28,8 @@ #include "widget/keyframeview/keyframeviewundo.h" #include "widget/nodeparamview/nodeparamviewundo.h" +OLIVE_NAMESPACE_ENTER + KeyframePropertiesDialog::KeyframePropertiesDialog(const QList &keys, const rational &timebase, QWidget *parent) : QDialog(parent), keys_(keys), @@ -217,3 +239,5 @@ void KeyframePropertiesDialog::KeyTypeChanged(int index) { bezier_group_->setEnabled(type_select_->itemData(index) == NodeKeyframe::kBezier); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/keyframeproperties/keyframeproperties.h b/app/dialog/keyframeproperties/keyframeproperties.h index 415365b5d..fdf9f7076 100644 --- a/app/dialog/keyframeproperties/keyframeproperties.h +++ b/app/dialog/keyframeproperties/keyframeproperties.h @@ -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 . + +***/ + #ifndef KEYFRAMEPROPERTIESDIALOG_H #define KEYFRAMEPROPERTIESDIALOG_H @@ -9,6 +29,8 @@ #include "widget/slider/floatslider.h" #include "widget/slider/timeslider.h" +OLIVE_NAMESPACE_ENTER + class KeyframePropertiesDialog : public QDialog { Q_OBJECT @@ -44,4 +66,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // KEYFRAMEPROPERTIESDIALOG_H diff --git a/app/dialog/preferences/keysequenceeditor.cpp b/app/dialog/preferences/keysequenceeditor.cpp index f476abed9..d0e6645d8 100644 --- a/app/dialog/preferences/keysequenceeditor.cpp +++ b/app/dialog/preferences/keysequenceeditor.cpp @@ -22,6 +22,8 @@ #include +OLIVE_NAMESPACE_ENTER + KeySequenceEditor::KeySequenceEditor(QWidget* parent, QAction* a) : QKeySequenceEdit(parent), action(a) { setKeySequence(action->shortcut()); @@ -46,3 +48,5 @@ QString KeySequenceEditor::export_shortcut() { } return nullptr; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/preferences/keysequenceeditor.h b/app/dialog/preferences/keysequenceeditor.h index bda946137..b3fc396b9 100644 --- a/app/dialog/preferences/keysequenceeditor.h +++ b/app/dialog/preferences/keysequenceeditor.h @@ -23,6 +23,10 @@ #include +#include "common/debug.h" + +OLIVE_NAMESPACE_ENTER + /** * @brief The KeySequenceEditor class * @@ -97,4 +101,6 @@ private: QAction* action; }; +OLIVE_NAMESPACE_EXIT + #endif // KEYSEQUENCEEDITOR_H diff --git a/app/dialog/preferences/preferences.cpp b/app/dialog/preferences/preferences.cpp index d25a2a3ed..bddb46e62 100644 --- a/app/dialog/preferences/preferences.cpp +++ b/app/dialog/preferences/preferences.cpp @@ -34,6 +34,8 @@ #include "tabs/preferencesaudiotab.h" #include "tabs/preferenceskeyboardtab.h" +OLIVE_NAMESPACE_ENTER + PreferencesDialog::PreferencesDialog(QWidget *parent, QMenuBar* main_menu_bar) : QDialog(parent) { @@ -94,3 +96,5 @@ void PreferencesDialog::AddTab(PreferencesTab *tab, const QString &title) tabs_.append(tab); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/preferences/preferences.h b/app/dialog/preferences/preferences.h index 330a1fd01..6f97e2e08 100644 --- a/app/dialog/preferences/preferences.h +++ b/app/dialog/preferences/preferences.h @@ -30,6 +30,8 @@ #include "tabs/preferencestab.h" +OLIVE_NAMESPACE_ENTER + /** * @brief The PreferencesDialog class * @@ -67,4 +69,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // PREFERENCESDIALOG_H diff --git a/app/dialog/preferences/tabs/preferencesappearancetab.cpp b/app/dialog/preferences/tabs/preferencesappearancetab.cpp index ec9f808d8..a8044d2f9 100644 --- a/app/dialog/preferences/tabs/preferencesappearancetab.cpp +++ b/app/dialog/preferences/tabs/preferencesappearancetab.cpp @@ -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 . + +***/ + #include "preferencesappearancetab.h" #include @@ -5,6 +25,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + PreferencesAppearanceTab::PreferencesAppearanceTab() { QVBoxLayout* layout = new QVBoxLayout(this); @@ -50,3 +72,5 @@ void PreferencesAppearanceTab::Accept() StyleManager::SetStyle(style_->currentData().toString()); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/preferences/tabs/preferencesappearancetab.h b/app/dialog/preferences/tabs/preferencesappearancetab.h index a8c46bc6b..cf3b97d71 100644 --- a/app/dialog/preferences/tabs/preferencesappearancetab.h +++ b/app/dialog/preferences/tabs/preferencesappearancetab.h @@ -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 . + +***/ + #ifndef PREFERENCESAPPEARANCETAB_H #define PREFERENCESAPPEARANCETAB_H @@ -7,6 +27,8 @@ #include "preferencestab.h" #include "ui/style/style.h" +OLIVE_NAMESPACE_ENTER + class PreferencesAppearanceTab : public PreferencesTab { Q_OBJECT @@ -34,4 +56,6 @@ private: QString custom_style_path_; }; +OLIVE_NAMESPACE_EXIT + #endif // PREFERENCESAPPEARANCETAB_H diff --git a/app/dialog/preferences/tabs/preferencesaudiotab.cpp b/app/dialog/preferences/tabs/preferencesaudiotab.cpp index a450cf2bd..9da17b7d3 100644 --- a/app/dialog/preferences/tabs/preferencesaudiotab.cpp +++ b/app/dialog/preferences/tabs/preferencesaudiotab.cpp @@ -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 . + +***/ + #include "preferencesaudiotab.h" #include @@ -8,6 +28,8 @@ #include "audio/audiomanager.h" #include "config/config.h" +OLIVE_NAMESPACE_ENTER + PreferencesAudioTab::PreferencesAudioTab() : has_devices_(false) { @@ -169,3 +191,5 @@ void PreferencesAudioTab::RetrieveDeviceLists() has_devices_ = true; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/preferences/tabs/preferencesaudiotab.h b/app/dialog/preferences/tabs/preferencesaudiotab.h index 8b3bcde32..2bf73d668 100644 --- a/app/dialog/preferences/tabs/preferencesaudiotab.h +++ b/app/dialog/preferences/tabs/preferencesaudiotab.h @@ -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 . + +***/ + #ifndef PREFERENCESAUDIOTAB_H #define PREFERENCESAUDIOTAB_H @@ -5,6 +25,8 @@ #include "preferencestab.h" +OLIVE_NAMESPACE_ENTER + class PreferencesAudioTab : public PreferencesTab { Q_OBJECT @@ -44,4 +66,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // PREFERENCESAUDIOTAB_H diff --git a/app/dialog/preferences/tabs/preferencesbehaviortab.cpp b/app/dialog/preferences/tabs/preferencesbehaviortab.cpp index 09499f577..6713fe81b 100644 --- a/app/dialog/preferences/tabs/preferencesbehaviortab.cpp +++ b/app/dialog/preferences/tabs/preferencesbehaviortab.cpp @@ -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 . + +***/ + #include "preferencesbehaviortab.h" #include @@ -5,6 +25,8 @@ #include "config/config.h" +OLIVE_NAMESPACE_ENTER + PreferencesBehaviorTab::PreferencesBehaviorTab() { QVBoxLayout* layout = new QVBoxLayout(this); @@ -128,3 +150,5 @@ QTreeWidgetItem *PreferencesBehaviorTab::AddParent(const QString &text, QTreeWid { return AddParent(text, QString(), parent); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/preferences/tabs/preferencesbehaviortab.h b/app/dialog/preferences/tabs/preferencesbehaviortab.h index b15c5ab48..521f36cb4 100644 --- a/app/dialog/preferences/tabs/preferencesbehaviortab.h +++ b/app/dialog/preferences/tabs/preferencesbehaviortab.h @@ -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 . + +***/ + #ifndef PREFERENCESBEHAVIORTAB_H #define PREFERENCESBEHAVIORTAB_H @@ -5,6 +25,8 @@ #include "preferencestab.h" +OLIVE_NAMESPACE_ENTER + class PreferencesBehaviorTab : public PreferencesTab { Q_OBJECT @@ -26,4 +48,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // PREFERENCESBEHAVIORTAB_H diff --git a/app/dialog/preferences/tabs/preferencesdisktab.cpp b/app/dialog/preferences/tabs/preferencesdisktab.cpp index 2488da52f..df9708b7f 100644 --- a/app/dialog/preferences/tabs/preferencesdisktab.cpp +++ b/app/dialog/preferences/tabs/preferencesdisktab.cpp @@ -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 . + +***/ + #include "preferencesdisktab.h" #include @@ -9,6 +29,8 @@ #include "render/diskmanager.h" +OLIVE_NAMESPACE_ENTER + PreferencesDiskTab::PreferencesDiskTab() { QVBoxLayout* outer_layout = new QVBoxLayout(this); @@ -124,3 +146,5 @@ void PreferencesDiskTab::ClearDiskCache() } } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/preferences/tabs/preferencesdisktab.h b/app/dialog/preferences/tabs/preferencesdisktab.h index 961e22b99..052c834ad 100644 --- a/app/dialog/preferences/tabs/preferencesdisktab.h +++ b/app/dialog/preferences/tabs/preferencesdisktab.h @@ -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 . + +***/ + #ifndef PREFERENCESDISKTAB_H #define PREFERENCESDISKTAB_H @@ -8,6 +28,8 @@ #include "preferencestab.h" #include "widget/slider/floatslider.h" +OLIVE_NAMESPACE_ENTER + class PreferencesDiskTab : public PreferencesTab { Q_OBJECT @@ -38,4 +60,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // PREFERENCESDISKTAB_H diff --git a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp index 59ab3198a..e46959475 100644 --- a/app/dialog/preferences/tabs/preferencesgeneraltab.cpp +++ b/app/dialog/preferences/tabs/preferencesgeneraltab.cpp @@ -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 . + +***/ + #include "preferencesgeneraltab.h" #include @@ -8,6 +28,8 @@ #include "dialog/sequence/sequence.h" #include "project/item/sequence/sequence.h" +OLIVE_NAMESPACE_ENTER + PreferencesGeneralTab::PreferencesGeneralTab() { QVBoxLayout* layout = new QVBoxLayout(this); @@ -121,3 +143,5 @@ void PreferencesGeneralTab::edit_default_sequence_settings() sd.SetNameIsEditable(false); sd.exec(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/preferences/tabs/preferencesgeneraltab.h b/app/dialog/preferences/tabs/preferencesgeneraltab.h index f6d6d8f2a..54a712597 100644 --- a/app/dialog/preferences/tabs/preferencesgeneraltab.h +++ b/app/dialog/preferences/tabs/preferencesgeneraltab.h @@ -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 . + +***/ + #ifndef PREFERENCESGENERALTAB_H #define PREFERENCESGENERALTAB_H @@ -9,6 +29,8 @@ #include "project/item/sequence/sequence.h" #include "widget/slider/floatslider.h" +OLIVE_NAMESPACE_ENTER + class PreferencesGeneralTab : public PreferencesTab { Q_OBJECT @@ -39,4 +61,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // PREFERENCESGENERALTAB_H diff --git a/app/dialog/preferences/tabs/preferenceskeyboardtab.cpp b/app/dialog/preferences/tabs/preferenceskeyboardtab.cpp index d5d8143d9..4161b3789 100644 --- a/app/dialog/preferences/tabs/preferenceskeyboardtab.cpp +++ b/app/dialog/preferences/tabs/preferenceskeyboardtab.cpp @@ -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 . + +***/ + #include "preferenceskeyboardtab.h" #include @@ -7,6 +27,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + PreferencesKeyboardTab::PreferencesKeyboardTab(QMenuBar *menubar) { QVBoxLayout* shortcut_layout = new QVBoxLayout(this); @@ -216,3 +238,5 @@ void PreferencesKeyboardTab::save_shortcut_file() { } } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/preferences/tabs/preferenceskeyboardtab.h b/app/dialog/preferences/tabs/preferenceskeyboardtab.h index fd332253a..69b906bd6 100644 --- a/app/dialog/preferences/tabs/preferenceskeyboardtab.h +++ b/app/dialog/preferences/tabs/preferenceskeyboardtab.h @@ -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 . + +***/ + #ifndef PREFERENCESKEYBOARDTAB_H #define PREFERENCESKEYBOARDTAB_H @@ -7,6 +27,8 @@ #include "preferencestab.h" #include "../keysequenceeditor.h" +OLIVE_NAMESPACE_ENTER + class PreferencesKeyboardTab : public PreferencesTab { Q_OBJECT @@ -112,4 +134,6 @@ private: QVector key_shortcut_fields_; }; +OLIVE_NAMESPACE_EXIT + #endif // PREFERENCESKEYBOARDTAB_H diff --git a/app/dialog/preferences/tabs/preferencesqualitytab.cpp b/app/dialog/preferences/tabs/preferencesqualitytab.cpp index 1ebb4d3a4..9ec327cdc 100644 --- a/app/dialog/preferences/tabs/preferencesqualitytab.cpp +++ b/app/dialog/preferences/tabs/preferencesqualitytab.cpp @@ -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 . + +***/ + #include "preferencesqualitytab.h" #include @@ -8,6 +28,8 @@ #include "render/colormanager.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + PreferencesQualityTab::PreferencesQualityTab() { QVBoxLayout* layout = new QVBoxLayout(this); @@ -126,3 +148,5 @@ QComboBox *PreferencesQualityGroup::sample_fmt_combobox() { return sample_fmt_combobox_; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/preferences/tabs/preferencesqualitytab.h b/app/dialog/preferences/tabs/preferencesqualitytab.h index dbae346f0..a661f2e74 100644 --- a/app/dialog/preferences/tabs/preferencesqualitytab.h +++ b/app/dialog/preferences/tabs/preferencesqualitytab.h @@ -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 . + +***/ + #ifndef PREFERENCESQUALITYTAB_H #define PREFERENCESQUALITYTAB_H @@ -8,6 +28,8 @@ #include "preferencestab.h" +OLIVE_NAMESPACE_ENTER + class PreferencesQualityGroup : public QGroupBox { Q_OBJECT @@ -46,4 +68,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // PREFERENCESQUALITYTAB_H diff --git a/app/dialog/preferences/tabs/preferencestab.cpp b/app/dialog/preferences/tabs/preferencestab.cpp index e9e813288..883f108cb 100644 --- a/app/dialog/preferences/tabs/preferencestab.cpp +++ b/app/dialog/preferences/tabs/preferencestab.cpp @@ -1,11 +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 . + +***/ + #include "preferencestab.h" -PreferencesTab::PreferencesTab() -{ - -} +OLIVE_NAMESPACE_ENTER bool PreferencesTab::Validate() { return true; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/preferences/tabs/preferencestab.h b/app/dialog/preferences/tabs/preferencestab.h index c58a69f43..60e83d950 100644 --- a/app/dialog/preferences/tabs/preferencestab.h +++ b/app/dialog/preferences/tabs/preferencestab.h @@ -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 . + +***/ + #ifndef PREFERENCESTAB_H #define PREFERENCESTAB_H @@ -5,14 +25,18 @@ #include "config/config.h" +OLIVE_NAMESPACE_ENTER + class PreferencesTab : public QWidget { public: - PreferencesTab(); + PreferencesTab() = default; virtual bool Validate(); virtual void Accept() = 0; }; +OLIVE_NAMESPACE_EXIT + #endif // PREFERENCESTAB_H diff --git a/app/dialog/progress/progress.cpp b/app/dialog/progress/progress.cpp index 134255af3..89d376337 100644 --- a/app/dialog/progress/progress.cpp +++ b/app/dialog/progress/progress.cpp @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #include "progress.h" #include #include #include +OLIVE_NAMESPACE_ENTER + ProgressDialog::ProgressDialog(const QString& message, const QString& title, QWidget *parent) : QDialog(parent) { @@ -38,3 +60,5 @@ void ProgressDialog::SetProgress(int value) { bar_->setValue(value); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/progress/progress.h b/app/dialog/progress/progress.h index 5f0d4be97..642dcb656 100644 --- a/app/dialog/progress/progress.h +++ b/app/dialog/progress/progress.h @@ -1,9 +1,33 @@ +/*** + + 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 . + +***/ + #ifndef PROGRESSDIALOG_H #define PROGRESSDIALOG_H #include #include +#include "common/debug.h" + +OLIVE_NAMESPACE_ENTER + class ProgressDialog : public QDialog { Q_OBJECT @@ -21,4 +45,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // PROGRESSDIALOG_H diff --git a/app/dialog/projectproperties/projectproperties.cpp b/app/dialog/projectproperties/projectproperties.cpp index 94bae0707..751720f8b 100644 --- a/app/dialog/projectproperties/projectproperties.cpp +++ b/app/dialog/projectproperties/projectproperties.cpp @@ -34,6 +34,8 @@ namespace OCIO = OCIO_NAMESPACE::v1; #include "core.h" #include "render/colormanager.h" +OLIVE_NAMESPACE_ENTER + ProjectPropertiesDialog::ProjectPropertiesDialog(QWidget *parent) : QDialog(parent), working_project_(Core::instance()->GetActiveProject()) @@ -153,3 +155,5 @@ void ProjectPropertiesDialog::BrowseForOCIOConfig() } } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/projectproperties/projectproperties.h b/app/dialog/projectproperties/projectproperties.h index 7573d30b8..5fa2fe0d9 100644 --- a/app/dialog/projectproperties/projectproperties.h +++ b/app/dialog/projectproperties/projectproperties.h @@ -27,6 +27,8 @@ #include "project/project.h" +OLIVE_NAMESPACE_ENTER + class ProjectPropertiesDialog : public QDialog { Q_OBJECT @@ -52,4 +54,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECTPROPERTIESDIALOG_H diff --git a/app/dialog/rendercancel/rendercancel.cpp b/app/dialog/rendercancel/rendercancel.cpp index 2474da777..d0f3af8a0 100644 --- a/app/dialog/rendercancel/rendercancel.cpp +++ b/app/dialog/rendercancel/rendercancel.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "rendercancel.h" +OLIVE_NAMESPACE_ENTER + RenderCancelDialog::RenderCancelDialog(QWidget *parent) : ProgressDialog(tr("Waiting for workers to finish..."), tr("Renderer"), parent), busy_workers_(0), @@ -56,3 +78,5 @@ void RenderCancelDialog::UpdateProgress() accept(); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/rendercancel/rendercancel.h b/app/dialog/rendercancel/rendercancel.h index 7ebb08e31..75ba0a563 100644 --- a/app/dialog/rendercancel/rendercancel.h +++ b/app/dialog/rendercancel/rendercancel.h @@ -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 . + +***/ + #ifndef RENDERCANCELDIALOG_H #define RENDERCANCELDIALOG_H #include "dialog/progress/progress.h" +OLIVE_NAMESPACE_ENTER + class RenderCancelDialog : public ProgressDialog { Q_OBJECT @@ -32,4 +54,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // RENDERCANCELDIALOG_H diff --git a/app/dialog/sequence/sequence.cpp b/app/dialog/sequence/sequence.cpp index 9b0f91f29..059e9e503 100644 --- a/app/dialog/sequence/sequence.cpp +++ b/app/dialog/sequence/sequence.cpp @@ -32,6 +32,8 @@ #include "common/rational.h" #include "undo/undostack.h" +OLIVE_NAMESPACE_ENTER + SequenceDialog::SequenceDialog(Sequence* s, Type t, QWidget* parent) : QDialog(parent), sequence_(s), @@ -222,3 +224,5 @@ void SequenceDialog::SequenceParamCommand::undo_internal() sequence_->set_audio_params(old_audio_params_); sequence_->set_name(old_name_); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/sequence/sequence.h b/app/dialog/sequence/sequence.h index 470803bfb..a7903ba70 100644 --- a/app/dialog/sequence/sequence.h +++ b/app/dialog/sequence/sequence.h @@ -28,6 +28,8 @@ #include "project/item/sequence/sequence.h" #include "undo/undocommand.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A dialog for editing Sequence parameters * @@ -137,4 +139,6 @@ private: }; }; +OLIVE_NAMESPACE_EXIT + #endif // SEQUENCEDIALOG_H diff --git a/app/dialog/speedduration/speedduration.cpp b/app/dialog/speedduration/speedduration.cpp index 2bfa47434..7ae37e71f 100644 --- a/app/dialog/speedduration/speedduration.cpp +++ b/app/dialog/speedduration/speedduration.cpp @@ -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 . + +***/ + #include "speedduration.h" #include @@ -12,6 +32,8 @@ #include "widget/nodeview/nodeviewundo.h" #include "widget/timelinewidget/undo/undo.h" +OLIVE_NAMESPACE_ENTER + SpeedDurationDialog::SpeedDurationDialog(const rational& timebase, const QList &clips, QWidget *parent) : QDialog(parent), clips_(clips), @@ -348,3 +370,5 @@ void BlockReverseCommand::undo_internal() { redo_internal(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/speedduration/speedduration.h b/app/dialog/speedduration/speedduration.h index 50d912c99..21b17e775 100644 --- a/app/dialog/speedduration/speedduration.h +++ b/app/dialog/speedduration/speedduration.h @@ -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 . + +***/ + #ifndef SPEEDDURATIONDIALOG_H #define SPEEDDURATIONDIALOG_H @@ -10,6 +30,8 @@ #include "widget/slider/timeslider.h" #include "undo/undocommand.h" +OLIVE_NAMESPACE_ENTER + class SpeedDurationDialog : public QDialog { Q_OBJECT @@ -57,4 +79,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // SPEEDDURATIONDIALOG_H diff --git a/app/dialog/task/task.cpp b/app/dialog/task/task.cpp index 766beee12..c7eecf1b5 100644 --- a/app/dialog/task/task.cpp +++ b/app/dialog/task/task.cpp @@ -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 . + +***/ + #include "task.h" #include #include +OLIVE_NAMESPACE_ENTER + TaskDialog::TaskDialog(Task* task, const QString& title, QWidget *parent) : ProgressDialog(task->GetTitle(), title, parent), task_(task), @@ -69,3 +91,5 @@ void TaskDialog::TaskFailed(const QString &s) task_failed_ = true; task_error_ = s; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/dialog/task/task.h b/app/dialog/task/task.h index e7f190093..0521f158b 100644 --- a/app/dialog/task/task.h +++ b/app/dialog/task/task.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef TASKDIALOG_H #define TASKDIALOG_H #include "dialog/progress/progress.h" #include "task/task.h" +OLIVE_NAMESPACE_ENTER + class TaskDialog : public ProgressDialog { Q_OBJECT @@ -28,4 +50,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TASKDIALOG_H diff --git a/app/main.cpp b/app/main.cpp index 65b4cc30e..f7f237326 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -40,8 +40,8 @@ extern "C" { #include "common/debug.h" int main(int argc, char *argv[]) { - signal(SIGSEGV, crash_handler); - signal(SIGABRT, crash_handler); + signal(SIGSEGV, OLIVE_NAMESPACE::crash_handler); + signal(SIGABRT, OLIVE_NAMESPACE::crash_handler); // Set OpenGL display profile (3.2 Core) QSurfaceFormat format; @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) { #endif // Set up debug handler - qInstallMessageHandler(DebugHandler); + qInstallMessageHandler(OLIVE_NAMESPACE::DebugHandler); // Register FFmpeg codecs and filters (deprecated in 4.0+) #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(58, 9, 100) @@ -86,13 +86,13 @@ int main(int argc, char *argv[]) { #endif // Start core - Core::instance()->Start(); + OLIVE_NAMESPACE::Core::instance()->Start(); // Run application loop and receive exit code int exit_code = a.exec(); // Clear core memory - Core::instance()->Stop(); + OLIVE_NAMESPACE::Core::instance()->Stop(); return exit_code; } diff --git a/app/node/audio/pan/pan.cpp b/app/node/audio/pan/pan.cpp index bbdd1f46e..baa9f4123 100644 --- a/app/node/audio/pan/pan.cpp +++ b/app/node/audio/pan/pan.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "pan.h" +OLIVE_NAMESPACE_ENTER + PanNode::PanNode() { samples_input_ = new NodeInput("samples_in", NodeParam::kSamples); @@ -72,3 +94,5 @@ void PanNode::Retranslate() samples_input_->set_name(tr("Samples")); panning_input_->set_name(tr("Pan")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/audio/pan/pan.h b/app/node/audio/pan/pan.h index 8092f1a52..b5e15b452 100644 --- a/app/node/audio/pan/pan.h +++ b/app/node/audio/pan/pan.h @@ -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 . + +***/ + #ifndef PANNODE_H #define PANNODE_H #include "node/node.h" +OLIVE_NAMESPACE_ENTER + class PanNode : public Node { public: @@ -27,4 +49,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // PANNODE_H diff --git a/app/node/audio/volume/volume.cpp b/app/node/audio/volume/volume.cpp index fe97cc5d2..a6478ac27 100644 --- a/app/node/audio/volume/volume.cpp +++ b/app/node/audio/volume/volume.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "volume.h" +OLIVE_NAMESPACE_ENTER + VolumeNode::VolumeNode() { samples_input_ = new NodeInput("samples_in", NodeParam::kSamples); @@ -65,3 +87,5 @@ NodeInput *VolumeNode::samples_input() const { return samples_input_; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/audio/volume/volume.h b/app/node/audio/volume/volume.h index 927c3ea71..db1f781af 100644 --- a/app/node/audio/volume/volume.h +++ b/app/node/audio/volume/volume.h @@ -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 . + +***/ + #ifndef VOLUMENODE_H #define VOLUMENODE_H #include "node/node.h" +OLIVE_NAMESPACE_ENTER + class VolumeNode : public Node { public: @@ -29,4 +51,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // VOLUMENODE_H diff --git a/app/node/block/block.cpp b/app/node/block/block.cpp index 08cda87ba..33cba06ad 100644 --- a/app/node/block/block.cpp +++ b/app/node/block/block.cpp @@ -25,6 +25,8 @@ #include "node/output/track/track.h" #include "transition/transition.h" +OLIVE_NAMESPACE_ENTER + Block::Block() : previous_(nullptr), next_(nullptr) @@ -330,3 +332,4 @@ void Block::InvalidateCache(const rational &start_range, const rational &end_ran Node::InvalidateCache(start_range, end_range, from); } +OLIVE_NAMESPACE_EXIT diff --git a/app/node/block/block.h b/app/node/block/block.h index 1345c47a2..f8a74a782 100644 --- a/app/node/block/block.h +++ b/app/node/block/block.h @@ -23,6 +23,8 @@ #include "node/node.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A Node that represents a block of time, also displayable on a Timeline * @@ -136,4 +138,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // BLOCK_H diff --git a/app/node/block/clip/clip.cpp b/app/node/block/clip/clip.cpp index 28832655e..dc968ae08 100644 --- a/app/node/block/clip/clip.cpp +++ b/app/node/block/clip/clip.cpp @@ -20,6 +20,8 @@ #include "clip.h" +OLIVE_NAMESPACE_ENTER + ClipBlock::ClipBlock() { texture_input_ = new NodeInput("buffer_in", NodeInput::kBuffer); @@ -117,3 +119,5 @@ void ClipBlock::Retranslate() texture_input_->set_name(tr("Buffer")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/block/clip/clip.h b/app/node/block/clip/clip.h index 1c523f44d..b2abac8e2 100644 --- a/app/node/block/clip/clip.h +++ b/app/node/block/clip/clip.h @@ -23,6 +23,8 @@ #include "node/block/block.h" +OLIVE_NAMESPACE_ENTER + /** * @brief Node that represents a block of Media */ @@ -60,4 +62,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEBLOCK_H diff --git a/app/node/block/gap/gap.cpp b/app/node/block/gap/gap.cpp index 678c1fe18..8d0e4fdf6 100644 --- a/app/node/block/gap/gap.cpp +++ b/app/node/block/gap/gap.cpp @@ -20,6 +20,8 @@ #include "gap.h" +OLIVE_NAMESPACE_ENTER + GapBlock::GapBlock() { } @@ -48,3 +50,5 @@ QString GapBlock::Description() const { return tr("A time-based node that represents an empty space."); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/block/gap/gap.h b/app/node/block/gap/gap.h index c98f415e9..4eded9d4d 100644 --- a/app/node/block/gap/gap.h +++ b/app/node/block/gap/gap.h @@ -23,6 +23,8 @@ #include "node/block/block.h" +OLIVE_NAMESPACE_ENTER + /** * @brief Node that represents nothing in its respective track for a certain period of time */ @@ -44,4 +46,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEBLOCK_H diff --git a/app/node/block/transition/externaltransition.cpp b/app/node/block/transition/externaltransition.cpp index f4ed62290..3de007d4d 100644 --- a/app/node/block/transition/externaltransition.cpp +++ b/app/node/block/transition/externaltransition.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "externaltransition.h" +OLIVE_NAMESPACE_ENTER + ExternalTransition::ExternalTransition(const QString &xml_meta_filename) : meta_(xml_meta_filename) { @@ -62,3 +84,5 @@ NodeInput *ExternalTransition::ShaderIterativeInput() const { return meta_.iteration_input(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/block/transition/externaltransition.h b/app/node/block/transition/externaltransition.h index c520e0ee9..de16936f9 100644 --- a/app/node/block/transition/externaltransition.h +++ b/app/node/block/transition/externaltransition.h @@ -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 . + +***/ + #ifndef EXTERNALTRANSITION_H #define EXTERNALTRANSITION_H @@ -5,6 +25,8 @@ #include "node/metareader.h" +OLIVE_NAMESPACE_ENTER + class ExternalTransition : public TransitionBlock { public: @@ -29,4 +51,6 @@ private: NodeMetaReader meta_; }; +OLIVE_NAMESPACE_EXIT + #endif // EXTERNALTRANSITION_H diff --git a/app/node/block/transition/transition.cpp b/app/node/block/transition/transition.cpp index 2e72721cb..46968ee75 100644 --- a/app/node/block/transition/transition.cpp +++ b/app/node/block/transition/transition.cpp @@ -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 . + +***/ + #include "transition.h" #include "common/clamp.h" +OLIVE_NAMESPACE_ENTER + TransitionBlock::TransitionBlock() : connected_out_block_(nullptr), connected_in_block_(nullptr) @@ -133,3 +155,5 @@ void TransitionBlock::BlockDisconnected(NodeEdgePtr edge) connected_in_block_ = nullptr; } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/block/transition/transition.h b/app/node/block/transition/transition.h index c7a5ea895..74346c6a0 100644 --- a/app/node/block/transition/transition.h +++ b/app/node/block/transition/transition.h @@ -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 . + +***/ + #ifndef TRANSITIONBLOCK_H #define TRANSITIONBLOCK_H #include "node/block/block.h" +OLIVE_NAMESPACE_ENTER + class TransitionBlock : public Block { public: @@ -43,4 +65,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TRANSITIONBLOCK_H diff --git a/app/node/dependency.cpp b/app/node/dependency.cpp index 2a33660f0..398d6c7e0 100644 --- a/app/node/dependency.cpp +++ b/app/node/dependency.cpp @@ -22,6 +22,8 @@ #include "node.h" +OLIVE_NAMESPACE_ENTER + NodeDependency::NodeDependency() : node_(nullptr) { @@ -58,3 +60,5 @@ const TimeRange &NodeDependency::range() const { return range_; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/dependency.h b/app/node/dependency.h index ab6dbdd28..8164a4ad0 100644 --- a/app/node/dependency.h +++ b/app/node/dependency.h @@ -25,6 +25,8 @@ #include "common/timerange.h" +OLIVE_NAMESPACE_ENTER + class Node; class NodeDependency { @@ -43,6 +45,8 @@ private: TimeRange range_; }; -Q_DECLARE_METATYPE(NodeDependency) +OLIVE_NAMESPACE_EXIT + +Q_DECLARE_METATYPE(OLIVE_NAMESPACE::NodeDependency) #endif // NODEDEPENDENCY_H diff --git a/app/node/distort/transform/transform.cpp b/app/node/distort/transform/transform.cpp index d9aa3271f..5b4e70e80 100644 --- a/app/node/distort/transform/transform.cpp +++ b/app/node/distort/transform/transform.cpp @@ -23,6 +23,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + TransformDistort::TransformDistort() { position_input_ = new NodeInput("pos_in", NodeParam::kVec2); @@ -112,3 +114,5 @@ void TransformDistort::UniformScaleChanged() { scale_input_->set_property("disabley", uniform_scale_input_->get_standard_value().toBool()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/distort/transform/transform.h b/app/node/distort/transform/transform.h index 305fb48fa..fb4beb17a 100644 --- a/app/node/distort/transform/transform.h +++ b/app/node/distort/transform/transform.h @@ -23,6 +23,8 @@ #include "node/node.h" +OLIVE_NAMESPACE_ENTER + class TransformDistort : public Node { Q_OBJECT @@ -56,4 +58,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TRANSFORMDISTORT_H diff --git a/app/node/edge.cpp b/app/node/edge.cpp index aa9e25ca2..1765d6c1b 100644 --- a/app/node/edge.cpp +++ b/app/node/edge.cpp @@ -20,6 +20,8 @@ #include "edge.h" +OLIVE_NAMESPACE_ENTER + NodeEdge::NodeEdge(NodeOutput *output, NodeInput *input) : output_(output), input_(input) @@ -35,3 +37,5 @@ NodeInput *NodeEdge::input() { return input_; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/edge.h b/app/node/edge.h index 1bbe8dc20..990fdc626 100644 --- a/app/node/edge.h +++ b/app/node/edge.h @@ -23,6 +23,10 @@ #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class NodeOutput; class NodeInput; @@ -57,4 +61,6 @@ private: using NodeEdgePtr = std::shared_ptr; +OLIVE_NAMESPACE_EXIT + #endif // EDGE_H diff --git a/app/node/external.cpp b/app/node/external.cpp index bb1c946b1..7bafc30e9 100644 --- a/app/node/external.cpp +++ b/app/node/external.cpp @@ -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 . + +***/ + #include "external.h" #include +OLIVE_NAMESPACE_ENTER + ExternalNode::ExternalNode(const QString &xml_meta_filename) : meta_(xml_meta_filename) { @@ -64,3 +86,5 @@ NodeInput *ExternalNode::ShaderIterativeInput() const { return meta_.iteration_input(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/external.h b/app/node/external.h index b1a4604ff..a20b11c15 100644 --- a/app/node/external.h +++ b/app/node/external.h @@ -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 . + +***/ + #ifndef EXTERNALNODE_H #define EXTERNALNODE_H @@ -6,6 +26,8 @@ #include "node.h" #include "metareader.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A node generated from an external XML metadata file */ @@ -33,4 +55,6 @@ private: NodeMetaReader meta_; }; +OLIVE_NAMESPACE_EXIT + #endif // EXTERNALNODE_H diff --git a/app/node/factory.cpp b/app/node/factory.cpp index 6080c159a..0fab0b697 100644 --- a/app/node/factory.cpp +++ b/app/node/factory.cpp @@ -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 . + +***/ + #include "factory.h" #include "audio/pan/pan.h" @@ -14,6 +34,7 @@ #include "output/viewer/viewer.h" #include "external.h" +OLIVE_NAMESPACE_ENTER QList NodeFactory::library_; void NodeFactory::Initialize() @@ -149,3 +170,5 @@ Node *NodeFactory::CreateInternal(const NodeFactory::InternalID &id) // We should never get here abort(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/factory.h b/app/node/factory.h index a0bd892aa..10077a641 100644 --- a/app/node/factory.h +++ b/app/node/factory.h @@ -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 . + +***/ + #ifndef NODEFACTORY_H #define NODEFACTORY_H @@ -6,6 +26,8 @@ #include "node.h" #include "widget/menu/menu.h" +OLIVE_NAMESPACE_ENTER + class NodeFactory { public: @@ -44,4 +66,6 @@ private: static QList library_; }; +OLIVE_NAMESPACE_EXIT + #endif // NODEFACTORY_H diff --git a/app/node/graph.cpp b/app/node/graph.cpp index 84b8c8308..a5250470e 100644 --- a/app/node/graph.cpp +++ b/app/node/graph.cpp @@ -20,6 +20,8 @@ #include "graph.h" +OLIVE_NAMESPACE_ENTER + NodeGraph::NodeGraph() { @@ -81,3 +83,5 @@ bool NodeGraph::ContainsNode(Node *n) const { return (n->parent() == this); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/graph.h b/app/node/graph.h index 8394760d7..da5b78983 100644 --- a/app/node/graph.h +++ b/app/node/graph.h @@ -25,6 +25,8 @@ #include "node/node.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A collection of nodes */ @@ -90,4 +92,6 @@ private: QList node_children_; }; +OLIVE_NAMESPACE_EXIT + #endif // NODEGRAPH_H diff --git a/app/node/input.cpp b/app/node/input.cpp index 1b5d53307..025930760 100644 --- a/app/node/input.cpp +++ b/app/node/input.cpp @@ -34,6 +34,8 @@ #include "project/item/footage/stream.h" #include "render/color.h" +OLIVE_NAMESPACE_ENTER + NodeInput::NodeInput(const QString& id, const DataType &type, const QVariant &default_value) : NodeParam(id), data_type_(type), @@ -1043,3 +1045,5 @@ QVariant NodeInput::combine_track_values_into_normal_value(const QVector. + +***/ + #include "audio.h" +OLIVE_NAMESPACE_ENTER + AudioInput::AudioInput() { } @@ -23,3 +45,5 @@ QString AudioInput::Description() const { return tr("Import an audio footage stream."); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/input/media/audio/audio.h b/app/node/input/media/audio/audio.h index 07961c023..2bc6db0ef 100644 --- a/app/node/input/media/audio/audio.h +++ b/app/node/input/media/audio/audio.h @@ -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 . + +***/ + #ifndef AUDIOINPUT_H #define AUDIOINPUT_H #include "../media.h" +OLIVE_NAMESPACE_ENTER + class AudioInput : public MediaInput { public: @@ -17,4 +39,6 @@ public: private: }; +OLIVE_NAMESPACE_EXIT + #endif // AUDIOINPUT_H diff --git a/app/node/input/media/media.cpp b/app/node/input/media/media.cpp index b3db8a3ea..b3058d112 100644 --- a/app/node/input/media/media.cpp +++ b/app/node/input/media/media.cpp @@ -22,6 +22,8 @@ #include "common/timecodefunctions.h" +OLIVE_NAMESPACE_ENTER + MediaInput::MediaInput() : connected_footage_(nullptr) { @@ -89,3 +91,5 @@ void MediaInput::FootageParametersChanged() { InvalidateCache(0, RATIONAL_MAX, footage_input_); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/input/media/media.h b/app/node/input/media/media.h index 7501925a8..405edf7c2 100644 --- a/app/node/input/media/media.h +++ b/app/node/input/media/media.h @@ -24,6 +24,8 @@ #include "codec/decoder.h" #include "node/node.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A node that imports an image */ @@ -54,4 +56,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // MEDIAINPUT_H diff --git a/app/node/input/media/video/video.cpp b/app/node/input/media/video/video.cpp index f03023a00..2820cb292 100644 --- a/app/node/input/media/video/video.cpp +++ b/app/node/input/media/video/video.cpp @@ -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 . + +***/ + #include "video.h" #include @@ -9,6 +29,8 @@ #include "project/item/footage/footage.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + VideoInput::VideoInput() { matrix_input_ = new NodeInput("matrix_in", NodeInput::kMatrix); @@ -61,3 +83,5 @@ void VideoInput::Retranslate() matrix_input_->set_name(tr("Transform")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/input/media/video/video.h b/app/node/input/media/video/video.h index 7e9c53cc0..fdeb109fe 100644 --- a/app/node/input/media/video/video.h +++ b/app/node/input/media/video/video.h @@ -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 . + +***/ + #ifndef VIDEOINPUT_H #define VIDEOINPUT_H @@ -6,6 +26,8 @@ #include "../media.h" #include "render/colormanager.h" +OLIVE_NAMESPACE_ENTER + class VideoInput : public MediaInput { public: @@ -32,4 +54,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // VIDEOINPUT_H diff --git a/app/node/input/time/timeinput.cpp b/app/node/input/time/timeinput.cpp index 12f334ad1..48eefb662 100644 --- a/app/node/input/time/timeinput.cpp +++ b/app/node/input/time/timeinput.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "timeinput.h" +OLIVE_NAMESPACE_ENTER + TimeInput::TimeInput() { } @@ -39,3 +61,5 @@ NodeValueTable TimeInput::Value(const NodeValueDatabase &value) const return table; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/input/time/timeinput.h b/app/node/input/time/timeinput.h index 340646e64..de3016a3e 100644 --- a/app/node/input/time/timeinput.h +++ b/app/node/input/time/timeinput.h @@ -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 . + +***/ + #ifndef TIMEINPUT_H #define TIMEINPUT_H #include "node/node.h" +OLIVE_NAMESPACE_ENTER + class TimeInput : public Node { Q_OBJECT @@ -20,4 +42,6 @@ public: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMEINPUT_H diff --git a/app/node/inputarray.cpp b/app/node/inputarray.cpp index 00fd6096d..4cea15ac2 100644 --- a/app/node/inputarray.cpp +++ b/app/node/inputarray.cpp @@ -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 . + +***/ + #include "inputarray.h" #include @@ -5,6 +25,8 @@ #include "common/xmlutils.h" #include "node.h" +OLIVE_NAMESPACE_ENTER + NodeInputArray::NodeInputArray(const QString &id, const DataType &type, const QVariant &default_value) : NodeInput(id, type, default_value), default_value_(default_value) @@ -190,3 +212,5 @@ void NodeInputArray::SaveInternal(QXmlStreamWriter *writer) const writer->writeEndElement(); // subparameters } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/inputarray.h b/app/node/inputarray.h index ceaa6381d..d43300e22 100644 --- a/app/node/inputarray.h +++ b/app/node/inputarray.h @@ -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 . + +***/ + #ifndef INPUTARRAY_H #define INPUTARRAY_H #include "input.h" +OLIVE_NAMESPACE_ENTER + class NodeInputArray : public NodeInput { Q_OBJECT @@ -44,4 +66,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // INPUTARRAY_H diff --git a/app/node/keyframe.cpp b/app/node/keyframe.cpp index fadb809af..d6839088d 100644 --- a/app/node/keyframe.cpp +++ b/app/node/keyframe.cpp @@ -20,6 +20,8 @@ #include "keyframe.h" +OLIVE_NAMESPACE_ENTER + const NodeKeyframe::Type NodeKeyframe::kDefaultType = kLinear; NodeKeyframe::NodeKeyframe(const rational &time, const QVariant &value, const NodeKeyframe::Type &type, const int &track) : @@ -142,3 +144,5 @@ void NodeKeyframe::set_parent(NodeInput *parent) { parent_ = parent; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/keyframe.h b/app/node/keyframe.h index ef09bae0a..6b12de038 100644 --- a/app/node/keyframe.h +++ b/app/node/keyframe.h @@ -27,6 +27,8 @@ #include "common/rational.h" +OLIVE_NAMESPACE_ENTER + class NodeInput; class NodeKeyframe; @@ -162,6 +164,8 @@ private: }; -Q_DECLARE_METATYPE(NodeKeyframe::Type) +OLIVE_NAMESPACE_EXIT + +Q_DECLARE_METATYPE(OLIVE_NAMESPACE::NodeKeyframe::Type) #endif // NODEKEYFRAME_H diff --git a/app/node/math/math.cpp b/app/node/math/math.cpp index 7723ec5a5..7bd031240 100644 --- a/app/node/math/math.cpp +++ b/app/node/math/math.cpp @@ -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 . + +***/ + #include "math.h" #include #include +OLIVE_NAMESPACE_ENTER + MathNode::MathNode() { // FIXME: Make this a combobox @@ -417,3 +439,5 @@ float MathNode::RetrieveNumber(const NodeValue &val) return val.data().toFloat(); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/math/math.h b/app/node/math/math.h index 7e0e628d9..50448feb9 100644 --- a/app/node/math/math.h +++ b/app/node/math/math.h @@ -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 . + +***/ + #ifndef MATHNODE_H #define MATHNODE_H #include "node/node.h" +OLIVE_NAMESPACE_ENTER + class MathNode : public Node { public: @@ -86,4 +108,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // MATHNODE_H diff --git a/app/node/metareader.cpp b/app/node/metareader.cpp index fe5b15ed1..5e7c29b5c 100644 --- a/app/node/metareader.cpp +++ b/app/node/metareader.cpp @@ -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 . + +***/ + #include "metareader.h" #include @@ -5,6 +25,8 @@ #include "config/config.h" #include "node.h" +OLIVE_NAMESPACE_ENTER + NodeMetaReader::NodeMetaReader(const QString &xml_meta_filename) : xml_filename_(xml_meta_filename), iterations_(1), @@ -303,3 +325,5 @@ NodeInput *NodeMetaReader::GetInputWithID(const QString &id) const } return nullptr; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/metareader.h b/app/node/metareader.h index ae5835fe8..4806da78b 100644 --- a/app/node/metareader.h +++ b/app/node/metareader.h @@ -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 . + +***/ + #ifndef NODEMETAREADER_H #define NODEMETAREADER_H @@ -7,6 +27,8 @@ #include "input.h" +OLIVE_NAMESPACE_ENTER + class NodeMetaReader { public: @@ -58,4 +80,6 @@ private: QList inputs_; }; +OLIVE_NAMESPACE_EXIT + #endif // NODEMETAREADER_H diff --git a/app/node/node.cpp b/app/node/node.cpp index 4da2056c4..ba2bf8279 100644 --- a/app/node/node.cpp +++ b/app/node/node.cpp @@ -26,6 +26,8 @@ #include "common/xmlutils.h" +OLIVE_NAMESPACE_ENTER + Node::Node() : can_be_deleted_(true) { @@ -679,3 +681,5 @@ void Node::InputConnectionChanged(NodeEdgePtr edge) InvalidateCache(RATIONAL_MIN, RATIONAL_MAX, static_cast(sender())); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/node.h b/app/node/node.h index bbd99ee96..efd45d10e 100644 --- a/app/node/node.h +++ b/app/node/node.h @@ -36,6 +36,8 @@ #include "node/value.h" #include "render/audioparams.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A single processing unit that can be connected with others to create intricate processing systems * @@ -460,4 +462,6 @@ T* Node::FindOutputNode() return static_cast(FindOutputNodeInternal(this)); } +OLIVE_NAMESPACE_EXIT + #endif // NODE_H diff --git a/app/node/output.cpp b/app/node/output.cpp index 122c50851..070a64d03 100644 --- a/app/node/output.cpp +++ b/app/node/output.cpp @@ -23,6 +23,8 @@ #include "common/xmlutils.h" #include "node/node.h" +OLIVE_NAMESPACE_ENTER + NodeOutput::NodeOutput(const QString &id) : NodeParam(id) { @@ -69,3 +71,5 @@ void NodeOutput::Save(QXmlStreamWriter *writer) const writer->writeEndElement(); // output } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/output.h b/app/node/output.h index 1789182f1..42c5f5ec6 100644 --- a/app/node/output.h +++ b/app/node/output.h @@ -24,6 +24,8 @@ #include "common/timerange.h" #include "param.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A node parameter designed to serve data to the input of another node */ @@ -50,4 +52,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // NODEOUTPUT_H diff --git a/app/node/output/track/track.cpp b/app/node/output/track/track.cpp index 277a096f4..7b432013c 100644 --- a/app/node/output/track/track.cpp +++ b/app/node/output/track/track.cpp @@ -27,6 +27,8 @@ #include "node/block/gap/gap.h" #include "node/graph.h" +OLIVE_NAMESPACE_ENTER + TrackOutput::TrackOutput() : track_type_(Timeline::kTrackTypeNone), block_invalidate_cache_stack_(0), @@ -560,3 +562,5 @@ void TrackOutput::BlockLengthChanged() UpdateInOutFrom(index); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/output/track/track.h b/app/node/output/track/track.h index b8dc76d21..ffbf07c0f 100644 --- a/app/node/output/track/track.h +++ b/app/node/output/track/track.h @@ -24,6 +24,8 @@ #include "common/timelinecommon.h" #include "node/block/block.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A time traversal Node for sorting through one channel/track of Blocks */ @@ -214,4 +216,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TRACKOUTPUT_H diff --git a/app/node/output/track/tracklist.cpp b/app/node/output/track/tracklist.cpp index 232f99e6e..601bb7336 100644 --- a/app/node/output/track/tracklist.cpp +++ b/app/node/output/track/tracklist.cpp @@ -24,6 +24,8 @@ #include "node/math/math.h" #include "node/output/viewer/viewer.h" +OLIVE_NAMESPACE_ENTER + TrackList::TrackList(ViewerOutput *parent, const Timeline::TrackType &type, NodeInputArray *track_input) : QObject(parent), track_input_(track_input), @@ -243,3 +245,5 @@ void TrackList::TrackHeightChangedSlot(int height) { emit TrackHeightChanged(static_cast(sender())->Index(), height); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/output/track/tracklist.h b/app/node/output/track/tracklist.h index 35b7d877d..6cde374f8 100644 --- a/app/node/output/track/tracklist.h +++ b/app/node/output/track/tracklist.h @@ -27,6 +27,8 @@ #include "node/graph.h" #include "node/output/track/track.h" +OLIVE_NAMESPACE_ENTER + class ViewerOutput; class TrackList : public QObject { @@ -115,4 +117,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TRACKLIST_H diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp index 5088d512b..7a664f645 100644 --- a/app/node/output/viewer/viewer.cpp +++ b/app/node/output/viewer/viewer.cpp @@ -22,6 +22,8 @@ #include "node/traverser.h" +OLIVE_NAMESPACE_ENTER + ViewerOutput::ViewerOutput() { texture_input_ = new NodeInput("tex_in", NodeInput::kTexture); @@ -281,3 +283,5 @@ void ViewerOutput::TrackHeightChangedSlot(int index, int height) { emit TrackHeightChanged(static_cast(sender())->type(), index, height); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/output/viewer/viewer.h b/app/node/output/viewer/viewer.h index 2d86dfc0e..95afbce70 100644 --- a/app/node/output/viewer/viewer.h +++ b/app/node/output/viewer/viewer.h @@ -32,6 +32,8 @@ #include "render/audioparams.h" #include "timeline/trackreference.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A bridge between a node system and a ViewerPanel * @@ -143,4 +145,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // VIEWER_H diff --git a/app/node/param.cpp b/app/node/param.cpp index 3a9752dc3..79ec209e2 100644 --- a/app/node/param.cpp +++ b/app/node/param.cpp @@ -31,6 +31,8 @@ #include "node/output.h" #include "render/color.h" +OLIVE_NAMESPACE_ENTER + NodeParam::NodeParam(const QString &id) : id_(id), connectable_(true) @@ -261,3 +263,5 @@ QByteArray NodeParam::ValueToBytesInternal(const QVariant &v) return bytes; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/param.h b/app/node/param.h index fb4399004..46a37b0e9 100644 --- a/app/node/param.h +++ b/app/node/param.h @@ -30,6 +30,8 @@ #include "common/xmlutils.h" #include "node/edge.h" +OLIVE_NAMESPACE_ENTER + class Node; /** @@ -401,4 +403,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // NODEPARAM_H diff --git a/app/node/traverser.cpp b/app/node/traverser.cpp index ea601312f..9884be33f 100644 --- a/app/node/traverser.cpp +++ b/app/node/traverser.cpp @@ -1,11 +1,28 @@ +/*** + + 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 . + +***/ + #include "traverser.h" #include "node.h" -NodeTraverser::NodeTraverser() -{ - -} +OLIVE_NAMESPACE_ENTER NodeValueDatabase NodeTraverser::GenerateDatabase(const Node* node, const TimeRange &range) { @@ -80,3 +97,5 @@ NodeValueTable NodeTraverser::ProcessInput(const NodeInput *input, const TimeRan return table; } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/traverser.h b/app/node/traverser.h index 8166a7987..2111abf95 100644 --- a/app/node/traverser.h +++ b/app/node/traverser.h @@ -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 . + +***/ + #ifndef NODETRAVERSER_H #define NODETRAVERSER_H @@ -8,10 +28,12 @@ #include "project/item/footage/stream.h" #include "value.h" +OLIVE_NAMESPACE_ENTER + class NodeTraverser : public CancelableObject { public: - NodeTraverser(); + NodeTraverser() = default; NodeValueTable ProcessNode(const NodeDependency &dep); @@ -28,4 +50,6 @@ protected: }; +OLIVE_NAMESPACE_EXIT + #endif // NODETRAVERSER_H diff --git a/app/node/value.cpp b/app/node/value.cpp index 2810ad20a..497a84129 100644 --- a/app/node/value.cpp +++ b/app/node/value.cpp @@ -1,9 +1,26 @@ +/*** + + 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 . + +***/ + #include "value.h" -NodeValueDatabase::NodeValueDatabase() -{ - -} +OLIVE_NAMESPACE_ENTER NodeValueTable NodeValueDatabase::operator[](const QString &input_id) const { @@ -52,10 +69,6 @@ const QVariant &NodeValue::data() const return data_; } -NodeValueTable::NodeValueTable() -{ -} - QVariant NodeValueTable::Get(const NodeParam::DataType &type, const QString &tag) const { NodeValue v = GetWithMeta(type, tag); @@ -180,3 +193,5 @@ int NodeValueTable::GetInternal(const NodeParam::DataType &type, const QString & return index; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/node/value.h b/app/node/value.h index 8f62ae77e..4bfe949bc 100644 --- a/app/node/value.h +++ b/app/node/value.h @@ -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 . + +***/ + #ifndef VALUE_H #define VALUE_H @@ -5,6 +25,8 @@ #include "input.h" +OLIVE_NAMESPACE_ENTER + class NodeValue { public: @@ -25,7 +47,7 @@ private: class NodeValueTable { public: - NodeValueTable(); + NodeValueTable() = default; QVariant Get(const NodeParam::DataType& type, const QString& tag = QString()) const; NodeValue GetWithMeta(const NodeParam::DataType& type, const QString& tag = QString()) const; @@ -52,7 +74,7 @@ private: class NodeValueDatabase { public: - NodeValueDatabase(); + NodeValueDatabase() = default; NodeValueTable operator[](const QString& input_id) const; NodeValueTable operator[](const NodeInput* input) const; @@ -67,6 +89,8 @@ private: }; -Q_DECLARE_METATYPE(NodeValueTable) +OLIVE_NAMESPACE_EXIT + +Q_DECLARE_METATYPE(OLIVE_NAMESPACE::NodeValueTable) #endif // VALUE_H diff --git a/app/panel/audiomonitor/audiomonitor.cpp b/app/panel/audiomonitor/audiomonitor.cpp index 3b5aaec35..0d92260a3 100644 --- a/app/panel/audiomonitor/audiomonitor.cpp +++ b/app/panel/audiomonitor/audiomonitor.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "audiomonitor.h" +OLIVE_NAMESPACE_ENTER + AudioMonitorPanel::AudioMonitorPanel(QWidget *parent) : PanelWidget(parent) { @@ -17,3 +39,5 @@ void AudioMonitorPanel::Retranslate() { SetTitle(tr("Audio Monitor")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/audiomonitor/audiomonitor.h b/app/panel/audiomonitor/audiomonitor.h index ac94de24f..513ec2750 100644 --- a/app/panel/audiomonitor/audiomonitor.h +++ b/app/panel/audiomonitor/audiomonitor.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef AUDIOMONITORPANEL_H #define AUDIOMONITORPANEL_H #include "widget/audiomonitor/audiomonitor.h" #include "widget/panel/panel.h" +OLIVE_NAMESPACE_ENTER + /** * @brief PanelWidget wrapper around an AudioMonitor */ @@ -19,4 +41,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // AUDIOMONITORPANEL_H diff --git a/app/panel/curve/curve.cpp b/app/panel/curve/curve.cpp index 752d00cb2..a8bba6745 100644 --- a/app/panel/curve/curve.cpp +++ b/app/panel/curve/curve.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "curve.h" +OLIVE_NAMESPACE_ENTER + CurvePanel::CurvePanel(QWidget *parent) : TimeBasedPanel(parent) { @@ -41,3 +63,5 @@ void CurvePanel::Retranslate() SetTitle(tr("Curve Editor")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/curve/curve.h b/app/panel/curve/curve.h index 6f7251537..36a3ba564 100644 --- a/app/panel/curve/curve.h +++ b/app/panel/curve/curve.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef CURVEPANEL_H #define CURVEPANEL_H #include "panel/timebased/timebased.h" #include "widget/curvewidget/curvewidget.h" +OLIVE_NAMESPACE_ENTER + class CurvePanel : public TimeBasedPanel { Q_OBJECT @@ -24,4 +46,6 @@ protected: }; +OLIVE_NAMESPACE_EXIT + #endif // CURVEPANEL_H diff --git a/app/panel/footageviewer/footageviewer.cpp b/app/panel/footageviewer/footageviewer.cpp index 011ae9bb5..4e53b5816 100644 --- a/app/panel/footageviewer/footageviewer.cpp +++ b/app/panel/footageviewer/footageviewer.cpp @@ -22,6 +22,8 @@ #include "widget/viewer/footageviewer.h" +OLIVE_NAMESPACE_ENTER + FootageViewerPanel::FootageViewerPanel(QWidget *parent) : ViewerPanelBase(parent) { @@ -57,3 +59,5 @@ void FootageViewerPanel::Retranslate() SetTitle(tr("Footage Viewer")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/footageviewer/footageviewer.h b/app/panel/footageviewer/footageviewer.h index 90cb6d6a7..ff632ce20 100644 --- a/app/panel/footageviewer/footageviewer.h +++ b/app/panel/footageviewer/footageviewer.h @@ -26,6 +26,8 @@ #include "panel/viewer/viewerbase.h" #include "panel/project/footagemanagementpanel.h" +OLIVE_NAMESPACE_ENTER + /** * @brief Dockable wrapper around a ViewerWidget */ @@ -43,4 +45,6 @@ protected: }; +OLIVE_NAMESPACE_EXIT + #endif // FOOTAGE_VIEWER_PANEL_H diff --git a/app/panel/node/node.cpp b/app/panel/node/node.cpp index f21fe2098..18dd0a84d 100644 --- a/app/panel/node/node.cpp +++ b/app/panel/node/node.cpp @@ -20,6 +20,8 @@ #include "node.h" +OLIVE_NAMESPACE_ENTER + NodePanel::NodePanel(QWidget *parent) : PanelWidget(parent) { @@ -88,3 +90,5 @@ void NodePanel::Retranslate() { SetTitle(tr("Node Editor")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/node/node.h b/app/panel/node/node.h index 5ce5b75ca..c2f07a482 100644 --- a/app/panel/node/node.h +++ b/app/panel/node/node.h @@ -24,6 +24,8 @@ #include "widget/nodeview/nodeview.h" #include "widget/panel/panel.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A PanelWidget wrapper around a NodeView */ @@ -62,4 +64,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // NODEPANEL_H diff --git a/app/panel/panelmanager.cpp b/app/panel/panelmanager.cpp index d6e00510e..224f629ba 100644 --- a/app/panel/panelmanager.cpp +++ b/app/panel/panelmanager.cpp @@ -22,6 +22,8 @@ #include "config/config.h" +OLIVE_NAMESPACE_ENTER + PanelManager* PanelManager::instance_ = nullptr; PanelManager::PanelManager(QObject *parent) : @@ -147,3 +149,5 @@ void PanelManager::SetPanelsLocked(bool locked) locked_ = locked; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/panelmanager.h b/app/panel/panelmanager.h index 78f16b4e9..8264cb48b 100644 --- a/app/panel/panelmanager.h +++ b/app/panel/panelmanager.h @@ -26,6 +26,8 @@ #include "widget/panel/panel.h" +OLIVE_NAMESPACE_ENTER + /** * @brief The PanelFocusManager class * @@ -209,4 +211,6 @@ QList PanelManager::GetPanelsOfType() return panels; } +OLIVE_NAMESPACE_EXIT + #endif // PANELFOCUSMANAGER_H diff --git a/app/panel/param/param.cpp b/app/panel/param/param.cpp index 73e064692..d89c91780 100644 --- a/app/panel/param/param.cpp +++ b/app/panel/param/param.cpp @@ -20,6 +20,8 @@ #include "param.h" +OLIVE_NAMESPACE_ENTER + ParamPanel::ParamPanel(QWidget* parent) : TimeBasedPanel(parent) { @@ -55,3 +57,5 @@ void ParamPanel::Retranslate() SetSubtitle(tr("(multiple)")); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/param/param.h b/app/panel/param/param.h index 60a54cfb2..4894d5b42 100644 --- a/app/panel/param/param.h +++ b/app/panel/param/param.h @@ -24,6 +24,8 @@ #include "panel/timebased/timebased.h" #include "widget/nodeparamview/nodeparamview.h" +OLIVE_NAMESPACE_ENTER + class ParamPanel : public TimeBasedPanel { Q_OBJECT @@ -43,4 +45,6 @@ protected: }; +OLIVE_NAMESPACE_EXIT + #endif // PARAM_H diff --git a/app/panel/pixelsampler/pixelsamplerpanel.cpp b/app/panel/pixelsampler/pixelsamplerpanel.cpp index 5e9a00001..d84f2f154 100644 --- a/app/panel/pixelsampler/pixelsamplerpanel.cpp +++ b/app/panel/pixelsampler/pixelsamplerpanel.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "pixelsamplerpanel.h" +OLIVE_NAMESPACE_ENTER + PixelSamplerPanel::PixelSamplerPanel(QWidget *parent) : PanelWidget(parent) { @@ -21,3 +43,5 @@ void PixelSamplerPanel::Retranslate() { SetTitle(tr("Pixel Sampler")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/pixelsampler/pixelsamplerpanel.h b/app/panel/pixelsampler/pixelsamplerpanel.h index d645ea834..089de194c 100644 --- a/app/panel/pixelsampler/pixelsamplerpanel.h +++ b/app/panel/pixelsampler/pixelsamplerpanel.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef PIXELSAMPLERPANEL_H #define PIXELSAMPLERPANEL_H #include "widget/panel/panel.h" #include "widget/viewer/pixelsamplerwidget.h" +OLIVE_NAMESPACE_ENTER + class PixelSamplerPanel : public PanelWidget { Q_OBJECT @@ -20,4 +42,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // PIXELSAMPLERPANEL_H diff --git a/app/panel/project/footagemanagementpanel.h b/app/panel/project/footagemanagementpanel.h index dea3499bc..049cd3e76 100644 --- a/app/panel/project/footagemanagementpanel.h +++ b/app/panel/project/footagemanagementpanel.h @@ -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 . + +***/ + #ifndef FOOTAGEMANAGEMENTPANEL_H #define FOOTAGEMANAGEMENTPANEL_H @@ -5,9 +25,13 @@ #include "project/item/footage/footage.h" +OLIVE_NAMESPACE_ENTER + class FootageManagementPanel { public: virtual QList GetSelectedFootage() = 0; }; +OLIVE_NAMESPACE_EXIT + #endif // FOOTAGEMANAGEMENTPANEL_H diff --git a/app/panel/project/project.cpp b/app/panel/project/project.cpp index bf005bd82..e17e181e6 100644 --- a/app/panel/project/project.cpp +++ b/app/panel/project/project.cpp @@ -32,6 +32,8 @@ #include "widget/projecttoolbar/projecttoolbar.h" #include "window/mainwindow/mainwindow.h" +OLIVE_NAMESPACE_ENTER + ProjectPanel::ProjectPanel(QWidget *parent) : PanelWidget(parent) { @@ -197,3 +199,5 @@ QList ProjectPanel::GetSelectedFootage() return footage; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/project/project.h b/app/panel/project/project.h index 30fed2e92..011135cdc 100644 --- a/app/panel/project/project.h +++ b/app/panel/project/project.h @@ -26,6 +26,8 @@ #include "widget/panel/panel.h" #include "widget/projectexplorer/projectexplorer.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A PanelWidget wrapper around a ProjectExplorer and a ProjectToolbar */ @@ -74,4 +76,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECT_PANEL_H diff --git a/app/panel/sequenceviewer/sequenceviewer.cpp b/app/panel/sequenceviewer/sequenceviewer.cpp index 0a7144d4a..0c4ad6fcf 100644 --- a/app/panel/sequenceviewer/sequenceviewer.cpp +++ b/app/panel/sequenceviewer/sequenceviewer.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "sequenceviewer.h" +OLIVE_NAMESPACE_ENTER + SequenceViewerPanel::SequenceViewerPanel(QWidget *parent) : ViewerPanel(parent) { @@ -16,3 +38,5 @@ void SequenceViewerPanel::Retranslate() SetTitle(tr("Sequence Viewer")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/sequenceviewer/sequenceviewer.h b/app/panel/sequenceviewer/sequenceviewer.h index d14eba9d3..4182bb793 100644 --- a/app/panel/sequenceviewer/sequenceviewer.h +++ b/app/panel/sequenceviewer/sequenceviewer.h @@ -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 . + +***/ + #ifndef SEQUENCEVIEWERPANEL_H #define SEQUENCEVIEWERPANEL_H #include "panel/viewer/viewer.h" +OLIVE_NAMESPACE_ENTER + class SequenceViewerPanel : public ViewerPanel { public: @@ -13,4 +35,6 @@ protected: }; +OLIVE_NAMESPACE_EXIT + #endif // SEQUENCEVIEWERPANEL_H diff --git a/app/panel/taskmanager/taskmanager.cpp b/app/panel/taskmanager/taskmanager.cpp index 88637e0ce..0df94775e 100644 --- a/app/panel/taskmanager/taskmanager.cpp +++ b/app/panel/taskmanager/taskmanager.cpp @@ -22,6 +22,8 @@ #include "task/taskmanager.h" +OLIVE_NAMESPACE_ENTER + TaskManagerPanel::TaskManagerPanel(QWidget* parent) : PanelWidget(parent) { @@ -45,3 +47,5 @@ void TaskManagerPanel::Retranslate() { SetTitle(tr("Task Manager")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/taskmanager/taskmanager.h b/app/panel/taskmanager/taskmanager.h index 6cdb7c625..78e272761 100644 --- a/app/panel/taskmanager/taskmanager.h +++ b/app/panel/taskmanager/taskmanager.h @@ -24,6 +24,8 @@ #include "widget/taskview/taskview.h" #include "widget/panel/panel.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A PanelWidget wrapper around a TaskView widget */ @@ -39,4 +41,6 @@ private: TaskView* view_; }; +OLIVE_NAMESPACE_EXIT + #endif // TASKMANAGER_H diff --git a/app/panel/timebased/timebased.cpp b/app/panel/timebased/timebased.cpp index e0e93e7a7..a2e0c7bd8 100644 --- a/app/panel/timebased/timebased.cpp +++ b/app/panel/timebased/timebased.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "timebased.h" +OLIVE_NAMESPACE_ENTER + TimeBasedPanel::TimeBasedPanel(QWidget *parent) : PanelWidget(parent), widget_(nullptr) @@ -164,3 +186,5 @@ void TimeBasedPanel::SetMarker() { GetTimeBasedWidget()->SetMarker(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/timebased/timebased.h b/app/panel/timebased/timebased.h index db4c7f9c5..8546f064e 100644 --- a/app/panel/timebased/timebased.h +++ b/app/panel/timebased/timebased.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef TIMEBASEDPANEL_H #define TIMEBASEDPANEL_H #include "widget/panel/panel.h" #include "widget/timebased/timebased.h" +OLIVE_NAMESPACE_ENTER + class TimeBasedPanel : public PanelWidget { Q_OBJECT @@ -86,4 +108,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMEBASEDPANEL_H diff --git a/app/panel/timeline/timeline.cpp b/app/panel/timeline/timeline.cpp index a4b2545b5..52b859434 100644 --- a/app/panel/timeline/timeline.cpp +++ b/app/panel/timeline/timeline.cpp @@ -23,6 +23,8 @@ #include "panel/panelmanager.h" #include "panel/project/footagemanagementpanel.h" +OLIVE_NAMESPACE_ENTER + TimelinePanel::TimelinePanel(QWidget *parent) : TimeBasedPanel(parent) { @@ -156,3 +158,5 @@ void TimelinePanel::Retranslate() SetTitle(tr("Timeline")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/timeline/timeline.h b/app/panel/timeline/timeline.h index 5624b5e7c..70641c2c2 100644 --- a/app/panel/timeline/timeline.h +++ b/app/panel/timeline/timeline.h @@ -24,6 +24,8 @@ #include "panel/timebased/timebased.h" #include "widget/timelinewidget/timelinewidget.h" +OLIVE_NAMESPACE_ENTER + /** * @brief Panel container for a TimelineWidget */ @@ -83,4 +85,6 @@ signals: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINE_PANEL_H diff --git a/app/panel/tool/tool.cpp b/app/panel/tool/tool.cpp index 4992a61b2..a596df50d 100644 --- a/app/panel/tool/tool.cpp +++ b/app/panel/tool/tool.cpp @@ -23,6 +23,8 @@ #include "core.h" #include "widget/toolbar/toolbar.h" +OLIVE_NAMESPACE_ENTER + ToolPanel::ToolPanel(QWidget *parent) : PanelWidget(parent) { @@ -51,3 +53,5 @@ void ToolPanel::Retranslate() { SetTitle(tr("Tools")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/tool/tool.h b/app/panel/tool/tool.h index 088e2b355..6b144e7d3 100644 --- a/app/panel/tool/tool.h +++ b/app/panel/tool/tool.h @@ -23,6 +23,8 @@ #include "widget/panel/panel.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A PanelWidget wrapper around a Toolbar */ @@ -37,4 +39,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TOOL_PANEL_H diff --git a/app/panel/viewer/viewer.cpp b/app/panel/viewer/viewer.cpp index 6c5b6267a..122c45ddc 100644 --- a/app/panel/viewer/viewer.cpp +++ b/app/panel/viewer/viewer.cpp @@ -20,6 +20,8 @@ #include "viewer.h" +OLIVE_NAMESPACE_ENTER + ViewerPanel::ViewerPanel(QWidget *parent) : ViewerPanelBase(parent) { @@ -39,3 +41,5 @@ void ViewerPanel::Retranslate() SetTitle(tr("Viewer")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/viewer/viewer.h b/app/panel/viewer/viewer.h index fdec43265..80121a5cb 100644 --- a/app/panel/viewer/viewer.h +++ b/app/panel/viewer/viewer.h @@ -25,6 +25,8 @@ #include "viewerbase.h" +OLIVE_NAMESPACE_ENTER + /** * @brief Dockable wrapper around a ViewerWidget */ @@ -38,4 +40,6 @@ protected: }; +OLIVE_NAMESPACE_EXIT + #endif // VIEWER_PANEL_H diff --git a/app/panel/viewer/viewerbase.cpp b/app/panel/viewer/viewerbase.cpp index 50733e94f..aa98518c6 100644 --- a/app/panel/viewer/viewerbase.cpp +++ b/app/panel/viewer/viewerbase.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "viewerbase.h" +OLIVE_NAMESPACE_ENTER + ViewerPanelBase::ViewerPanelBase(QWidget *parent) : TimeBasedPanel(parent) { @@ -58,3 +80,5 @@ void ViewerPanelBase::SetFullScreen(QScreen *screen) { static_cast(GetTimeBasedWidget())->SetFullScreen(screen); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/panel/viewer/viewerbase.h b/app/panel/viewer/viewerbase.h index ac2d9d7b8..9a0555844 100644 --- a/app/panel/viewer/viewerbase.h +++ b/app/panel/viewer/viewerbase.h @@ -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 . + +***/ + #ifndef VIEWERPANELBASE_H #define VIEWERPANELBASE_H @@ -5,6 +25,8 @@ #include "panel/timebased/timebased.h" #include "widget/viewer/viewer.h" +OLIVE_NAMESPACE_ENTER + class ViewerPanelBase : public TimeBasedPanel { Q_OBJECT @@ -34,4 +56,6 @@ public: }; +OLIVE_NAMESPACE_EXIT + #endif // VIEWERPANELBASE_H diff --git a/app/project/item/folder/folder.cpp b/app/project/item/folder/folder.cpp index 105e9e075..2bf9fac4e 100644 --- a/app/project/item/folder/folder.cpp +++ b/app/project/item/folder/folder.cpp @@ -25,9 +25,7 @@ #include "project/item/sequence/sequence.h" #include "ui/icons/icons.h" -Folder::Folder() -{ -} +OLIVE_NAMESPACE_ENTER Item::Type Folder::type() const { @@ -91,3 +89,5 @@ void Folder::Save(QXmlStreamWriter *writer) const writer->writeEndElement(); // folder } + +OLIVE_NAMESPACE_EXIT diff --git a/app/project/item/folder/folder.h b/app/project/item/folder/folder.h index d774b1214..c2e3cbaba 100644 --- a/app/project/item/folder/folder.h +++ b/app/project/item/folder/folder.h @@ -25,6 +25,8 @@ #include "project/item/footage/footage.h" #include "project/item/item.h" +OLIVE_NAMESPACE_ENTER + /** * @brief The Folder class representing a directory in a project structure * @@ -34,7 +36,7 @@ class Folder : public Item { public: - Folder(); + Folder() = default; virtual Type type() const override; @@ -50,4 +52,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // FOLDER_H diff --git a/app/project/item/footage/audiostream.cpp b/app/project/item/footage/audiostream.cpp index 14369f983..1ddfbf95c 100644 --- a/app/project/item/footage/audiostream.cpp +++ b/app/project/item/footage/audiostream.cpp @@ -20,6 +20,8 @@ #include "audiostream.h" +OLIVE_NAMESPACE_ENTER + AudioStream::AudioStream() : index_done_(false) { @@ -130,3 +132,5 @@ void AudioStream::append_conformed_version(const AudioRenderingParams ¶ms) emit ConformAppended(params); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/project/item/footage/audiostream.h b/app/project/item/footage/audiostream.h index f46e76746..1c5a6c4a5 100644 --- a/app/project/item/footage/audiostream.h +++ b/app/project/item/footage/audiostream.h @@ -27,6 +27,8 @@ #include "render/audioparams.h" #include "stream.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A Stream derivative containing audio-specific information */ @@ -76,4 +78,6 @@ private: using AudioStreamPtr = std::shared_ptr; +OLIVE_NAMESPACE_EXIT + #endif // AUDIOSTREAM_H diff --git a/app/project/item/footage/footage.cpp b/app/project/item/footage/footage.cpp index 0c9101173..436f38516 100644 --- a/app/project/item/footage/footage.cpp +++ b/app/project/item/footage/footage.cpp @@ -28,6 +28,8 @@ #include "core.h" #include "ui/icons/icons.h" +OLIVE_NAMESPACE_ENTER + Footage::Footage() { Clear(); @@ -374,3 +376,5 @@ void Footage::UpdateTooltip() break; } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/project/item/footage/footage.h b/app/project/item/footage/footage.h index e44bc2142..db5fcade0 100644 --- a/app/project/item/footage/footage.h +++ b/app/project/item/footage/footage.h @@ -32,6 +32,8 @@ #include "project/item/footage/videostream.h" #include "timeline/timelinepoints.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A reference to an external media file with metadata in a project structure * @@ -265,4 +267,6 @@ private: using FootagePtr = std::shared_ptr; +OLIVE_NAMESPACE_EXIT + #endif // FOOTAGE_H diff --git a/app/project/item/footage/imagestream.cpp b/app/project/item/footage/imagestream.cpp index 2e17c0563..ec9f30825 100644 --- a/app/project/item/footage/imagestream.cpp +++ b/app/project/item/footage/imagestream.cpp @@ -25,6 +25,8 @@ #include "project/project.h" #include "render/colormanager.h" +OLIVE_NAMESPACE_ENTER + ImageStream::ImageStream() : premultiplied_alpha_(false) { @@ -136,3 +138,5 @@ void ImageStream::DefaultColorSpaceChanged() emit ParametersChanged(); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/project/item/footage/imagestream.h b/app/project/item/footage/imagestream.h index 7c6adad2c..ad12929b5 100644 --- a/app/project/item/footage/imagestream.h +++ b/app/project/item/footage/imagestream.h @@ -23,6 +23,8 @@ #include "stream.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A Stream derivative containing video-specific information */ @@ -67,4 +69,6 @@ private slots: using ImageStreamPtr = std::shared_ptr; +OLIVE_NAMESPACE_EXIT + #endif // IMAGESTREAM_H diff --git a/app/project/item/footage/stream.cpp b/app/project/item/footage/stream.cpp index 4937481b2..e0fe629f5 100644 --- a/app/project/item/footage/stream.cpp +++ b/app/project/item/footage/stream.cpp @@ -23,6 +23,8 @@ #include "footage.h" #include "ui/icons/icons.h" +OLIVE_NAMESPACE_ENTER + Stream::Stream() : footage_(nullptr), type_(kUnknown), @@ -165,3 +167,5 @@ void Stream::SaveCustomParameters(QXmlStreamWriter*) const stream_index_(stream_index) { }*/ + +OLIVE_NAMESPACE_EXIT diff --git a/app/project/item/footage/stream.h b/app/project/item/footage/stream.h index 743b9e6c4..4ba139811 100644 --- a/app/project/item/footage/stream.h +++ b/app/project/item/footage/stream.h @@ -29,6 +29,8 @@ #include "common/rational.h" +OLIVE_NAMESPACE_ENTER + class Footage; /*class StreamID { @@ -136,7 +138,9 @@ private: using StreamPtr = std::shared_ptr; +OLIVE_NAMESPACE_EXIT + #include -Q_DECLARE_METATYPE(StreamPtr) +Q_DECLARE_METATYPE(OLIVE_NAMESPACE::StreamPtr) #endif // STREAM_H diff --git a/app/project/item/footage/videostream.cpp b/app/project/item/footage/videostream.cpp index 36d0f7fd5..8bbd09125 100644 --- a/app/project/item/footage/videostream.cpp +++ b/app/project/item/footage/videostream.cpp @@ -24,6 +24,8 @@ #include "common/timecodefunctions.h" +OLIVE_NAMESPACE_ENTER + const int64_t VideoStream::kEndTimestamp = AV_NOPTS_VALUE; VideoStream::VideoStream() : @@ -202,3 +204,5 @@ bool VideoStream::save_frame_index(const QString &s) return false; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/project/item/footage/videostream.h b/app/project/item/footage/videostream.h index 05ec4ac95..8ce99a688 100644 --- a/app/project/item/footage/videostream.h +++ b/app/project/item/footage/videostream.h @@ -23,6 +23,8 @@ #include "imagestream.h" +OLIVE_NAMESPACE_ENTER + class VideoStream : public ImageStream { Q_OBJECT @@ -72,4 +74,6 @@ private: using VideoStreamPtr = std::shared_ptr; +OLIVE_NAMESPACE_EXIT + #endif // VIDEOSTREAM_H diff --git a/app/project/item/item.cpp b/app/project/item/item.cpp index c8aab77f5..734fd2a99 100644 --- a/app/project/item/item.cpp +++ b/app/project/item/item.cpp @@ -20,6 +20,8 @@ #include "item.h" +OLIVE_NAMESPACE_ENTER + Item::Item() : parent_(nullptr), project_(nullptr) @@ -200,3 +202,5 @@ bool Item::ChildExistsWithNameInternal(const QString &name, Item *folder) return false; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/project/item/item.h b/app/project/item/item.h index 270fd3be7..ed2e7cbde 100644 --- a/app/project/item/item.h +++ b/app/project/item/item.h @@ -34,6 +34,8 @@ #include "node/param.h" #include "project/item/footage/stream.h" +OLIVE_NAMESPACE_ENTER + class Project; class Item; @@ -122,4 +124,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // ITEM_H diff --git a/app/project/item/sequence/sequence.cpp b/app/project/item/sequence/sequence.cpp index d258269f0..d8c45dc10 100644 --- a/app/project/item/sequence/sequence.cpp +++ b/app/project/item/sequence/sequence.cpp @@ -35,6 +35,8 @@ #include "panel/sequenceviewer/sequenceviewer.h" #include "ui/icons/icons.h" +OLIVE_NAMESPACE_ENTER + Sequence::Sequence() { viewer_output_ = new ViewerOutput(); @@ -283,3 +285,5 @@ void Sequence::NameChangedEvent(const QString &name) { viewer_output_->set_media_name(name); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/project/item/sequence/sequence.h b/app/project/item/sequence/sequence.h index 379efbe65..ddf5f8146 100644 --- a/app/project/item/sequence/sequence.h +++ b/app/project/item/sequence/sequence.h @@ -29,6 +29,8 @@ #include "project/item/item.h" #include "timeline/timelinepoints.h" +OLIVE_NAMESPACE_ENTER + class Sequence; using SequencePtr = std::shared_ptr; @@ -82,4 +84,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // SEQUENCE_H diff --git a/app/project/item/sequence/sequenceparams.cpp b/app/project/item/sequence/sequenceparams.cpp deleted file mode 100644 index 0e5e288d0..000000000 --- a/app/project/item/sequence/sequenceparams.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "sequenceparams.h" - -SequenceParams::SequenceParams() -{ - -} diff --git a/app/project/item/sequence/sequenceparams.h b/app/project/item/sequence/sequenceparams.h deleted file mode 100644 index 0b017ddcf..000000000 --- a/app/project/item/sequence/sequenceparams.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef SEQUENCEPARAMS_H -#define SEQUENCEPARAMS_H - - -class SequenceParams -{ -public: - SequenceParams(); -}; - -#endif // SEQUENCEPARAMS_H diff --git a/app/project/project.cpp b/app/project/project.cpp index add56c6f9..15d899401 100644 --- a/app/project/project.cpp +++ b/app/project/project.cpp @@ -28,6 +28,8 @@ #include "dialog/progress/progress.h" #include "window/mainwindow/mainwindow.h" +OLIVE_NAMESPACE_ENTER + Project::Project() { root_.set_project(this); @@ -153,3 +155,5 @@ QList Project::get_items_of_type(Item::Type type) const { return root_.get_children_of_type(type, true); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/project/project.h b/app/project/project.h index 8b565469d..6be15699f 100644 --- a/app/project/project.h +++ b/app/project/project.h @@ -27,6 +27,8 @@ #include "render/colormanager.h" #include "project/item/folder/folder.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A project instance containing all the data pertaining to the user's project * @@ -82,4 +84,6 @@ private: using ProjectPtr = std::shared_ptr; +OLIVE_NAMESPACE_EXIT + #endif // PROJECT_H diff --git a/app/project/projectimportmanager.cpp b/app/project/projectimportmanager.cpp index 096524874..9b55bbee8 100644 --- a/app/project/projectimportmanager.cpp +++ b/app/project/projectimportmanager.cpp @@ -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 . + +***/ + #include "projectimportmanager.h" #include @@ -7,6 +27,8 @@ #include "codec/decoder.h" #include "project/item/footage/footage.h" +OLIVE_NAMESPACE_ENTER + ProjectImportManager::ProjectImportManager(ProjectViewModel *model, Folder *folder, const QStringList &filenames) : model_(model), folder_(folder) @@ -112,3 +134,5 @@ void ProjectImportManager::Import(Folder *folder, const QFileInfoList &import, i } } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/project/projectimportmanager.h b/app/project/projectimportmanager.h index c757bf928..f42033f58 100644 --- a/app/project/projectimportmanager.h +++ b/app/project/projectimportmanager.h @@ -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 . + +***/ + #ifndef PROJECTIMPORTMANAGER_H #define PROJECTIMPORTMANAGER_H @@ -7,6 +27,8 @@ #include "projectviewmodel.h" #include "task/task.h" +OLIVE_NAMESPACE_ENTER + class ProjectImportManager : public Task { Q_OBJECT @@ -34,4 +56,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECTIMPORTMANAGER_H diff --git a/app/project/projectloadmanager.cpp b/app/project/projectloadmanager.cpp index 869f2d88a..4d7a97483 100644 --- a/app/project/projectloadmanager.cpp +++ b/app/project/projectloadmanager.cpp @@ -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 . + +***/ + #include "projectloadmanager.h" #include @@ -6,6 +26,8 @@ #include "common/xmlutils.h" +OLIVE_NAMESPACE_ENTER + ProjectLoadManager::ProjectLoadManager(const QString &filename) : filename_(filename) { @@ -55,6 +77,6 @@ void ProjectLoadManager::Action() project_file.close(); } - - } + +OLIVE_NAMESPACE_EXIT diff --git a/app/project/projectloadmanager.h b/app/project/projectloadmanager.h index 1ab4e1052..1e656ff26 100644 --- a/app/project/projectloadmanager.h +++ b/app/project/projectloadmanager.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef PROJECTLOADMANAGER_H #define PROJECTLOADMANAGER_H #include "project/project.h" #include "task/task.h" +OLIVE_NAMESPACE_ENTER + class ProjectLoadManager : public Task { Q_OBJECT @@ -21,4 +43,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECTLOADMANAGER_H diff --git a/app/project/projectsavemanager.cpp b/app/project/projectsavemanager.cpp index 07729e4c9..fb7bc017b 100644 --- a/app/project/projectsavemanager.cpp +++ b/app/project/projectsavemanager.cpp @@ -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 . + +***/ + #include "projectsavemanager.h" #include #include +OLIVE_NAMESPACE_ENTER + ProjectSaveManager::ProjectSaveManager(Project *project) : project_(project) { @@ -34,3 +56,5 @@ void ProjectSaveManager::Action() emit Succeeded(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/project/projectsavemanager.h b/app/project/projectsavemanager.h index 412911b33..4eab63f8a 100644 --- a/app/project/projectsavemanager.h +++ b/app/project/projectsavemanager.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef PROJECTSAVEMANAGER_H #define PROJECTSAVEMANAGER_H #include "project/project.h" #include "task/task.h" +OLIVE_NAMESPACE_ENTER + class ProjectSaveManager : public Task { Q_OBJECT @@ -18,4 +40,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECTSAVEMANAGER_H diff --git a/app/project/projectviewmodel.cpp b/app/project/projectviewmodel.cpp index 64452c25e..0f8307608 100644 --- a/app/project/projectviewmodel.cpp +++ b/app/project/projectviewmodel.cpp @@ -26,6 +26,8 @@ #include "core.h" +OLIVE_NAMESPACE_ENTER + ProjectViewModel::ProjectViewModel(QObject *parent) : QAbstractItemModel(parent), project_(nullptr) @@ -580,3 +582,5 @@ void ProjectViewModel::RemoveItemCommand::undo_internal() { model_->AddChild(parent_, item_); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/project/projectviewmodel.h b/app/project/projectviewmodel.h index 124fa30fc..6042f7e5c 100644 --- a/app/project/projectviewmodel.h +++ b/app/project/projectviewmodel.h @@ -26,6 +26,8 @@ #include "project.h" #include "undo/undocommand.h" +OLIVE_NAMESPACE_ENTER + /** * @brief An adapter that interprets the data in a Project into a Qt item model for usage in ViewModel Views. * @@ -239,4 +241,6 @@ private: QVector columns_; }; +OLIVE_NAMESPACE_EXIT + #endif // VIEWMODEL_H diff --git a/app/render/audioparams.cpp b/app/render/audioparams.cpp index 099c9ceac..43927c63d 100644 --- a/app/render/audioparams.cpp +++ b/app/render/audioparams.cpp @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #include "audioparams.h" extern "C" { #include } +OLIVE_NAMESPACE_ENTER + AudioParams::AudioParams() : sample_rate_(0), channel_layout_(0) @@ -151,3 +173,5 @@ bool AudioRenderingParams::is_valid() const return valid; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/audioparams.h b/app/render/audioparams.h index 308f68fae..6ced16845 100644 --- a/app/render/audioparams.h +++ b/app/render/audioparams.h @@ -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 . + +***/ + #ifndef AUDIOPARAMS_H #define AUDIOPARAMS_H @@ -6,6 +26,8 @@ #include "audio/sampleformat.h" #include "common/rational.h" +OLIVE_NAMESPACE_ENTER + class AudioParams { public: @@ -49,6 +71,8 @@ private: SampleFormat::Format format_; }; -Q_DECLARE_METATYPE(AudioRenderingParams) +OLIVE_NAMESPACE_EXIT + +Q_DECLARE_METATYPE(OLIVE_NAMESPACE::AudioRenderingParams) #endif // AUDIOPARAMS_H diff --git a/app/render/backend/audio/audiobackend.cpp b/app/render/backend/audio/audiobackend.cpp index 85135e931..92705500e 100644 --- a/app/render/backend/audio/audiobackend.cpp +++ b/app/render/backend/audio/audiobackend.cpp @@ -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 . + +***/ + #include "audiobackend.h" #include "audioworker.h" +OLIVE_NAMESPACE_ENTER + AudioBackend::AudioBackend(QObject *parent) : AudioRenderBackend(parent) { @@ -105,3 +127,5 @@ void AudioBackend::ThreadCompletedCache(NodeDependency dep, NodeValueTable data, CacheNext(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/audio/audiobackend.h b/app/render/backend/audio/audiobackend.h index e96265c26..8f4772148 100644 --- a/app/render/backend/audio/audiobackend.h +++ b/app/render/backend/audio/audiobackend.h @@ -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 . + +***/ + #ifndef AUDIOBACKEND_H #define AUDIOBACKEND_H @@ -5,6 +25,8 @@ #include "../audiorenderbackend.h" +OLIVE_NAMESPACE_ENTER + class AudioBackend : public AudioRenderBackend { Q_OBJECT @@ -34,4 +56,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // AUDIOBACKEND_H diff --git a/app/render/backend/audio/audioworker.cpp b/app/render/backend/audio/audioworker.cpp index 239dafe4d..807bec957 100644 --- a/app/render/backend/audio/audioworker.cpp +++ b/app/render/backend/audio/audioworker.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "audioworker.h" +OLIVE_NAMESPACE_ENTER + AudioWorker::AudioWorker(DecoderCache* decoder_cache, QHash *copy_map, QObject *parent) : AudioRenderWorker(decoder_cache, copy_map, parent) { @@ -81,3 +103,5 @@ void AudioWorker::RunNodeAccelerated(const Node *node, const TimeRange &range, c output_params->Push(NodeParam::kSamples, QVariant::fromValue(output_buffer)); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/audio/audioworker.h b/app/render/backend/audio/audioworker.h index 1db52a23f..269b8547f 100644 --- a/app/render/backend/audio/audioworker.h +++ b/app/render/backend/audio/audioworker.h @@ -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 . + +***/ + #ifndef AUDIOWORKER_H #define AUDIOWORKER_H #include "../audiorenderworker.h" +OLIVE_NAMESPACE_ENTER + class AudioWorker : public AudioRenderWorker { public: @@ -17,4 +39,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // AUDIOWORKER_H diff --git a/app/render/backend/audiorenderbackend.cpp b/app/render/backend/audiorenderbackend.cpp index 72428f743..9a2362bab 100644 --- a/app/render/backend/audiorenderbackend.cpp +++ b/app/render/backend/audiorenderbackend.cpp @@ -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 . + +***/ + #include "audiorenderbackend.h" #include @@ -7,6 +27,8 @@ #include "common/filefunctions.h" #include "render/backend/indexmanager.h" +OLIVE_NAMESPACE_ENTER + AudioRenderBackend::AudioRenderBackend(QObject *parent) : RenderBackend(parent), ic_from_conform_(false) @@ -220,3 +242,5 @@ bool AudioRenderBackend::ConformWaitInfo::operator==(const AudioRenderBackend::C && rhs.stream_time == stream_time && rhs.affected_range == affected_range; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/audiorenderbackend.h b/app/render/backend/audiorenderbackend.h index 07ed394f8..5a53319b3 100644 --- a/app/render/backend/audiorenderbackend.h +++ b/app/render/backend/audiorenderbackend.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef AUDIORENDERBACKEND_H #define AUDIORENDERBACKEND_H #include "common/timerange.h" #include "renderbackend.h" +OLIVE_NAMESPACE_ENTER + class AudioRenderBackend : public RenderBackend { Q_OBJECT @@ -82,4 +104,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // AUDIORENDERBACKEND_H diff --git a/app/render/backend/audiorenderworker.cpp b/app/render/backend/audiorenderworker.cpp index 024872afc..aaf68905a 100644 --- a/app/render/backend/audiorenderworker.cpp +++ b/app/render/backend/audiorenderworker.cpp @@ -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 . + +***/ + #include "audiorenderworker.h" #include @@ -8,6 +28,8 @@ #include "config/config.h" #include "node/block/clip/clip.h" +OLIVE_NAMESPACE_ENTER + AudioRenderWorker::AudioRenderWorker(DecoderCache* decoder_cache, QHash *copy_map, QObject *parent) : RenderWorker(decoder_cache, parent), copy_map_(copy_map) @@ -140,3 +162,5 @@ const AudioRenderingParams &AudioRenderWorker::audio_params() const { return audio_params_; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/audiorenderworker.h b/app/render/backend/audiorenderworker.h index b53ccd04e..5450f2693 100644 --- a/app/render/backend/audiorenderworker.h +++ b/app/render/backend/audiorenderworker.h @@ -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 . + +***/ + #ifndef AUDIORENDERWORKER_H #define AUDIORENDERWORKER_H #include "renderworker.h" +OLIVE_NAMESPACE_ENTER + class AudioRenderWorker : public RenderWorker { Q_OBJECT @@ -30,4 +52,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // AUDIORENDERWORKER_H diff --git a/app/render/backend/colorprocessorcache.h b/app/render/backend/colorprocessorcache.h index 9346b810b..d247e03d5 100644 --- a/app/render/backend/colorprocessorcache.h +++ b/app/render/backend/colorprocessorcache.h @@ -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 . + +***/ + #ifndef COLORPROCESSORCACHE_H #define COLORPROCESSORCACHE_H @@ -5,6 +25,10 @@ #include "render/colorprocessor.h" #include "rendercache.h" +OLIVE_NAMESPACE_ENTER + using ColorProcessorCache = RenderCache; +OLIVE_NAMESPACE_EXIT + #endif // COLORPROCESSORCACHE_H diff --git a/app/render/backend/decodercache.h b/app/render/backend/decodercache.h index a747cec2d..9f3939baf 100644 --- a/app/render/backend/decodercache.h +++ b/app/render/backend/decodercache.h @@ -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 . + +***/ + #ifndef DECODERCACHE_H #define DECODERCACHE_H @@ -5,6 +25,8 @@ #include "project/item/footage/stream.h" #include "rendercache.h" +OLIVE_NAMESPACE_ENTER + class DecoderCache : public RenderCache { public: @@ -17,4 +39,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // DECODERCACHE_H diff --git a/app/render/backend/exporter.cpp b/app/render/backend/exporter.cpp index d8b7d448c..2da9b0192 100644 --- a/app/render/backend/exporter.cpp +++ b/app/render/backend/exporter.cpp @@ -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 . + +***/ + #include "exporter.h" #include "render/backend/audio/audiobackend.h" @@ -5,6 +25,8 @@ #include "render/colormanager.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + Exporter::Exporter(ViewerOutput* viewer, Encoder *encoder, QObject* parent) : @@ -166,7 +188,7 @@ void Exporter::EncodeFrame() QMetaObject::invokeMethod(encoder_, "WriteFrame", Qt::QueuedConnection, - Q_ARG(FramePtr, frame)); + OLIVE_NS_ARG(FramePtr, frame)); waiting_for_frame_ += video_params_.time_base(); @@ -216,9 +238,9 @@ void Exporter::AudioRendered() QMetaObject::invokeMethod(encoder_, "WriteAudio", Qt::QueuedConnection, - Q_ARG(const AudioRenderingParams&, audio_backend_->params()), + OLIVE_NS_ARG(AudioRenderingParams, audio_backend_->params()), Q_ARG(const QString&, cache_fn), - Q_ARG(const TimeRange&, export_range_)); + OLIVE_NS_ARG(TimeRange, export_range_)); // We don't need the audio backend anymore audio_backend_->deleteLater(); @@ -288,3 +310,5 @@ void Exporter::DebugTimerMessage() { qDebug() << "Still waiting for" << waiting_for_frame_.toDouble(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/exporter.h b/app/render/backend/exporter.h index 2bbbb18f4..9efe1eb3a 100644 --- a/app/render/backend/exporter.h +++ b/app/render/backend/exporter.h @@ -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 . + +***/ + #ifndef EXPORTER_H #define EXPORTER_H @@ -12,6 +32,8 @@ #include "render/backend/videorenderbackend.h" #include "render/colorprocessor.h" +OLIVE_NAMESPACE_ENTER + class Exporter : public QObject { Q_OBJECT @@ -101,4 +123,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // EXPORTER_H diff --git a/app/render/backend/indexmanager.cpp b/app/render/backend/indexmanager.cpp index 589b2306d..2cce2dc93 100644 --- a/app/render/backend/indexmanager.cpp +++ b/app/render/backend/indexmanager.cpp @@ -1,12 +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 . + +***/ + #include "indexmanager.h" #include "task/taskmanager.h" -IndexManager* IndexManager::instance_ = nullptr; +OLIVE_NAMESPACE_ENTER -IndexManager::IndexManager() -{ -} +IndexManager* IndexManager::instance_ = nullptr; void IndexManager::CreateInstance() { @@ -39,7 +57,7 @@ void IndexManager::StartIndexingStream(StreamPtr stream) TaskManager::instance()->AddTask(index_task); } -void IndexManager::StartConformingStream(AudioStreamPtr stream, const AudioRenderingParams ¶ms) +void IndexManager::StartConformingStream(AudioStreamPtr stream, AudioRenderingParams params) { if (IsConforming(stream, params)) { return; @@ -97,3 +115,5 @@ void IndexManager::StreamConformAppendedEvent(const AudioRenderingParams ¶ms { emit StreamConformAppended(static_cast(sender()), params); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/indexmanager.h b/app/render/backend/indexmanager.h index e94cf0862..cbebe4c7d 100644 --- a/app/render/backend/indexmanager.h +++ b/app/render/backend/indexmanager.h @@ -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 . + +***/ + #ifndef INDEXMANAGER_H #define INDEXMANAGER_H @@ -7,11 +27,13 @@ #include "task/conform/conform.h" #include "task/index/index.h" +OLIVE_NAMESPACE_ENTER + class IndexManager : public QObject { Q_OBJECT public: - IndexManager(); + IndexManager() = default; static void CreateInstance(); static IndexManager* instance(); @@ -21,12 +43,12 @@ public: bool IsConforming(AudioStreamPtr stream, const AudioRenderingParams& params) const; public slots: - void StartIndexingStream(StreamPtr stream); - void StartConformingStream(AudioStreamPtr stream, const AudioRenderingParams& params); + void StartIndexingStream(OLIVE_NAMESPACE::StreamPtr stream); + void StartConformingStream(OLIVE_NAMESPACE::AudioStreamPtr stream, OLIVE_NAMESPACE::AudioRenderingParams params); signals: void StreamIndexUpdated(Stream* stream); - void StreamConformAppended(Stream* stream, const AudioRenderingParams& params); + void StreamConformAppended(Stream* stream, OLIVE_NAMESPACE::AudioRenderingParams params); private: static IndexManager* instance_; @@ -55,4 +77,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // INDEXMANAGER_H diff --git a/app/render/backend/opengl/openglbackend.cpp b/app/render/backend/opengl/openglbackend.cpp index cfa200496..df6cd32cb 100644 --- a/app/render/backend/opengl/openglbackend.cpp +++ b/app/render/backend/opengl/openglbackend.cpp @@ -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 . + +***/ + #include "openglbackend.h" #include @@ -5,6 +25,8 @@ #include "openglrenderfunctions.h" +OLIVE_NAMESPACE_ENTER + OpenGLBackend::OpenGLBackend(QObject *parent) : VideoRenderBackend(parent), proxy_(nullptr) @@ -83,3 +105,5 @@ void OpenGLBackend::ParamsChangedEvent() proxy_->SetParameters(params()); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/opengl/openglbackend.h b/app/render/backend/opengl/openglbackend.h index 43260b659..59fc34465 100644 --- a/app/render/backend/opengl/openglbackend.h +++ b/app/render/backend/opengl/openglbackend.h @@ -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 . + +***/ + #ifndef OPENGLBACKEND_H #define OPENGLBACKEND_H @@ -8,6 +28,8 @@ #include "opengltexture.h" #include "openglworker.h" +OLIVE_NAMESPACE_ENTER + class OpenGLBackend : public VideoRenderBackend { Q_OBJECT @@ -32,4 +54,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // OPENGLBACKEND_H diff --git a/app/render/backend/opengl/openglcolorprocessor.cpp b/app/render/backend/opengl/openglcolorprocessor.cpp index e47bbe792..ddbe070d0 100644 --- a/app/render/backend/opengl/openglcolorprocessor.cpp +++ b/app/render/backend/opengl/openglcolorprocessor.cpp @@ -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 . + +***/ + #include "openglcolorprocessor.h" #include @@ -5,6 +25,8 @@ #include "openglrenderfunctions.h" +OLIVE_NAMESPACE_ENTER + void OpenGLColorProcessor::Enable(QOpenGLContext *context, bool alpha_is_associated) { if (IsEnabled()) { @@ -75,3 +97,5 @@ OpenGLColorProcessorPtr OpenGLColorProcessor::Create(OCIO::ConstConfigRcPtr conf { return std::make_shared(config, source_space, display, view, look); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/opengl/openglcolorprocessor.h b/app/render/backend/opengl/openglcolorprocessor.h index 898d61fb6..67929fe1d 100644 --- a/app/render/backend/opengl/openglcolorprocessor.h +++ b/app/render/backend/opengl/openglcolorprocessor.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef OPENGLCOLORPROCESSOR_H #define OPENGLCOLORPROCESSOR_H #include "openglshader.h" #include "render/colorprocessor.h" +OLIVE_NAMESPACE_ENTER + class OpenGLColorProcessor; using OpenGLColorProcessorPtr = std::shared_ptr; @@ -48,4 +70,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // OPENGLCOLORPROCESSOR_H diff --git a/app/render/backend/opengl/openglframebuffer.cpp b/app/render/backend/opengl/openglframebuffer.cpp index b2acac1fb..e31ce50b3 100644 --- a/app/render/backend/opengl/openglframebuffer.cpp +++ b/app/render/backend/opengl/openglframebuffer.cpp @@ -23,6 +23,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + OpenGLFramebuffer::OpenGLFramebuffer() : context_(nullptr), buffer_(0), @@ -147,3 +149,5 @@ const GLuint &OpenGLFramebuffer::buffer() const { return buffer_; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/opengl/openglframebuffer.h b/app/render/backend/opengl/openglframebuffer.h index c39a944cd..532dd8048 100644 --- a/app/render/backend/opengl/openglframebuffer.h +++ b/app/render/backend/opengl/openglframebuffer.h @@ -26,6 +26,8 @@ #include "common/constructors.h" #include "opengltexture.h" +OLIVE_NAMESPACE_ENTER + class OpenGLFramebuffer : public QObject { Q_OBJECT @@ -33,8 +35,6 @@ public: OpenGLFramebuffer(); virtual ~OpenGLFramebuffer() override; - DISABLE_COPY_MOVE(OpenGLFramebuffer) - void Create(QOpenGLContext *ctx); bool IsCreated() const; @@ -61,4 +61,6 @@ private: OpenGLTexture* texture_; }; +OLIVE_NAMESPACE_EXIT + #endif // OPENGLFRAMEBUFFER_H diff --git a/app/render/backend/opengl/openglproxy.cpp b/app/render/backend/opengl/openglproxy.cpp index bf5151453..d3510db4a 100644 --- a/app/render/backend/opengl/openglproxy.cpp +++ b/app/render/backend/opengl/openglproxy.cpp @@ -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 . + +***/ + #include "openglproxy.h" #include @@ -11,6 +31,8 @@ #include "render/colormanager.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + OpenGLProxy::OpenGLProxy(QObject *parent) : QObject(parent), ctx_(nullptr), @@ -457,3 +479,5 @@ void OpenGLProxy::FinishInit() buffer_.Create(ctx_); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/opengl/openglproxy.h b/app/render/backend/opengl/openglproxy.h index 9f7f6e362..77ee7a89b 100644 --- a/app/render/backend/opengl/openglproxy.h +++ b/app/render/backend/opengl/openglproxy.h @@ -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 . + +***/ + #ifndef OPENGLPROXY_H #define OPENGLPROXY_H @@ -9,6 +29,8 @@ #include "openglshadercache.h" #include "opengltexturecache.h" +OLIVE_NAMESPACE_ENTER + class OpenGLProxy : public QObject { Q_OBJECT public: @@ -79,4 +101,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // OPENGLPROXY_H diff --git a/app/render/backend/opengl/openglrenderfunctions.cpp b/app/render/backend/opengl/openglrenderfunctions.cpp index ebad69961..05ae6f63a 100644 --- a/app/render/backend/opengl/openglrenderfunctions.cpp +++ b/app/render/backend/opengl/openglrenderfunctions.cpp @@ -24,6 +24,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + const GLfloat blit_vertices[] = { -1.0f, -1.0f, 0.0f, 1.0f, -1.0f, 0.0f, @@ -216,3 +218,5 @@ void OpenGLRenderFunctions::OCIOBlit(OpenGLShader *pipeline, xf->glBindTexture(GL_TEXTURE_3D, 0); xf->glActiveTexture(GL_TEXTURE0); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/opengl/openglrenderfunctions.h b/app/render/backend/opengl/openglrenderfunctions.h index cdd5d0769..18fc81b47 100644 --- a/app/render/backend/opengl/openglrenderfunctions.h +++ b/app/render/backend/opengl/openglrenderfunctions.h @@ -28,6 +28,8 @@ #include "openglshader.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + class OpenGLRenderFunctions { public: /** @@ -61,4 +63,6 @@ public: }; +OLIVE_NAMESPACE_EXIT + #endif // OPENGLFUNCTIONS_H diff --git a/app/render/backend/opengl/openglshader.cpp b/app/render/backend/opengl/openglshader.cpp index 4ace5e9ab..2491c39c4 100644 --- a/app/render/backend/opengl/openglshader.cpp +++ b/app/render/backend/opengl/openglshader.cpp @@ -1,11 +1,27 @@ +/*** + + 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 . + +***/ + #include "openglshader.h" #include - -OpenGLShader::OpenGLShader() -{ - -} +OLIVE_NAMESPACE_ENTER OpenGLShaderPtr OpenGLShader::Create() { @@ -235,3 +251,5 @@ QString OpenGLShader::CodeAlphaAssociate(const QString &function_name) " return vec4(col.rgb * col.a, col.a);\n" "}\n").arg(function_name); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/opengl/openglshader.h b/app/render/backend/opengl/openglshader.h index ea77db482..3adab00d4 100644 --- a/app/render/backend/opengl/openglshader.h +++ b/app/render/backend/opengl/openglshader.h @@ -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 . + +***/ + #ifndef OPENGLSHADER_H #define OPENGLSHADER_H @@ -7,6 +27,10 @@ #include namespace OCIO = OCIO_NAMESPACE::v1; +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class OpenGLShader; using OpenGLShaderPtr = std::shared_ptr; @@ -15,7 +39,7 @@ using OpenGLShaderPtr = std::shared_ptr; */ class OpenGLShader : public QOpenGLShaderProgram { public: - OpenGLShader(); + OpenGLShader() = default; static OpenGLShaderPtr Create(); @@ -36,4 +60,6 @@ public: }; +OLIVE_NAMESPACE_EXIT + #endif // OPENGLSHADER_H diff --git a/app/render/backend/opengl/openglshadercache.h b/app/render/backend/opengl/openglshadercache.h index 3ccf6e8dc..7846aaf1b 100644 --- a/app/render/backend/opengl/openglshadercache.h +++ b/app/render/backend/opengl/openglshadercache.h @@ -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 . + +***/ + #ifndef OPENGLSHADERCACHE_H #define OPENGLSHADERCACHE_H @@ -6,6 +26,10 @@ #include "openglshader.h" #include "render/backend/rendercache.h" +OLIVE_NAMESPACE_ENTER + using OpenGLShaderCache = RenderCache; +OLIVE_NAMESPACE_EXIT + #endif // OPENGLSHADERCACHE_H diff --git a/app/render/backend/opengl/opengltexture.cpp b/app/render/backend/opengl/opengltexture.cpp index 6088153c9..67d50822c 100644 --- a/app/render/backend/opengl/opengltexture.cpp +++ b/app/render/backend/opengl/opengltexture.cpp @@ -26,6 +26,8 @@ #include "openglrenderfunctions.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + OpenGLTexture::OpenGLTexture() : created_ctx_(nullptr), texture_(0), @@ -168,3 +170,5 @@ void OpenGLTexture::CreateInternal(QOpenGLContext* create_ctx, GLuint* tex, cons // Release texture f->glBindTexture(GL_TEXTURE_2D, 0); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/opengl/opengltexture.h b/app/render/backend/opengl/opengltexture.h index ef1c7c23e..1b5562de2 100644 --- a/app/render/backend/opengl/opengltexture.h +++ b/app/render/backend/opengl/opengltexture.h @@ -28,6 +28,8 @@ #include "common/constructors.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A class wrapper around an OpenGL texture */ @@ -78,6 +80,9 @@ private: }; using OpenGLTexturePtr = std::shared_ptr; -Q_DECLARE_METATYPE(OpenGLTexturePtr) + +OLIVE_NAMESPACE_EXIT + +Q_DECLARE_METATYPE(OLIVE_NAMESPACE::OpenGLTexturePtr) #endif // OPENGLTEXTURE_H diff --git a/app/render/backend/opengl/opengltexturecache.cpp b/app/render/backend/opengl/opengltexturecache.cpp index 1e5f29a91..450fb962b 100644 --- a/app/render/backend/opengl/opengltexturecache.cpp +++ b/app/render/backend/opengl/opengltexturecache.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "opengltexturecache.h" +OLIVE_NAMESPACE_ENTER + OpenGLTextureCache::~OpenGLTextureCache() { foreach (Reference* ref, existing_references_) { @@ -78,3 +100,5 @@ void OpenGLTextureCache::Reference::ParentKilled() { parent_ = nullptr; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/opengl/opengltexturecache.h b/app/render/backend/opengl/opengltexturecache.h index cb1b03969..151a12d2d 100644 --- a/app/render/backend/opengl/opengltexturecache.h +++ b/app/render/backend/opengl/opengltexturecache.h @@ -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 . + +***/ + #ifndef OPENGLTEXTURECACHE_H #define OPENGLTEXTURECACHE_H @@ -7,6 +27,8 @@ #include "opengltexture.h" #include "render/videoparams.h" +OLIVE_NAMESPACE_ENTER + class OpenGLTextureCache { public: @@ -48,6 +70,8 @@ private: }; -Q_DECLARE_METATYPE(OpenGLTextureCache::ReferencePtr) +OLIVE_NAMESPACE_EXIT + +Q_DECLARE_METATYPE(OLIVE_NAMESPACE::OpenGLTextureCache::ReferencePtr) #endif // OPENGLTEXTURECACHE_H diff --git a/app/render/backend/opengl/openglworker.cpp b/app/render/backend/opengl/openglworker.cpp index 8d5bed4b1..3508ab3ed 100644 --- a/app/render/backend/opengl/openglworker.cpp +++ b/app/render/backend/opengl/openglworker.cpp @@ -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 . + +***/ + #include "openglworker.h" #include "common/clamp.h" @@ -9,6 +29,8 @@ #include "render/colormanager.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + OpenGLWorker::OpenGLWorker(VideoRenderFrameCache *frame_cache, DecoderCache* decoder_cache, QObject *parent) : VideoRenderWorker(frame_cache, decoder_cache, parent) { @@ -28,3 +50,5 @@ void OpenGLWorker::TextureToBuffer(const QVariant &tex_in, void *buffer) { emit RequestTextureToBuffer(tex_in, buffer); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/opengl/openglworker.h b/app/render/backend/opengl/openglworker.h index fc5bdd0d5..1fc920523 100644 --- a/app/render/backend/opengl/openglworker.h +++ b/app/render/backend/opengl/openglworker.h @@ -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 . + +***/ + #ifndef OPENGLPROCESSOR_H #define OPENGLPROCESSOR_H @@ -9,6 +29,8 @@ #include "openglshadercache.h" #include "opengltexturecache.h" +OLIVE_NAMESPACE_ENTER + class OpenGLWorker : public VideoRenderWorker { Q_OBJECT public: @@ -31,4 +53,6 @@ protected: }; +OLIVE_NAMESPACE_EXIT + #endif // OPENGLPROCESSOR_H diff --git a/app/render/backend/renderbackend.cpp b/app/render/backend/renderbackend.cpp index d4e3b4a6f..48b2fd66a 100644 --- a/app/render/backend/renderbackend.cpp +++ b/app/render/backend/renderbackend.cpp @@ -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 . + +***/ + #include "renderbackend.h" #include @@ -7,6 +27,8 @@ #include "render/backend/indexmanager.h" #include "window/mainwindow/mainwindow.h" +OLIVE_NAMESPACE_ENTER + RenderBackend::RenderBackend(QObject *parent) : QObject(parent), compiled_(false), @@ -308,7 +330,7 @@ void RenderBackend::CacheNext() QMetaObject::invokeMethod(worker, "Render", Qt::QueuedConnection, - Q_ARG(NodeDependency, dep), + OLIVE_NS_ARG(NodeDependency, dep), Q_ARG(qint64, job_time)); } } @@ -528,3 +550,5 @@ bool RenderBackend::FootageWaitInfo::operator==(const RenderBackend::FootageWait && rhs.stream_time == stream_time && rhs.affected_range == affected_range; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/renderbackend.h b/app/render/backend/renderbackend.h index 519f0de01..0beb63700 100644 --- a/app/render/backend/renderbackend.h +++ b/app/render/backend/renderbackend.h @@ -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 . + +***/ + #ifndef RENDERBACKEND_H #define RENDERBACKEND_H @@ -10,6 +30,8 @@ #include "node/output/viewer/viewer.h" #include "renderworker.h" +OLIVE_NAMESPACE_ENTER + class RenderBackend : public QObject { Q_OBJECT @@ -167,4 +189,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // RENDERBACKEND_H diff --git a/app/render/backend/rendercache.h b/app/render/backend/rendercache.h index 06ae9ce42..8da4d6722 100644 --- a/app/render/backend/rendercache.h +++ b/app/render/backend/rendercache.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef RENDERCACHE_H #define RENDERCACHE_H #include #include +OLIVE_NAMESPACE_ENTER + template class RenderCache { @@ -25,4 +47,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // RENDERCACHE_H diff --git a/app/render/backend/renderworker.cpp b/app/render/backend/renderworker.cpp index 07512a4ca..07fee972a 100644 --- a/app/render/backend/renderworker.cpp +++ b/app/render/backend/renderworker.cpp @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #include "renderworker.h" #include #include "node/block/block.h" +OLIVE_NAMESPACE_ENTER + RenderWorker::RenderWorker(DecoderCache *decoder_cache, QObject *parent) : QObject(parent), started_(false), @@ -125,3 +147,5 @@ const NodeDependency &RenderWorker::CurrentPath() const { return path_; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/renderworker.h b/app/render/backend/renderworker.h index 885d3c60f..1125015a2 100644 --- a/app/render/backend/renderworker.h +++ b/app/render/backend/renderworker.h @@ -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 . + +***/ + #ifndef RENDERWORKER_H #define RENDERWORKER_H @@ -9,6 +29,8 @@ #include "node/output/track/track.h" #include "node/traverser.h" +OLIVE_NAMESPACE_ENTER + class RenderWorker : public QObject, public NodeTraverser { Q_OBJECT @@ -22,12 +44,12 @@ public: public slots: void Close(); - void Render(NodeDependency CurrentPath, qint64 job_time); + void Render(OLIVE_NAMESPACE::NodeDependency path, qint64 job_time); signals: - void CompletedCache(NodeDependency dep, NodeValueTable data, qint64 job_time); + void CompletedCache(OLIVE_NAMESPACE::NodeDependency dep, OLIVE_NAMESPACE::NodeValueTable data, qint64 job_time); - void FootageUnavailable(StreamPtr stream, Decoder::RetrieveState state, const TimeRange& range, const rational& stream_time); + void FootageUnavailable(OLIVE_NAMESPACE::StreamPtr stream, OLIVE_NAMESPACE::Decoder::RetrieveState state, const OLIVE_NAMESPACE::TimeRange& range, const OLIVE_NAMESPACE::rational& stream_time); protected: virtual bool InitInternal() = 0; @@ -61,4 +83,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // RENDERWORKER_H diff --git a/app/render/backend/videorenderbackend.cpp b/app/render/backend/videorenderbackend.cpp index d85d66899..a1f6485be 100644 --- a/app/render/backend/videorenderbackend.cpp +++ b/app/render/backend/videorenderbackend.cpp @@ -34,6 +34,8 @@ #include "render/pixelformat.h" #include "videorenderworker.h" +OLIVE_NAMESPACE_ENTER + VideoRenderBackend::VideoRenderBackend(QObject *parent) : RenderBackend(parent), operating_mode_(VideoRenderWorker::kHashRenderCache), @@ -382,3 +384,5 @@ void VideoRenderBackend::Requeue() CacheNext(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/videorenderbackend.h b/app/render/backend/videorenderbackend.h index 79b7dd37e..522e61ced 100644 --- a/app/render/backend/videorenderbackend.h +++ b/app/render/backend/videorenderbackend.h @@ -31,6 +31,8 @@ #include "videorenderframecache.h" #include "videorenderworker.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A multithreaded OpenGL based renderer for node systems */ @@ -139,4 +141,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // VIDEORENDERERBACKEND_H diff --git a/app/render/backend/videorenderframecache.cpp b/app/render/backend/videorenderframecache.cpp index deebefff4..fdf9c2953 100644 --- a/app/render/backend/videorenderframecache.cpp +++ b/app/render/backend/videorenderframecache.cpp @@ -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 . + +***/ + #include "videorenderframecache.h" #include @@ -5,10 +25,7 @@ #include "common/filefunctions.h" -VideoRenderFrameCache::VideoRenderFrameCache() -{ - -} +OLIVE_NAMESPACE_ENTER void VideoRenderFrameCache::Clear() { @@ -142,3 +159,5 @@ QString VideoRenderFrameCache::CachePathName(const QByteArray& hash, const Pixel return cache_dir.filePath(filename); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/videorenderframecache.h b/app/render/backend/videorenderframecache.h index cd9902e40..a9113f193 100644 --- a/app/render/backend/videorenderframecache.h +++ b/app/render/backend/videorenderframecache.h @@ -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 . + +***/ + #ifndef VIDEORENDERFRAMECACHE_H #define VIDEORENDERFRAMECACHE_H @@ -6,10 +26,12 @@ #include "common/rational.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + class VideoRenderFrameCache { public: - VideoRenderFrameCache(); + VideoRenderFrameCache() = default; void Clear(); @@ -64,4 +86,6 @@ private: QString cache_id_; }; +OLIVE_NAMESPACE_EXIT + #endif // VIDEORENDERFRAMECACHE_H diff --git a/app/render/backend/videorenderworker.cpp b/app/render/backend/videorenderworker.cpp index ea3c29993..6061975a4 100644 --- a/app/render/backend/videorenderworker.cpp +++ b/app/render/backend/videorenderworker.cpp @@ -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 . + +***/ + #include "videorenderworker.h" #include @@ -12,6 +32,8 @@ #include "project/project.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + VideoRenderWorker::VideoRenderWorker(VideoRenderFrameCache *frame_cache, DecoderCache* decoder_cache, QObject *parent) : RenderWorker(decoder_cache, parent), frame_cache_(frame_cache), @@ -358,3 +380,5 @@ ColorProcessorCache *VideoRenderWorker::color_cache() { return &color_cache_; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/backend/videorenderworker.h b/app/render/backend/videorenderworker.h index b9ec19169..3d7b5e6b7 100644 --- a/app/render/backend/videorenderworker.h +++ b/app/render/backend/videorenderworker.h @@ -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 . + +***/ + #ifndef VIDEORENDERWORKER_H #define VIDEORENDERWORKER_H @@ -9,6 +29,8 @@ #include "renderworker.h" #include "videorenderframecache.h" +OLIVE_NAMESPACE_ENTER + class VideoRenderWorker : public RenderWorker { Q_OBJECT public: @@ -98,4 +120,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // VIDEORENDERWORKER_H diff --git a/app/render/color.cpp b/app/render/color.cpp index f58bc08f8..6e55eecf3 100644 --- a/app/render/color.cpp +++ b/app/render/color.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "color.h" +OLIVE_NAMESPACE_ENTER + Color Color::fromHsv(const float &h, const float &s, const float &v) { float C = s * v; @@ -182,7 +204,9 @@ QColor Color::toQColor() const return c; } -QDebug operator<<(QDebug debug, const Color &r) +OLIVE_NAMESPACE_EXIT + +QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::Color &r) { debug.nospace() << "[R: " << r.red() << ", G: " << r.green() << ", B: " << r.blue() << ", A: " << r.alpha() << "]"; return debug.space(); diff --git a/app/render/color.h b/app/render/color.h index c64b58b70..03432ce67 100644 --- a/app/render/color.h +++ b/app/render/color.h @@ -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 . + +***/ + #ifndef COLOR_H #define COLOR_H @@ -7,6 +27,8 @@ #include "common/define.h" #include "render/pixelformat.h" +OLIVE_NAMESPACE_ENTER + /** * @brief High precision 32-bit float based RGBA color value */ @@ -69,8 +91,10 @@ private: }; -QDebug operator<<(QDebug debug, const Color& r); +OLIVE_NAMESPACE_EXIT -Q_DECLARE_METATYPE(Color) +QDebug operator<<(QDebug debug, const OLIVE_NAMESPACE::Color& r); + +Q_DECLARE_METATYPE(OLIVE_NAMESPACE::Color) #endif // COLOR_H diff --git a/app/render/colormanager.cpp b/app/render/colormanager.cpp index d9d886fba..3efefb8f4 100644 --- a/app/render/colormanager.cpp +++ b/app/render/colormanager.cpp @@ -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 . + +***/ + #include "colormanager.h" #include @@ -6,6 +26,8 @@ #include "config/config.h" #include "core.h" +OLIVE_NAMESPACE_ENTER + ColorManager::ColorManager() { // Ensures config is set to something @@ -196,3 +218,5 @@ void ColorManager::AssociateAlphaInternal(ColorManager::AlphaAction action, T *d } } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/colormanager.h b/app/render/colormanager.h index cb1217148..25a881c30 100644 --- a/app/render/colormanager.h +++ b/app/render/colormanager.h @@ -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 . + +***/ + #ifndef COLORSERVICE_H #define COLORSERVICE_H @@ -6,6 +26,8 @@ #include "codec/frame.h" #include "colorprocessor.h" +OLIVE_NAMESPACE_ENTER + class ColorManager : public QObject { Q_OBJECT @@ -78,4 +100,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // COLORSERVICE_H diff --git a/app/render/colorprocessor.cpp b/app/render/colorprocessor.cpp index cc26e6850..24e3bdfe5 100644 --- a/app/render/colorprocessor.cpp +++ b/app/render/colorprocessor.cpp @@ -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 . + +***/ + #include "colorprocessor.h" #include "common/define.h" +OLIVE_NAMESPACE_ENTER + ColorProcessor::ColorProcessor(OCIO::ConstConfigRcPtr config, const QString& source_space, const QString& dest_space) { processor = config->getProcessor(source_space.toUtf8(), @@ -63,3 +85,5 @@ OpenColorIO::v1::ConstProcessorRcPtr ColorProcessor::GetProcessor() { return processor; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/colorprocessor.h b/app/render/colorprocessor.h index 47e91e18f..3cbde81c8 100644 --- a/app/render/colorprocessor.h +++ b/app/render/colorprocessor.h @@ -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 . + +***/ + #ifndef COLORPROCESSOR_H #define COLORPROCESSOR_H @@ -8,6 +28,8 @@ namespace OCIO = OCIO_NAMESPACE::v1; #include "common/constructors.h" #include "render/color.h" +OLIVE_NAMESPACE_ENTER + class ColorProcessor; using ColorProcessorPtr = std::shared_ptr; @@ -42,4 +64,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // COLORPROCESSOR_H diff --git a/app/render/diskmanager.cpp b/app/render/diskmanager.cpp index 053f7935a..76865de86 100644 --- a/app/render/diskmanager.cpp +++ b/app/render/diskmanager.cpp @@ -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 . + +***/ + #include "diskmanager.h" #include @@ -10,6 +30,8 @@ #include "common/filefunctions.h" #include "config/config.h" +OLIVE_NAMESPACE_ENTER + DiskManager* DiskManager::instance_ = nullptr; DiskManager::DiskManager() : @@ -200,3 +222,5 @@ QString DiskManager::GetCacheIndexFilename() d.mkpath("."); return d.filePath("diskindex"); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/diskmanager.h b/app/render/diskmanager.h index 13d7b15f8..4df5f6d36 100644 --- a/app/render/diskmanager.h +++ b/app/render/diskmanager.h @@ -1,9 +1,33 @@ +/*** + + 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 . + +***/ + #ifndef DISKMANAGER_H #define DISKMANAGER_H #include #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class DiskManager : public QObject { Q_OBJECT @@ -53,4 +77,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // DISKMANAGER_H diff --git a/app/render/pixelformat.cpp b/app/render/pixelformat.cpp index 89e481961..aa05beac8 100644 --- a/app/render/pixelformat.cpp +++ b/app/render/pixelformat.cpp @@ -28,6 +28,8 @@ #include "common/define.h" #include "core.h" +OLIVE_NAMESPACE_ENTER + bool PixelFormat::FormatHasAlphaChannel(const PixelFormat::Format &format) { switch (format) { @@ -230,3 +232,4 @@ FramePtr PixelFormat::ConvertPixelFormat(FramePtr frame, const PixelFormat::Form } } +OLIVE_NAMESPACE_EXIT diff --git a/app/render/pixelformat.h b/app/render/pixelformat.h index d4d26726c..82388df6a 100644 --- a/app/render/pixelformat.h +++ b/app/render/pixelformat.h @@ -28,6 +28,8 @@ #include "render/rendermodes.h" +OLIVE_NAMESPACE_ENTER + class Frame; using FramePtr = std::shared_ptr; @@ -139,4 +141,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // BITDEPTHS_H diff --git a/app/render/rendermodes.h b/app/render/rendermodes.h index 0477474bc..373414da8 100644 --- a/app/render/rendermodes.h +++ b/app/render/rendermodes.h @@ -1,6 +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 . + +***/ + #ifndef RENDERMODE_H #define RENDERMODE_H +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class RenderMode { public: /** @@ -21,4 +45,6 @@ public: }; }; +OLIVE_NAMESPACE_EXIT + #endif // RENDERMODE_H diff --git a/app/render/videoparams.cpp b/app/render/videoparams.cpp index 4a80cd424..32c94cd48 100644 --- a/app/render/videoparams.cpp +++ b/app/render/videoparams.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "videoparams.h" +OLIVE_NAMESPACE_ENTER + VideoParams::VideoParams() : width_(0), height_(0) @@ -118,3 +140,5 @@ bool VideoRenderingParams::is_valid() const && format_ != PixelFormat::PIX_FMT_INVALID && format_ != PixelFormat::PIX_FMT_COUNT); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/render/videoparams.h b/app/render/videoparams.h index 50a31a659..61e334645 100644 --- a/app/render/videoparams.h +++ b/app/render/videoparams.h @@ -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 . + +***/ + #ifndef VIDEOPARAMS_H #define VIDEOPARAMS_H @@ -5,6 +25,8 @@ #include "pixelformat.h" #include "rendermodes.h" +OLIVE_NAMESPACE_ENTER + class VideoParams { public: @@ -51,4 +73,6 @@ private: int effective_height_; }; +OLIVE_NAMESPACE_EXIT + #endif // VIDEOPARAMS_H diff --git a/app/task/conform/conform.cpp b/app/task/conform/conform.cpp index a467398f5..6be547d10 100644 --- a/app/task/conform/conform.cpp +++ b/app/task/conform/conform.cpp @@ -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 . + +***/ + #include "conform.h" #include "codec/decoder.h" +OLIVE_NAMESPACE_ENTER + ConformTask::ConformTask(AudioStreamPtr stream, const AudioRenderingParams& params) : stream_(stream), params_(params) @@ -27,3 +49,5 @@ void ConformTask::Action() emit Succeeded(); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/task/conform/conform.h b/app/task/conform/conform.h index df80aa435..5d0fe9fb6 100644 --- a/app/task/conform/conform.h +++ b/app/task/conform/conform.h @@ -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 . + +***/ + #ifndef CONFORMTASK_H #define CONFORMTASK_H @@ -5,6 +25,8 @@ #include "render/audioparams.h" #include "task/task.h" +OLIVE_NAMESPACE_ENTER + class ConformTask : public Task { public: @@ -20,4 +42,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // CONFORMTASK_H diff --git a/app/task/index/index.cpp b/app/task/index/index.cpp index 539f5fc8a..248901a73 100644 --- a/app/task/index/index.cpp +++ b/app/task/index/index.cpp @@ -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 . + +***/ + #include "index.h" #include "codec/decoder.h" #include "codec/ffmpeg/ffmpegdecoder.h" +OLIVE_NAMESPACE_ENTER + IndexTask::IndexTask(StreamPtr stream) : stream_(stream) { @@ -27,3 +49,5 @@ void IndexTask::Action() emit Succeeded(); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/task/index/index.h b/app/task/index/index.h index 868d040af..a470866fe 100644 --- a/app/task/index/index.h +++ b/app/task/index/index.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef INDEXTASK_H #define INDEXTASK_H #include "project/item/footage/footage.h" #include "task/task.h" +OLIVE_NAMESPACE_ENTER + class IndexTask : public Task { public: @@ -17,4 +39,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // INDEXTASK_H diff --git a/app/task/task.cpp b/app/task/task.cpp index d38924de0..601faf0b6 100644 --- a/app/task/task.cpp +++ b/app/task/task.cpp @@ -20,6 +20,8 @@ #include "task.h" +OLIVE_NAMESPACE_ENTER + Task::Task() : title_(tr("Task")) { @@ -51,3 +53,5 @@ void Task::SetTitle(const QString &s) { title_ = s; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/task/task.h b/app/task/task.h index 8c4324b30..32f52af8d 100644 --- a/app/task/task.h +++ b/app/task/task.h @@ -26,6 +26,8 @@ #include "common/cancelableobject.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A base class for background tasks running in Olive. * @@ -143,4 +145,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TASK_H diff --git a/app/task/taskmanager.cpp b/app/task/taskmanager.cpp index 043ed90bc..3223ca029 100644 --- a/app/task/taskmanager.cpp +++ b/app/task/taskmanager.cpp @@ -23,6 +23,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + TaskManager* TaskManager::instance_ = nullptr; TaskManager::TaskManager() : @@ -256,3 +258,5 @@ void TaskManager::TaskFailed() { SetTaskStatus(static_cast(sender()), kError); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/task/taskmanager.h b/app/task/taskmanager.h index 420847ba7..0095b81fc 100644 --- a/app/task/taskmanager.h +++ b/app/task/taskmanager.h @@ -27,6 +27,8 @@ #include "common/constructors.h" #include "task/task.h" +OLIVE_NAMESPACE_ENTER + /** * @brief An object that manages background Task objects, handling their start and end * @@ -182,4 +184,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TASKMANAGER_H diff --git a/app/timeline/timelinecoordinate.cpp b/app/timeline/timelinecoordinate.cpp index 8be052866..aaef2415e 100644 --- a/app/timeline/timelinecoordinate.cpp +++ b/app/timeline/timelinecoordinate.cpp @@ -20,6 +20,8 @@ #include "timelinecoordinate.h" +OLIVE_NAMESPACE_ENTER + TimelineCoordinate::TimelineCoordinate() : track_(Timeline::kTrackTypeNone, 0) { @@ -56,3 +58,5 @@ void TimelineCoordinate::SetTrack(const TrackReference &track) { track_ = track; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/timeline/timelinecoordinate.h b/app/timeline/timelinecoordinate.h index 9f770c732..ee37f3f30 100644 --- a/app/timeline/timelinecoordinate.h +++ b/app/timeline/timelinecoordinate.h @@ -24,6 +24,8 @@ #include "common/rational.h" #include "trackreference.h" +OLIVE_NAMESPACE_ENTER + class TimelineCoordinate { public: @@ -44,4 +46,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINECOORDINATE_H diff --git a/app/timeline/timelinemarker.cpp b/app/timeline/timelinemarker.cpp index 085869d95..0de1ff5b3 100644 --- a/app/timeline/timelinemarker.cpp +++ b/app/timeline/timelinemarker.cpp @@ -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 . + +***/ + #include "timelinemarker.h" #include "common/xmlutils.h" +OLIVE_NAMESPACE_ENTER + TimelineMarker::TimelineMarker(const TimeRange &time, const QString &name, QObject *parent) : QObject(parent), time_(time), @@ -101,3 +123,5 @@ void TimelineMarkerList::Load(QXmlStreamReader *reader) reader->skipCurrentElement(); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/timeline/timelinemarker.h b/app/timeline/timelinemarker.h index 943745f5b..09d005c51 100644 --- a/app/timeline/timelinemarker.h +++ b/app/timeline/timelinemarker.h @@ -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 . + +***/ + #ifndef TIMELINEMARKER_H #define TIMELINEMARKER_H @@ -7,6 +27,8 @@ #include "common/timerange.h" +OLIVE_NAMESPACE_ENTER + class TimelineMarker : public QObject { Q_OBJECT @@ -58,4 +80,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEMARKER_H diff --git a/app/timeline/timelinepoints.cpp b/app/timeline/timelinepoints.cpp index 525345053..d1b6e43ec 100644 --- a/app/timeline/timelinepoints.cpp +++ b/app/timeline/timelinepoints.cpp @@ -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 . + +***/ + #include "timelinepoints.h" #include "common/xmlutils.h" +OLIVE_NAMESPACE_ENTER + TimelineMarkerList *TimelinePoints::markers() { return &markers_; @@ -45,3 +67,5 @@ TimelineWorkArea *TimelinePoints::workarea() { return &workarea_; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/timeline/timelinepoints.h b/app/timeline/timelinepoints.h index 119def69d..698adb156 100644 --- a/app/timeline/timelinepoints.h +++ b/app/timeline/timelinepoints.h @@ -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 . + +***/ + #ifndef TIMELINEPOINTS_H #define TIMELINEPOINTS_H @@ -7,6 +27,8 @@ #include "timelinemarker.h" #include "timelineworkarea.h" +OLIVE_NAMESPACE_ENTER + class TimelinePoints { public: @@ -28,4 +50,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEPOINTS_H diff --git a/app/timeline/timelineworkarea.cpp b/app/timeline/timelineworkarea.cpp index f2dc285bf..dee0ca39c 100644 --- a/app/timeline/timelineworkarea.cpp +++ b/app/timeline/timelineworkarea.cpp @@ -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 . + +***/ + #include "timelineworkarea.h" #include "common/xmlutils.h" +OLIVE_NAMESPACE_ENTER + const rational TimelineWorkArea::kResetIn = 0; const rational TimelineWorkArea::kResetOut = RATIONAL_MAX; @@ -76,3 +98,5 @@ const rational &TimelineWorkArea::out() const { return workarea_range_.out(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/timeline/timelineworkarea.h b/app/timeline/timelineworkarea.h index 7764a0c6f..d7ec567e7 100644 --- a/app/timeline/timelineworkarea.h +++ b/app/timeline/timelineworkarea.h @@ -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 . + +***/ + #ifndef TIMELINEWORKAREA_H #define TIMELINEWORKAREA_H @@ -7,6 +27,8 @@ #include "common/timerange.h" +OLIVE_NAMESPACE_ENTER + class TimelineWorkArea : public QObject { Q_OBJECT @@ -39,4 +61,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEWORKAREA_H diff --git a/app/timeline/trackreference.cpp b/app/timeline/trackreference.cpp index 732734fd1..8360d0fd8 100644 --- a/app/timeline/trackreference.cpp +++ b/app/timeline/trackreference.cpp @@ -20,6 +20,8 @@ #include "trackreference.h" +OLIVE_NAMESPACE_ENTER + TrackReference::TrackReference() : type_(Timeline::kTrackTypeNone), index_(0) @@ -46,3 +48,5 @@ bool TrackReference::operator==(const TrackReference &ref) const { return type_ == ref.type_ && index_ == ref.index_; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/timeline/trackreference.h b/app/timeline/trackreference.h index 10b801b4b..7e5ec96ff 100644 --- a/app/timeline/trackreference.h +++ b/app/timeline/trackreference.h @@ -23,6 +23,8 @@ #include "common/timelinecommon.h" +OLIVE_NAMESPACE_ENTER + class TrackReference { public: @@ -42,4 +44,6 @@ private: int index_; }; +OLIVE_NAMESPACE_EXIT + #endif // TRACKREFERENCE_H diff --git a/app/tool/tool.h b/app/tool/tool.h index 781c73f6e..c67c9ba84 100644 --- a/app/tool/tool.h +++ b/app/tool/tool.h @@ -24,6 +24,10 @@ #include #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class Tool { public: /** @@ -117,4 +121,6 @@ public: }; +OLIVE_NAMESPACE_EXIT + #endif // TOOL_H diff --git a/app/ui/icons/icons.cpp b/app/ui/icons/icons.cpp index 0a6ca4f2e..6c278df0f 100644 --- a/app/ui/icons/icons.cpp +++ b/app/ui/icons/icons.cpp @@ -20,6 +20,8 @@ #include "icons.h" +OLIVE_NAMESPACE_ENTER + /// Works in conjunction with `genicons.sh` to generate and utilize icons of specific sizes const int ICON_SIZE_COUNT = 4; const int ICON_SIZES[] = { @@ -133,3 +135,5 @@ QIcon icon::Create(const QString& theme, const QString &name) return icon; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/ui/icons/icons.h b/app/ui/icons/icons.h index 8f74ce7c9..ba26805bc 100644 --- a/app/ui/icons/icons.h +++ b/app/ui/icons/icons.h @@ -23,6 +23,10 @@ #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + namespace icon { // Playback Icons @@ -119,4 +123,6 @@ void LoadAll(const QString &theme); } +OLIVE_NAMESPACE_EXIT + #endif // ICONS_H diff --git a/app/ui/style/style.cpp b/app/ui/style/style.cpp index 2dfa15f23..c3273b70b 100644 --- a/app/ui/style/style.cpp +++ b/app/ui/style/style.cpp @@ -30,6 +30,8 @@ #include "ui/icons/icons.h" +OLIVE_NAMESPACE_ENTER + QList StyleManager::ListInternal() { QList style_list; @@ -189,3 +191,5 @@ const QString &StyleDescriptor::path() const { return path_; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/ui/style/style.h b/app/ui/style/style.h index 2f4e35b98..b82452b3d 100644 --- a/app/ui/style/style.h +++ b/app/ui/style/style.h @@ -24,6 +24,10 @@ #include #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class StyleDescriptor { public: StyleDescriptor(const QString& name, const QString& path); @@ -58,4 +62,6 @@ private: static void ParsePaletteColor(QSettings* ini, QPalette* palette, QPalette::ColorGroup group, const QString& role_name); }; +OLIVE_NAMESPACE_EXIT + #endif // STYLEMANAGER_H diff --git a/app/undo/undocommand.cpp b/app/undo/undocommand.cpp index 5c1faccf9..a380ea6d6 100644 --- a/app/undo/undocommand.cpp +++ b/app/undo/undocommand.cpp @@ -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 . + +***/ + #include "undocommand.h" #include "core.h" +OLIVE_NAMESPACE_ENTER + UndoCommand::UndoCommand(QUndoCommand *parent) : QUndoCommand(parent) { @@ -31,3 +53,5 @@ void UndoCommand::undo_internal() { QUndoCommand::undo(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/undo/undocommand.h b/app/undo/undocommand.h index 66c7aa2d7..762e79e59 100644 --- a/app/undo/undocommand.h +++ b/app/undo/undocommand.h @@ -1,8 +1,32 @@ +/*** + + 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 . + +***/ + #ifndef UNDOCOMMAND_H #define UNDOCOMMAND_H #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class UndoCommand : public QUndoCommand { public: @@ -20,4 +44,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // UNDOCOMMAND_H diff --git a/app/undo/undostack.cpp b/app/undo/undostack.cpp index 5904ad312..eec3097d7 100644 --- a/app/undo/undostack.cpp +++ b/app/undo/undostack.cpp @@ -20,6 +20,8 @@ #include "undostack.h" +OLIVE_NAMESPACE_ENTER + void UndoStack::pushIfHasChildren(QUndoCommand *command) { if (command->childCount() > 0) { @@ -28,3 +30,5 @@ void UndoStack::pushIfHasChildren(QUndoCommand *command) delete command; } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/undo/undostack.h b/app/undo/undostack.h index 31b4d1b06..980a6875c 100644 --- a/app/undo/undostack.h +++ b/app/undo/undostack.h @@ -23,6 +23,10 @@ #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class UndoStack : public QUndoStack { public: /** @@ -33,4 +37,6 @@ public: void pushIfHasChildren(QUndoCommand* command); }; +OLIVE_NAMESPACE_EXIT + #endif // UNDOSTACK_H diff --git a/app/widget/audiomonitor/audiomonitor.cpp b/app/widget/audiomonitor/audiomonitor.cpp index 96087006e..48063120b 100644 --- a/app/widget/audiomonitor/audiomonitor.cpp +++ b/app/widget/audiomonitor/audiomonitor.cpp @@ -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 . + +***/ + #include "audiomonitor.h" #include @@ -7,6 +27,8 @@ #include "audio/audiomanager.h" #include "common/qtutils.h" +OLIVE_NAMESPACE_ENTER + const int kDecibelStep = 6; const int kDecibelMinimum = -200; const int kClearTimerInterval = 500; @@ -145,3 +167,5 @@ void AudioMonitor::mousePressEvent(QMouseEvent *) peaked_.fill(false); update(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/audiomonitor/audiomonitor.h b/app/widget/audiomonitor/audiomonitor.h index 5754a2b24..226e8cdad 100644 --- a/app/widget/audiomonitor/audiomonitor.h +++ b/app/widget/audiomonitor/audiomonitor.h @@ -1,9 +1,33 @@ +/*** + + 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 . + +***/ + #ifndef AUDIOMONITORWIDGET_H #define AUDIOMONITORWIDGET_H #include #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class AudioMonitor : public QWidget { Q_OBJECT @@ -25,4 +49,6 @@ private: QTimer clear_timer_; }; +OLIVE_NAMESPACE_EXIT + #endif // AUDIOMONITORWIDGET_H diff --git a/app/widget/clickablelabel/clickablelabel.cpp b/app/widget/clickablelabel/clickablelabel.cpp index 8c0b6258a..0ab4dd631 100644 --- a/app/widget/clickablelabel/clickablelabel.cpp +++ b/app/widget/clickablelabel/clickablelabel.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "clickablelabel.h" +OLIVE_NAMESPACE_ENTER + ClickableLabel::ClickableLabel(const QString &text, QWidget *parent) : QLabel(text, parent) { @@ -21,3 +43,5 @@ void ClickableLabel::mouseDoubleClickEvent(QMouseEvent *) { emit MouseDoubleClicked(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/clickablelabel/clickablelabel.h b/app/widget/clickablelabel/clickablelabel.h index cc11f11a7..32d5a55db 100644 --- a/app/widget/clickablelabel/clickablelabel.h +++ b/app/widget/clickablelabel/clickablelabel.h @@ -1,8 +1,32 @@ +/*** + + 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 . + +***/ + #ifndef CLICKABLELABEL_H #define CLICKABLELABEL_H #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class ClickableLabel : public QLabel { Q_OBJECT @@ -20,4 +44,6 @@ signals: }; +OLIVE_NAMESPACE_EXIT + #endif // CLICKABLELABEL_H diff --git a/app/widget/colorbutton/colorbutton.cpp b/app/widget/colorbutton/colorbutton.cpp index 4ea30a6d6..0820e43cb 100644 --- a/app/widget/colorbutton/colorbutton.cpp +++ b/app/widget/colorbutton/colorbutton.cpp @@ -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 . + +***/ + #include "colorbutton.h" #include "dialog/color/colordialog.h" +OLIVE_NAMESPACE_ENTER + ColorButton::ColorButton(ColorManager* color_manager, QWidget *parent) : QPushButton(parent), color_manager_(color_manager), @@ -59,3 +81,5 @@ void ColorButton::UpdateColor() setStyleSheet(QStringLiteral("ColorButton {background: %1;}").arg(managed.name())); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/colorbutton/colorbutton.h b/app/widget/colorbutton/colorbutton.h index 2252ea8ca..e71fa21db 100644 --- a/app/widget/colorbutton/colorbutton.h +++ b/app/widget/colorbutton/colorbutton.h @@ -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 . + +***/ + #ifndef COLORBUTTON_H #define COLORBUTTON_H @@ -6,6 +26,8 @@ #include "render/color.h" #include "render/colormanager.h" +OLIVE_NAMESPACE_ENTER + class ColorButton : public QPushButton { Q_OBJECT @@ -36,4 +58,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // COLORBUTTON_H diff --git a/app/widget/colorwheel/colorgradientwidget.cpp b/app/widget/colorwheel/colorgradientwidget.cpp index bf4d4641e..ec87da5ec 100644 --- a/app/widget/colorwheel/colorgradientwidget.cpp +++ b/app/widget/colorwheel/colorgradientwidget.cpp @@ -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 . + +***/ + #include "colorgradientwidget.h" #include @@ -6,6 +26,8 @@ #include "common/lerp.h" #include "node/node.h" +OLIVE_NAMESPACE_ENTER + ColorGradientWidget::ColorGradientWidget(Qt::Orientation orientation, QWidget *parent) : ColorSwatchWidget(parent), orientation_(orientation), @@ -81,3 +103,5 @@ Color ColorGradientWidget::LerpColor(const Color &a, const Color &b, int i, int lerp(a.green(), b.green(), t), lerp(a.blue(), b.blue(), t)); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/colorwheel/colorgradientwidget.h b/app/widget/colorwheel/colorgradientwidget.h index fa0b891f8..725b662fe 100644 --- a/app/widget/colorwheel/colorgradientwidget.h +++ b/app/widget/colorwheel/colorgradientwidget.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef COLORGRADIENTGLWIDGET_H #define COLORGRADIENTGLWIDGET_H #include "colorswatchwidget.h" #include "render/color.h" +OLIVE_NAMESPACE_ENTER + class ColorGradientWidget : public ColorSwatchWidget { Q_OBJECT @@ -32,4 +54,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // COLORGRADIENTGLWIDGET_H diff --git a/app/widget/colorwheel/colorswatchwidget.cpp b/app/widget/colorwheel/colorswatchwidget.cpp index 862905bda..eca418525 100644 --- a/app/widget/colorwheel/colorswatchwidget.cpp +++ b/app/widget/colorwheel/colorswatchwidget.cpp @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #include "colorswatchwidget.h" #include #include "render/backend/opengl/openglrenderfunctions.h" +OLIVE_NAMESPACE_ENTER + ColorSwatchWidget::ColorSwatchWidget(QWidget *parent) : QWidget(parent), to_linear_processor_(nullptr), @@ -79,3 +101,5 @@ void ColorSwatchWidget::SetSelectedColorInternal(const Color &c, bool external) SelectedColorChangedEvent(c, external); update(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/colorwheel/colorswatchwidget.h b/app/widget/colorwheel/colorswatchwidget.h index 357f5a9e1..de8c1a828 100644 --- a/app/widget/colorwheel/colorswatchwidget.h +++ b/app/widget/colorwheel/colorswatchwidget.h @@ -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 . + +***/ + #ifndef COLORSWATCHWIDGET_H #define COLORSWATCHWIDGET_H @@ -7,6 +27,8 @@ #include "render/color.h" #include "render/colorprocessor.h" +OLIVE_NAMESPACE_ENTER + class ColorSwatchWidget : public QWidget { Q_OBJECT @@ -47,4 +69,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // COLORSWATCHWIDGET_H diff --git a/app/widget/colorwheel/colorwheelwidget.cpp b/app/widget/colorwheel/colorwheelwidget.cpp index d26830e6e..379531768 100644 --- a/app/widget/colorwheel/colorwheelwidget.cpp +++ b/app/widget/colorwheel/colorwheelwidget.cpp @@ -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 . + +***/ + #include "colorwheelwidget.h" #include @@ -5,6 +25,8 @@ #include "node/node.h" +OLIVE_NAMESPACE_ENTER + #define M_180_OVER_PI 57.295791433133264917914229473464 #define M_RADIAN_TO_0_1 0.15915497620314795810531730409296 @@ -152,3 +174,5 @@ QPoint ColorWheelWidget::GetCoordsFromColor(const Color &c) const return pos; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/colorwheel/colorwheelwidget.h b/app/widget/colorwheel/colorwheelwidget.h index e8010c3e1..17c739886 100644 --- a/app/widget/colorwheel/colorwheelwidget.h +++ b/app/widget/colorwheel/colorwheelwidget.h @@ -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 . + +***/ + #ifndef COLORWHEELWIDGET_H #define COLORWHEELWIDGET_H @@ -7,6 +27,8 @@ #include "render/backend/opengl/openglshader.h" #include "render/color.h" +OLIVE_NAMESPACE_ENTER + class ColorWheelWidget : public ColorSwatchWidget { Q_OBJECT @@ -50,4 +72,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // COLORWHEELWIDGET_H diff --git a/app/widget/columnedgridlayout/columnedgridlayout.cpp b/app/widget/columnedgridlayout/columnedgridlayout.cpp index 6404e6c96..72faf93e7 100644 --- a/app/widget/columnedgridlayout/columnedgridlayout.cpp +++ b/app/widget/columnedgridlayout/columnedgridlayout.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "columnedgridlayout.h" +OLIVE_NAMESPACE_ENTER + ColumnedGridLayout::ColumnedGridLayout(QWidget* parent, int maximum_columns) : QGridLayout (parent), @@ -32,3 +54,5 @@ void ColumnedGridLayout::SetMaximumColumns(int maximum_columns) { maximum_columns_ = maximum_columns; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/columnedgridlayout/columnedgridlayout.h b/app/widget/columnedgridlayout/columnedgridlayout.h index d62eaa6d7..32edb0796 100644 --- a/app/widget/columnedgridlayout/columnedgridlayout.h +++ b/app/widget/columnedgridlayout/columnedgridlayout.h @@ -1,8 +1,32 @@ +/*** + + 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 . + +***/ + #ifndef COLUMNEDGRIDLAYOUT_H #define COLUMNEDGRIDLAYOUT_H #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + /** * @brief The ColumnedGridLayout class * @@ -24,4 +48,6 @@ private: int maximum_columns_; }; +OLIVE_NAMESPACE_EXIT + #endif // COLUMNEDGRIDLAYOUT_H diff --git a/app/widget/curvewidget/beziercontrolpointitem.cpp b/app/widget/curvewidget/beziercontrolpointitem.cpp index e0f745db5..363ea3aa2 100644 --- a/app/widget/curvewidget/beziercontrolpointitem.cpp +++ b/app/widget/curvewidget/beziercontrolpointitem.cpp @@ -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 . + +***/ + #include "beziercontrolpointitem.h" #include @@ -7,6 +27,8 @@ #include "common/qtutils.h" +OLIVE_NAMESPACE_ENTER + BezierControlPointItem::BezierControlPointItem(NodeKeyframePtr key, NodeKeyframe::BezierType mode, QGraphicsItem *parent) : QGraphicsRectItem(parent), key_(key), @@ -80,3 +102,5 @@ void BezierControlPointItem::UpdatePos() setPos(handle_offset - rect().center()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/curvewidget/beziercontrolpointitem.h b/app/widget/curvewidget/beziercontrolpointitem.h index fbb0d89b8..81ed7302c 100644 --- a/app/widget/curvewidget/beziercontrolpointitem.h +++ b/app/widget/curvewidget/beziercontrolpointitem.h @@ -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 . + +***/ + #ifndef BEZIERCONTROLPOINTITEM_H #define BEZIERCONTROLPOINTITEM_H @@ -5,6 +25,8 @@ #include "node/keyframe.h" +OLIVE_NAMESPACE_ENTER + class BezierControlPointItem : public QObject, public QGraphicsRectItem { public: @@ -41,4 +63,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // BEZIERCONTROLPOINTITEM_H diff --git a/app/widget/curvewidget/curveview.cpp b/app/widget/curvewidget/curveview.cpp index e5114bf3f..3a9b9637f 100644 --- a/app/widget/curvewidget/curveview.cpp +++ b/app/widget/curvewidget/curveview.cpp @@ -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 . + +***/ + #include "curveview.h" #include @@ -5,6 +25,8 @@ #include "common/qtutils.h" +OLIVE_NAMESPACE_ENTER + CurveView::CurveView(QWidget *parent) : KeyframeViewBase(parent) { @@ -354,3 +376,5 @@ void CurveView::AddKeyframe(NodeKeyframePtr key) connect(key.get(), &NodeKeyframe::ValueChanged, this, &CurveView::KeyframeValueChanged); connect(key.get(), &NodeKeyframe::TypeChanged, this, &CurveView::KeyframeTypeChanged); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/curvewidget/curveview.h b/app/widget/curvewidget/curveview.h index e60fcdc60..2c767acd6 100644 --- a/app/widget/curvewidget/curveview.h +++ b/app/widget/curvewidget/curveview.h @@ -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 . + +***/ + #ifndef CURVEVIEW_H #define CURVEVIEW_H @@ -6,6 +26,8 @@ #include "widget/keyframeview/keyframeview.h" #include "widget/keyframeview/keyframeviewitem.h" +OLIVE_NAMESPACE_ENTER + class CurveView : public KeyframeViewBase { public: @@ -67,4 +89,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // CURVEVIEW_H diff --git a/app/widget/curvewidget/curvewidget.cpp b/app/widget/curvewidget/curvewidget.cpp index 97d769984..89f631170 100644 --- a/app/widget/curvewidget/curvewidget.cpp +++ b/app/widget/curvewidget/curvewidget.cpp @@ -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 . + +***/ + #include "curvewidget.h" #include @@ -11,6 +31,8 @@ #include "node/node.h" #include "widget/keyframeview/keyframeviewundo.h" +OLIVE_NAMESPACE_ENTER + CurveWidget::CurveWidget(QWidget *parent) : TimeBasedWidget(parent), input_(nullptr), @@ -294,3 +316,5 @@ void CurveWidget::KeyControlRequestedTimeChanged(const rational &time) { SetTimeAndSignal(Timecode::time_to_timestamp(time, view_->timebase())); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/curvewidget/curvewidget.h b/app/widget/curvewidget/curvewidget.h index f7255c479..551825028 100644 --- a/app/widget/curvewidget/curvewidget.h +++ b/app/widget/curvewidget/curvewidget.h @@ -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 . + +***/ + #ifndef CURVEWIDGET_H #define CURVEWIDGET_H @@ -11,6 +31,8 @@ #include "widget/nodeparamview/nodeparamviewwidgetbridge.h" #include "widget/timebased/timebased.h" +OLIVE_NAMESPACE_ENTER + class CurveWidget : public TimeBasedWidget, public TimeTargetObject { Q_OBJECT @@ -71,4 +93,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // CURVEWIDGET_H diff --git a/app/widget/focusablelineedit/focusablelineedit.cpp b/app/widget/focusablelineedit/focusablelineedit.cpp index 82ef516f5..6c83e2fe0 100644 --- a/app/widget/focusablelineedit/focusablelineedit.cpp +++ b/app/widget/focusablelineedit/focusablelineedit.cpp @@ -22,6 +22,8 @@ #include +OLIVE_NAMESPACE_ENTER + FocusableLineEdit::FocusableLineEdit(QWidget *parent) : QLineEdit(parent) { @@ -49,3 +51,5 @@ void FocusableLineEdit::focusOutEvent(QFocusEvent *e) emit Confirmed(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/focusablelineedit/focusablelineedit.h b/app/widget/focusablelineedit/focusablelineedit.h index 08064d55a..07bf57441 100644 --- a/app/widget/focusablelineedit/focusablelineedit.h +++ b/app/widget/focusablelineedit/focusablelineedit.h @@ -23,6 +23,10 @@ #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class FocusableLineEdit : public QLineEdit { Q_OBJECT @@ -42,4 +46,6 @@ protected: }; +OLIVE_NAMESPACE_EXIT + #endif // SLIDERLINEEDIT_H diff --git a/app/widget/footagecombobox/footagecombobox.cpp b/app/widget/footagecombobox/footagecombobox.cpp index 1cb280b14..4ba184e96 100644 --- a/app/widget/footagecombobox/footagecombobox.cpp +++ b/app/widget/footagecombobox/footagecombobox.cpp @@ -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 . + +***/ + #include "footagecombobox.h" #include @@ -6,6 +26,8 @@ #include "ui/icons/icons.h" #include "widget/menu/menu.h" +OLIVE_NAMESPACE_ENTER + FootageComboBox::FootageComboBox(QWidget *parent) : QComboBox(parent), root_(nullptr), @@ -95,3 +117,5 @@ void FootageComboBox::TraverseFolder(const Folder *f, QMenu *m) } } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/footagecombobox/footagecombobox.h b/app/widget/footagecombobox/footagecombobox.h index 36c77b7c1..e9cbb108e 100644 --- a/app/widget/footagecombobox/footagecombobox.h +++ b/app/widget/footagecombobox/footagecombobox.h @@ -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 . + +***/ + #ifndef FOOTAGECOMBOBOX_H #define FOOTAGECOMBOBOX_H @@ -7,6 +27,8 @@ #include "project/item/footage/footage.h" #include "project/project.h" +OLIVE_NAMESPACE_ENTER + class FootageComboBox : public QComboBox { Q_OBJECT @@ -37,4 +59,6 @@ private: bool only_show_ready_footage_; }; +OLIVE_NAMESPACE_EXIT + #endif // FOOTAGECOMBOBOX_H diff --git a/app/widget/keyframeview/keyframeview.cpp b/app/widget/keyframeview/keyframeview.cpp index d65abe925..cfbac331f 100644 --- a/app/widget/keyframeview/keyframeview.cpp +++ b/app/widget/keyframeview/keyframeview.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "keyframeview.h" +OLIVE_NAMESPACE_ENTER + KeyframeView::KeyframeView(QWidget *parent) : KeyframeViewBase(parent) { @@ -22,3 +44,5 @@ void KeyframeView::AddKeyframe(NodeKeyframePtr key, int y) KeyframeViewItem* item = AddKeyframeInternal(key); item->SetOverrideY(scene_pt.y()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/keyframeview/keyframeview.h b/app/widget/keyframeview/keyframeview.h index 61fec1d03..505ea4f58 100644 --- a/app/widget/keyframeview/keyframeview.h +++ b/app/widget/keyframeview/keyframeview.h @@ -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 . + +***/ + #ifndef KEYFRAMEVIEW_H #define KEYFRAMEVIEW_H #include "keyframeviewbase.h" +OLIVE_NAMESPACE_ENTER + class KeyframeView : public KeyframeViewBase { Q_OBJECT @@ -17,4 +39,6 @@ public slots: }; +OLIVE_NAMESPACE_EXIT + #endif // KEYFRAMEVIEW_H diff --git a/app/widget/keyframeview/keyframeviewbase.cpp b/app/widget/keyframeview/keyframeviewbase.cpp index 677d7ce9e..fce735a3a 100644 --- a/app/widget/keyframeview/keyframeviewbase.cpp +++ b/app/widget/keyframeview/keyframeviewbase.cpp @@ -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 . + +***/ + #include "keyframeviewbase.h" #include @@ -10,6 +30,8 @@ #include "widget/menu/menushared.h" #include "widget/nodeparamview/nodeparamviewundo.h" +OLIVE_NAMESPACE_ENTER + KeyframeViewBase::KeyframeViewBase(QWidget *parent) : TimelineViewBase(parent), dragging_bezier_point_(nullptr), @@ -458,3 +480,4 @@ void KeyframeViewBase::ShowKeyframePropertiesDialog() } } +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/keyframeview/keyframeviewbase.h b/app/widget/keyframeview/keyframeviewbase.h index 5b763c55e..46f50452b 100644 --- a/app/widget/keyframeview/keyframeviewbase.h +++ b/app/widget/keyframeview/keyframeviewbase.h @@ -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 . + +***/ + #ifndef KEYFRAMEVIEWBASE_H #define KEYFRAMEVIEWBASE_H @@ -7,6 +27,8 @@ #include "widget/curvewidget/beziercontrolpointitem.h" #include "widget/timelinewidget/view/timelineviewbase.h" +OLIVE_NAMESPACE_ENTER + class KeyframeViewBase : public TimelineViewBase, public TimeTargetObject { Q_OBJECT @@ -81,4 +103,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // KEYFRAMEVIEWBASE_H diff --git a/app/widget/keyframeview/keyframeviewitem.cpp b/app/widget/keyframeview/keyframeviewitem.cpp index 32c0c69bf..c50a42743 100644 --- a/app/widget/keyframeview/keyframeviewitem.cpp +++ b/app/widget/keyframeview/keyframeviewitem.cpp @@ -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 . + +***/ + #include "keyframeviewitem.h" #include @@ -8,6 +28,8 @@ #include "common/qtutils.h" #include "node/input.h" +OLIVE_NAMESPACE_ENTER + KeyframeViewItem::KeyframeViewItem(NodeKeyframePtr key, QGraphicsItem *parent) : QGraphicsRectItem(parent), key_(key), @@ -104,3 +126,5 @@ void KeyframeViewItem::Redraw() { QGraphicsItem::update(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/keyframeview/keyframeviewitem.h b/app/widget/keyframeview/keyframeviewitem.h index 1321c8aa6..ca5a6d660 100644 --- a/app/widget/keyframeview/keyframeviewitem.h +++ b/app/widget/keyframeview/keyframeviewitem.h @@ -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 . + +***/ + #ifndef KEYFRAMEVIEWITEM_H #define KEYFRAMEVIEWITEM_H @@ -6,6 +26,8 @@ #include "node/keyframe.h" #include "timetargetobject.h" +OLIVE_NAMESPACE_ENTER + class KeyframeViewItem : public QObject, public QGraphicsRectItem, public TimeTargetObject { Q_OBJECT @@ -41,4 +63,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // KEYFRAMEVIEWITEM_H diff --git a/app/widget/keyframeview/keyframeviewundo.cpp b/app/widget/keyframeview/keyframeviewundo.cpp index f3ada6e5f..d08b1d44d 100644 --- a/app/widget/keyframeview/keyframeviewundo.cpp +++ b/app/widget/keyframeview/keyframeviewundo.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "keyframeviewundo.h" +OLIVE_NAMESPACE_ENTER + KeyframeSetTypeCommand::KeyframeSetTypeCommand(NodeKeyframePtr key, NodeKeyframe::Type type, QUndoCommand *parent) : UndoCommand(parent), key_(key), @@ -45,3 +67,5 @@ void KeyframeSetBezierControlPoint::undo_internal() { key_->set_bezier_control(mode_, old_point_); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/keyframeview/keyframeviewundo.h b/app/widget/keyframeview/keyframeviewundo.h index 7d1b98137..54d021a5a 100644 --- a/app/widget/keyframeview/keyframeviewundo.h +++ b/app/widget/keyframeview/keyframeviewundo.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef KEYFRAMEVIEWUNDO_H #define KEYFRAMEVIEWUNDO_H #include "node/keyframe.h" #include "undo/undocommand.h" +OLIVE_NAMESPACE_ENTER + class KeyframeSetTypeCommand : public UndoCommand { public: KeyframeSetTypeCommand(NodeKeyframePtr key, NodeKeyframe::Type type, QUndoCommand* parent = nullptr); @@ -41,4 +63,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // KEYFRAMEVIEWUNDO_H diff --git a/app/widget/keyframeview/timetargetobject.cpp b/app/widget/keyframeview/timetargetobject.cpp index b737919ef..0ea00d0d9 100644 --- a/app/widget/keyframeview/timetargetobject.cpp +++ b/app/widget/keyframeview/timetargetobject.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "timetargetobject.h" +OLIVE_NAMESPACE_ENTER + TimeTargetObject::TimeTargetObject() : time_target_(nullptr), path_index_(0) @@ -57,3 +79,5 @@ TimeRange TimeTargetObject::GetAdjustedTime(Node* from, Node* to, const TimeRang return adjusted.size(); }*/ + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/keyframeview/timetargetobject.h b/app/widget/keyframeview/timetargetobject.h index 97fb767ec..66ae3a7ca 100644 --- a/app/widget/keyframeview/timetargetobject.h +++ b/app/widget/keyframeview/timetargetobject.h @@ -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 . + +***/ + #ifndef TIMETARGETOBJECT_H #define TIMETARGETOBJECT_H #include "node/node.h" +OLIVE_NAMESPACE_ENTER + class TimeTargetObject { public: @@ -28,4 +50,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMETARGETOBJECT_H diff --git a/app/widget/menu/menu.cpp b/app/widget/menu/menu.cpp index e5d0d8b0d..f64b85997 100644 --- a/app/widget/menu/menu.cpp +++ b/app/widget/menu/menu.cpp @@ -22,6 +22,8 @@ #include "ui/style/style.h" +OLIVE_NAMESPACE_ENTER + Menu::Menu(QMenuBar *bar, const QObject* receiver, const char* member) : QMenu(bar) { @@ -139,3 +141,5 @@ void Menu::SetBooleanAction(QAction *a, bool* boolean) a->setChecked(*boolean); a->setProperty("boolptr", reinterpret_cast(boolean)); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/menu/menu.h b/app/widget/menu/menu.h index 66dd86f0b..9db73df27 100644 --- a/app/widget/menu/menu.h +++ b/app/widget/menu/menu.h @@ -24,6 +24,10 @@ #include #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + /** * @brief A menu widget for context menus and menu bars * @@ -171,4 +175,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // WIDGETMENU_H diff --git a/app/widget/menu/menushared.cpp b/app/widget/menu/menushared.cpp index fb36b2238..da494f69b 100644 --- a/app/widget/menu/menushared.cpp +++ b/app/widget/menu/menushared.cpp @@ -24,6 +24,8 @@ #include "panel/panelmanager.h" #include "panel/timeline/timeline.h" +OLIVE_NAMESPACE_ENTER + MenuShared* MenuShared::instance_ = nullptr; MenuShared::MenuShared() @@ -211,3 +213,5 @@ void MenuShared::Retranslate() clip_enable_disable_item_->setText(tr("Enable/Disable")); clip_nest_item_->setText(tr("Nest")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/menu/menushared.h b/app/widget/menu/menushared.h index c1e6e54ff..86b4db3d7 100644 --- a/app/widget/menu/menushared.h +++ b/app/widget/menu/menushared.h @@ -23,6 +23,8 @@ #include "widget/menu/menu.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A static object that provides various "stock" menus for use throughout the application */ @@ -103,4 +105,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // MENUSHARED_H diff --git a/app/widget/nodecopypaste/nodecopypaste.cpp b/app/widget/nodecopypaste/nodecopypaste.cpp index dcb1aa803..c275d7be4 100644 --- a/app/widget/nodecopypaste/nodecopypaste.cpp +++ b/app/widget/nodecopypaste/nodecopypaste.cpp @@ -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 . + +***/ + #include "nodecopypaste.h" #include @@ -6,6 +26,8 @@ #include "widget/nodeview/nodeviewundo.h" #include "window/mainwindow/mainwindow.h" +OLIVE_NAMESPACE_ENTER + void NodeCopyPasteWidget::CopyNodesToClipboard(const QList &nodes, void *userdata) { QString copy_str; @@ -139,3 +161,5 @@ void NodeCopyPasteWidget::PasteNodesFromClipboardInternal(QXmlStreamReader* read { reader->skipCurrentElement(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/nodecopypaste/nodecopypaste.h b/app/widget/nodecopypaste/nodecopypaste.h index fc2f6485e..299a1ac7e 100644 --- a/app/widget/nodecopypaste/nodecopypaste.h +++ b/app/widget/nodecopypaste/nodecopypaste.h @@ -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 . + +***/ + #ifndef NODECOPYPASTEWIDGET_H #define NODECOPYPASTEWIDGET_H @@ -7,6 +27,8 @@ #include "node/node.h" #include "project/item/sequence/sequence.h" +OLIVE_NAMESPACE_ENTER + class NodeCopyPasteWidget { public: @@ -23,4 +45,6 @@ protected: }; +OLIVE_NAMESPACE_EXIT + #endif // NODECOPYPASTEWIDGET_H diff --git a/app/widget/nodeparamview/nodeparamview.cpp b/app/widget/nodeparamview/nodeparamview.cpp index 03672a34b..dcb183ece 100644 --- a/app/widget/nodeparamview/nodeparamview.cpp +++ b/app/widget/nodeparamview/nodeparamview.cpp @@ -27,6 +27,8 @@ #include "common/timecodefunctions.h" #include "node/output/viewer/viewer.h" +OLIVE_NAMESPACE_ENTER + NodeParamView::NodeParamView(QWidget *parent) : TimeBasedWidget(true, false, parent), last_scroll_val_(0) @@ -224,3 +226,5 @@ void NodeParamView::ForceKeyframeViewToScroll(int min, int max) bottom_item_->setY(keyframe_view_->viewport()->height() + max); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/nodeparamview/nodeparamview.h b/app/widget/nodeparamview/nodeparamview.h index b666046b0..d5eda57af 100644 --- a/app/widget/nodeparamview/nodeparamview.h +++ b/app/widget/nodeparamview/nodeparamview.h @@ -29,6 +29,8 @@ #include "widget/keyframeview/keyframeview.h" #include "widget/timebased/timebased.h" +OLIVE_NAMESPACE_ENTER + class NodeParamView : public TimeBasedWidget { Q_OBJECT @@ -74,4 +76,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // NODEPARAMVIEW_H diff --git a/app/widget/nodeparamview/nodeparamviewitem.cpp b/app/widget/nodeparamview/nodeparamviewitem.cpp index b1a4aaece..52d5cb342 100644 --- a/app/widget/nodeparamview/nodeparamviewitem.cpp +++ b/app/widget/nodeparamview/nodeparamviewitem.cpp @@ -30,6 +30,8 @@ #include "project/item/sequence/sequence.h" #include "ui/icons/icons.h" +OLIVE_NAMESPACE_ENTER + NodeParamViewItem::NodeParamViewItem(Node *node, QWidget *parent) : QWidget(parent), node_(node) @@ -281,3 +283,5 @@ void NodeParamViewItemTitleBar::paintEvent(QPaintEvent *event) p.setPen(palette().text().color()); p.drawLine(0, bottom, width(), bottom); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/nodeparamview/nodeparamviewitem.h b/app/widget/nodeparamview/nodeparamviewitem.h index 036788b53..c2561e31e 100644 --- a/app/widget/nodeparamview/nodeparamviewitem.h +++ b/app/widget/nodeparamview/nodeparamviewitem.h @@ -32,6 +32,8 @@ #include "nodeparamviewwidgetbridge.h" #include "widget/clickablelabel/clickablelabel.h" +OLIVE_NAMESPACE_ENTER + class NodeParamViewItemTitleBar : public QWidget { public: NodeParamViewItemTitleBar(QWidget* parent = nullptr); @@ -109,4 +111,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // NODEPARAMVIEWITEM_H diff --git a/app/widget/nodeparamview/nodeparamviewkeyframecontrol.cpp b/app/widget/nodeparamview/nodeparamviewkeyframecontrol.cpp index c06b504d6..6c9e1306f 100644 --- a/app/widget/nodeparamview/nodeparamviewkeyframecontrol.cpp +++ b/app/widget/nodeparamview/nodeparamviewkeyframecontrol.cpp @@ -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 . + +***/ + #include "nodeparamviewkeyframecontrol.h" #include @@ -7,6 +27,8 @@ #include "nodeparamviewundo.h" #include "ui/icons/icons.h" +OLIVE_NAMESPACE_ENTER + NodeParamViewKeyframeControl::NodeParamViewKeyframeControl(bool right_align, QWidget *parent) : QWidget(parent), input_(nullptr) @@ -254,3 +276,5 @@ void NodeParamViewKeyframeControl::KeyframeEnableChanged(bool e) Core::instance()->undo_stack()->pushIfHasChildren(command); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/nodeparamview/nodeparamviewkeyframecontrol.h b/app/widget/nodeparamview/nodeparamviewkeyframecontrol.h index 771c8fb33..395251099 100644 --- a/app/widget/nodeparamview/nodeparamviewkeyframecontrol.h +++ b/app/widget/nodeparamview/nodeparamviewkeyframecontrol.h @@ -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 . + +***/ + #ifndef NODEPARAMVIEWKEYFRAMECONTROL_H #define NODEPARAMVIEWKEYFRAMECONTROL_H @@ -7,6 +27,8 @@ #include "node/input.h" #include "widget/keyframeview/timetargetobject.h" +OLIVE_NAMESPACE_ENTER + class NodeParamViewKeyframeControl : public QWidget, public TimeTargetObject { Q_OBJECT @@ -55,4 +77,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // NODEPARAMVIEWKEYFRAMECONTROL_H diff --git a/app/widget/nodeparamview/nodeparamviewundo.cpp b/app/widget/nodeparamview/nodeparamviewundo.cpp index ffcb42248..606dfaac2 100644 --- a/app/widget/nodeparamview/nodeparamviewundo.cpp +++ b/app/widget/nodeparamview/nodeparamviewundo.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "nodeparamviewundo.h" +OLIVE_NAMESPACE_ENTER + NodeParamSetKeyframingCommand::NodeParamSetKeyframingCommand(NodeInput *input, bool setting, QUndoCommand *parent) : UndoCommand(parent), input_(input), @@ -144,3 +166,5 @@ void NodeParamSetStandardValueCommand::undo_internal() { input_->set_standard_value(old_value_, track_); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/nodeparamview/nodeparamviewundo.h b/app/widget/nodeparamview/nodeparamviewundo.h index 35baef0aa..9190d896a 100644 --- a/app/widget/nodeparamview/nodeparamviewundo.h +++ b/app/widget/nodeparamview/nodeparamviewundo.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef NODEPARAMVIEWUNDO_H #define NODEPARAMVIEWUNDO_H #include "node/input.h" #include "undo/undocommand.h" +OLIVE_NAMESPACE_ENTER + class NodeParamSetKeyframingCommand : public UndoCommand { public: NodeParamSetKeyframingCommand(NodeInput* input, bool setting, QUndoCommand* parent = nullptr); @@ -102,4 +124,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // NODEPARAMVIEWUNDO_H diff --git a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp index aec50c364..3f3947edb 100644 --- a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp +++ b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp @@ -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 . + +***/ + #include "nodeparamviewwidgetbridge.h" #include @@ -17,6 +37,8 @@ #include "widget/slider/floatslider.h" #include "widget/slider/integerslider.h" +OLIVE_NAMESPACE_ENTER + NodeParamViewWidgetBridge::NodeParamViewWidgetBridge(NodeInput *input, QObject *parent) : QObject(parent), input_(input), @@ -571,3 +593,5 @@ void NodeParamViewWidgetBridge::PropertyChanged(const QString &key, const QVaria } } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/nodeparamview/nodeparamviewwidgetbridge.h b/app/widget/nodeparamview/nodeparamviewwidgetbridge.h index 88f09f51d..51b4c6ebc 100644 --- a/app/widget/nodeparamview/nodeparamviewwidgetbridge.h +++ b/app/widget/nodeparamview/nodeparamviewwidgetbridge.h @@ -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 . + +***/ + #ifndef NODEPARAMVIEWWIDGETBRIDGE_H #define NODEPARAMVIEWWIDGETBRIDGE_H @@ -7,6 +27,8 @@ #include "widget/keyframeview/timetargetobject.h" #include "widget/slider/sliderbase.h" +OLIVE_NAMESPACE_ENTER + class NodeParamViewWidgetBridge : public QObject, public TimeTargetObject { Q_OBJECT @@ -52,4 +74,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // NODEPARAMVIEWWIDGETBRIDGE_H diff --git a/app/widget/nodeview/nodeview.cpp b/app/widget/nodeview/nodeview.cpp index 5bd2e506f..cbd9558ef 100644 --- a/app/widget/nodeview/nodeview.cpp +++ b/app/widget/nodeview/nodeview.cpp @@ -26,6 +26,8 @@ #include "nodeviewundo.h" #include "node/factory.h" +OLIVE_NAMESPACE_ENTER + NodeView::NodeView(QWidget *parent) : QGraphicsView(parent), graph_(nullptr), @@ -468,3 +470,5 @@ void NodeView::DetachItemFromCursor() { AttachItemToCursor(nullptr); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/nodeview/nodeview.h b/app/widget/nodeview/nodeview.h index 8d6a32381..05d72464e 100644 --- a/app/widget/nodeview/nodeview.h +++ b/app/widget/nodeview/nodeview.h @@ -28,6 +28,8 @@ #include "nodeviewscene.h" #include "widget/nodecopypaste/nodecopypaste.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A widget for viewing and editing node graphs * @@ -117,4 +119,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // NODEVIEW_H diff --git a/app/widget/nodeview/nodeviewedge.cpp b/app/widget/nodeview/nodeviewedge.cpp index 1fe554f30..333385e22 100644 --- a/app/widget/nodeview/nodeviewedge.cpp +++ b/app/widget/nodeview/nodeviewedge.cpp @@ -29,6 +29,8 @@ #include "nodeview.h" #include "nodeviewscene.h" +OLIVE_NAMESPACE_ENTER + NodeViewEdge::NodeViewEdge(QGraphicsItem *parent) : QGraphicsPathItem(parent), edge_(nullptr), @@ -114,3 +116,4 @@ void NodeViewEdge::UpdatePen() //update(); } +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/nodeview/nodeviewedge.h b/app/widget/nodeview/nodeviewedge.h index 96d7d8cad..1f9b66876 100644 --- a/app/widget/nodeview/nodeviewedge.h +++ b/app/widget/nodeview/nodeviewedge.h @@ -26,6 +26,8 @@ #include "node/edge.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A graphical representation of a NodeEdge to be used in NodeView * @@ -94,4 +96,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // NODEEDGEITEM_H diff --git a/app/widget/nodeview/nodeviewitem.cpp b/app/widget/nodeview/nodeviewitem.cpp index 60257d398..fe42d818d 100644 --- a/app/widget/nodeview/nodeviewitem.cpp +++ b/app/widget/nodeview/nodeviewitem.cpp @@ -35,6 +35,8 @@ #include "ui/icons/icons.h" #include "window/mainwindow/mainwindow.h" +OLIVE_NAMESPACE_ENTER + NodeViewItem::NodeViewItem(QGraphicsItem *parent) : QGraphicsRectItem(parent), node_(nullptr), @@ -456,3 +458,5 @@ QPointF NodeViewItem::GetInputPoint(int index) const return QPointF(input_rect.left(), input_rect.center().y()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/nodeview/nodeviewitem.h b/app/widget/nodeview/nodeviewitem.h index 020942688..1ed17f844 100644 --- a/app/widget/nodeview/nodeviewitem.h +++ b/app/widget/nodeview/nodeviewitem.h @@ -31,6 +31,8 @@ #include "nodeviewedge.h" #include "nodeviewitemwidgetproxy.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A visual widget representation of a Node object to be used in a NodeView * @@ -153,4 +155,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // NODEVIEWITEM_H diff --git a/app/widget/nodeview/nodeviewitemwidgetproxy.cpp b/app/widget/nodeview/nodeviewitemwidgetproxy.cpp index 15b936e7d..040e755ce 100644 --- a/app/widget/nodeview/nodeviewitemwidgetproxy.cpp +++ b/app/widget/nodeview/nodeviewitemwidgetproxy.cpp @@ -1,8 +1,24 @@ -#include "nodeviewitemwidgetproxy.h" +/*** -NodeViewItemWidget::NodeViewItemWidget() -{ -} + 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 . + +***/ + +#include "nodeviewitemwidgetproxy.h" QColor NodeViewItemWidget::TitleBarColor() { diff --git a/app/widget/nodeview/nodeviewitemwidgetproxy.h b/app/widget/nodeview/nodeviewitemwidgetproxy.h index 217c33437..bfd087384 100644 --- a/app/widget/nodeview/nodeviewitemwidgetproxy.h +++ b/app/widget/nodeview/nodeviewitemwidgetproxy.h @@ -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 . + +***/ + #ifndef NODEVIEWITEMWIDGETPROXY_H #define NODEVIEWITEMWIDGETPROXY_H @@ -14,7 +34,7 @@ class NodeViewItemWidget : public QWidget { Q_PROPERTY(QColor titlebarColor READ TitleBarColor WRITE SetTitleBarColor DESIGNABLE true) Q_PROPERTY(QColor borderColor READ BorderColor WRITE SetBorderColor DESIGNABLE true) public: - NodeViewItemWidget(); + NodeViewItemWidget() = default; QColor TitleBarColor(); void SetTitleBarColor(QColor color); diff --git a/app/widget/nodeview/nodeviewscene.cpp b/app/widget/nodeview/nodeviewscene.cpp index 0e44fe550..7de9ce7b4 100644 --- a/app/widget/nodeview/nodeviewscene.cpp +++ b/app/widget/nodeview/nodeviewscene.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "nodeviewscene.h" +OLIVE_NAMESPACE_ENTER + NodeViewScene::NodeViewScene(QObject *parent) : QGraphicsScene(parent), graph_(nullptr) @@ -296,3 +318,5 @@ void NodeViewScene::Reorganize() ReorganizeInternal(NodeToUIObject(end_node), node_weights, processed_nodes); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/nodeview/nodeviewscene.h b/app/widget/nodeview/nodeviewscene.h index 8a2c22933..436045700 100644 --- a/app/widget/nodeview/nodeviewscene.h +++ b/app/widget/nodeview/nodeviewscene.h @@ -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 . + +***/ + #ifndef NODEVIEWSCENE_H #define NODEVIEWSCENE_H @@ -8,6 +28,8 @@ #include "widget/nodeview/nodeviewedge.h" #include "widget/nodeview/nodeviewitem.h" +OLIVE_NAMESPACE_ENTER + class NodeViewScene : public QGraphicsScene { Q_OBJECT @@ -105,4 +127,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // NODEVIEWSCENE_H diff --git a/app/widget/nodeview/nodeviewundo.cpp b/app/widget/nodeview/nodeviewundo.cpp index 243cab0de..54e0c352d 100644 --- a/app/widget/nodeview/nodeviewundo.cpp +++ b/app/widget/nodeview/nodeviewundo.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "nodeviewundo.h" +OLIVE_NAMESPACE_ENTER + NodeEdgeAddCommand::NodeEdgeAddCommand(NodeOutput *output, NodeInput *input, QUndoCommand *parent) : UndoCommand(parent), output_(output), @@ -164,3 +186,5 @@ void NodeCopyInputsCommand::redo_internal() { Node::CopyInputs(src_, dest_, include_connections_); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/nodeview/nodeviewundo.h b/app/widget/nodeview/nodeviewundo.h index 02389cf48..48910fdcc 100644 --- a/app/widget/nodeview/nodeviewundo.h +++ b/app/widget/nodeview/nodeviewundo.h @@ -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 . + +***/ + #ifndef NODEVIEWUNDO_H #define NODEVIEWUNDO_H @@ -8,6 +28,8 @@ #include "nodeviewitem.h" #include "undo/undocommand.h" +OLIVE_NAMESPACE_ENTER + /** * @brief An undoable command for connecting two NodeParams together * @@ -117,4 +139,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // NODEVIEWUNDO_H diff --git a/app/widget/panel/panel.cpp b/app/widget/panel/panel.cpp index 9f4f75936..b557e8b54 100644 --- a/app/widget/panel/panel.cpp +++ b/app/widget/panel/panel.cpp @@ -25,6 +25,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + PanelWidget::PanelWidget(QWidget *parent) : QDockWidget(parent), border_visible_(false) @@ -113,3 +115,5 @@ void PanelWidget::changeEvent(QEvent *e) void PanelWidget::Retranslate() { } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/panel/panel.h b/app/widget/panel/panel.h index ff8ce54b1..c7d5bc3e1 100644 --- a/app/widget/panel/panel.h +++ b/app/widget/panel/panel.h @@ -24,6 +24,10 @@ #include #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + /** * @brief A widget that is always dockable within the MainWindow. */ @@ -204,4 +208,6 @@ private: bool border_visible_; }; +OLIVE_NAMESPACE_EXIT + #endif // PANEL_WIDGET_H diff --git a/app/widget/playbackcontrols/dragbutton.cpp b/app/widget/playbackcontrols/dragbutton.cpp index aec32cc4e..ce3539ff6 100644 --- a/app/widget/playbackcontrols/dragbutton.cpp +++ b/app/widget/playbackcontrols/dragbutton.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "dragbutton.h" +OLIVE_NAMESPACE_ENTER + DragButton::DragButton(QWidget *parent) : QPushButton(parent) { @@ -10,3 +32,5 @@ void DragButton::mousePressEvent(QMouseEvent *event) { emit MousePressed(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/playbackcontrols/dragbutton.h b/app/widget/playbackcontrols/dragbutton.h index 2fc5fd629..6c2eafde9 100644 --- a/app/widget/playbackcontrols/dragbutton.h +++ b/app/widget/playbackcontrols/dragbutton.h @@ -1,8 +1,32 @@ +/*** + + 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 . + +***/ + #ifndef DRAGBUTTON_H #define DRAGBUTTON_H #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class DragButton : public QPushButton { Q_OBJECT @@ -17,4 +41,6 @@ protected: }; +OLIVE_NAMESPACE_EXIT + #endif // DRAGBUTTON_H diff --git a/app/widget/playbackcontrols/playbackcontrols.cpp b/app/widget/playbackcontrols/playbackcontrols.cpp index 6131327d9..4f1fdb64a 100644 --- a/app/widget/playbackcontrols/playbackcontrols.cpp +++ b/app/widget/playbackcontrols/playbackcontrols.cpp @@ -28,6 +28,8 @@ #include "config/config.h" #include "ui/icons/icons.h" +OLIVE_NAMESPACE_ENTER + PlaybackControls::PlaybackControls(QWidget *parent) : QWidget(parent), time_base_(0) @@ -220,3 +222,5 @@ void PlaybackControls::TimecodeChanged() // Update end time SetEndTime(end_time_); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/playbackcontrols/playbackcontrols.h b/app/widget/playbackcontrols/playbackcontrols.h index 4e7562146..6940b4102 100644 --- a/app/widget/playbackcontrols/playbackcontrols.h +++ b/app/widget/playbackcontrols/playbackcontrols.h @@ -30,6 +30,8 @@ #include "dragbutton.h" #include "widget/slider/timeslider.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A playback controls widget providing buttons for navigating media * @@ -132,4 +134,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // PLAYBACKCONTROLS_H diff --git a/app/widget/projectexplorer/projectexplorer.cpp b/app/widget/projectexplorer/projectexplorer.cpp index d7af8c3e2..5b519396d 100644 --- a/app/widget/projectexplorer/projectexplorer.cpp +++ b/app/widget/projectexplorer/projectexplorer.cpp @@ -33,6 +33,8 @@ #include "dialog/sequence/sequence.h" #include "widget/menu/menu.h" +OLIVE_NAMESPACE_ENTER + ProjectExplorer::ProjectExplorer(QWidget *parent) : QWidget(parent), model_(this) @@ -425,3 +427,5 @@ void ProjectExplorer::DeleteSelected() Core::instance()->undo_stack()->pushIfHasChildren(command); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/projectexplorer/projectexplorer.h b/app/widget/projectexplorer/projectexplorer.h index 9285e76ab..b9986e6c2 100644 --- a/app/widget/projectexplorer/projectexplorer.h +++ b/app/widget/projectexplorer/projectexplorer.h @@ -33,6 +33,8 @@ #include "widget/projectexplorer/projectexplorernavigation.h" #include "widget/projecttoolbar/projecttoolbar.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A widget for browsing through a Project structure. * @@ -163,4 +165,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECTEXPLORER_H diff --git a/app/widget/projectexplorer/projectexplorericonview.cpp b/app/widget/projectexplorer/projectexplorericonview.cpp index 302eec1f7..0284dd5f5 100644 --- a/app/widget/projectexplorer/projectexplorericonview.cpp +++ b/app/widget/projectexplorer/projectexplorericonview.cpp @@ -20,6 +20,8 @@ #include "projectexplorericonview.h" +OLIVE_NAMESPACE_ENTER + ProjectExplorerIconView::ProjectExplorerIconView(QWidget *parent) : ProjectExplorerListViewBase(parent) { @@ -27,3 +29,5 @@ ProjectExplorerIconView::ProjectExplorerIconView(QWidget *parent) : setItemDelegate(&delegate_); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/projectexplorer/projectexplorericonview.h b/app/widget/projectexplorer/projectexplorericonview.h index ce29562a7..c0b11cfd2 100644 --- a/app/widget/projectexplorer/projectexplorericonview.h +++ b/app/widget/projectexplorer/projectexplorericonview.h @@ -24,6 +24,8 @@ #include "projectexplorerlistviewbase.h" #include "projectexplorericonviewitemdelegate.h" +OLIVE_NAMESPACE_ENTER + /** * @brief The view widget used when ProjectExplorer is in Icon View */ @@ -37,4 +39,6 @@ private: ProjectExplorerIconViewItemDelegate delegate_; }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECTEXPLORERICONVIEW_H diff --git a/app/widget/projectexplorer/projectexplorericonviewitemdelegate.cpp b/app/widget/projectexplorer/projectexplorericonviewitemdelegate.cpp index 046e3f342..d0bb4cdd6 100644 --- a/app/widget/projectexplorer/projectexplorericonviewitemdelegate.cpp +++ b/app/widget/projectexplorer/projectexplorericonviewitemdelegate.cpp @@ -24,6 +24,8 @@ #include "common/qtutils.h" +OLIVE_NAMESPACE_ENTER + ProjectExplorerIconViewItemDelegate::ProjectExplorerIconViewItemDelegate(QObject *parent) : QStyledItemDelegate (parent) { @@ -97,3 +99,4 @@ void ProjectExplorerIconViewItemDelegate::paint(QPainter *painter, const QStyleO } } +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/projectexplorer/projectexplorericonviewitemdelegate.h b/app/widget/projectexplorer/projectexplorericonviewitemdelegate.h index 16e244370..583ece26a 100644 --- a/app/widget/projectexplorer/projectexplorericonviewitemdelegate.h +++ b/app/widget/projectexplorer/projectexplorericonviewitemdelegate.h @@ -23,6 +23,10 @@ #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + /** * @brief The delegate that's used to draw items when ProjectExplorer is in Icon view */ @@ -34,4 +38,6 @@ public: virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECTEXPLORERICONVIEWITEMDELEGATE_H diff --git a/app/widget/projectexplorer/projectexplorerlistview.cpp b/app/widget/projectexplorer/projectexplorerlistview.cpp index 02672cd27..0f028dde9 100644 --- a/app/widget/projectexplorer/projectexplorerlistview.cpp +++ b/app/widget/projectexplorer/projectexplorerlistview.cpp @@ -20,6 +20,8 @@ #include "projectexplorerlistview.h" +OLIVE_NAMESPACE_ENTER + ProjectExplorerListView::ProjectExplorerListView(QWidget *parent) : ProjectExplorerListViewBase(parent) { @@ -27,3 +29,5 @@ ProjectExplorerListView::ProjectExplorerListView(QWidget *parent) : setItemDelegate(&delegate_); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/projectexplorer/projectexplorerlistview.h b/app/widget/projectexplorer/projectexplorerlistview.h index be92cd867..9f62925f3 100644 --- a/app/widget/projectexplorer/projectexplorerlistview.h +++ b/app/widget/projectexplorer/projectexplorerlistview.h @@ -24,6 +24,8 @@ #include "projectexplorerlistviewbase.h" #include "projectexplorerlistviewitemdelegate.h" +OLIVE_NAMESPACE_ENTER + /** * @brief The view widget used when ProjectExplorer is in List View */ @@ -37,4 +39,6 @@ private: ProjectExplorerListViewItemDelegate delegate_; }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECTEXPLORERLISTVIEW_H diff --git a/app/widget/projectexplorer/projectexplorerlistviewbase.cpp b/app/widget/projectexplorer/projectexplorerlistviewbase.cpp index 8aca63ef0..c01e1125e 100644 --- a/app/widget/projectexplorer/projectexplorerlistviewbase.cpp +++ b/app/widget/projectexplorer/projectexplorerlistviewbase.cpp @@ -22,6 +22,8 @@ #include +OLIVE_NAMESPACE_ENTER + ProjectExplorerListViewBase::ProjectExplorerListViewBase(QWidget *parent) : QListView(parent) { @@ -48,3 +50,5 @@ void ProjectExplorerListViewBase::mouseDoubleClickEvent(QMouseEvent *event) emit DoubleClickedEmptyArea(); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/projectexplorer/projectexplorerlistviewbase.h b/app/widget/projectexplorer/projectexplorerlistviewbase.h index 41f563f67..19b816f74 100644 --- a/app/widget/projectexplorer/projectexplorerlistviewbase.h +++ b/app/widget/projectexplorer/projectexplorerlistviewbase.h @@ -23,6 +23,10 @@ #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + /** * @brief A QListView derivative that contains functionality used by both List view and Icon view (which are both based * on QListView) @@ -53,4 +57,6 @@ signals: void DoubleClickedEmptyArea(); }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECTEXPLORERLISTVIEWBASE_H diff --git a/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.cpp b/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.cpp index 879050ac3..8414864a0 100644 --- a/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.cpp +++ b/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.cpp @@ -22,6 +22,8 @@ #include +OLIVE_NAMESPACE_ENTER + ProjectExplorerListViewItemDelegate::ProjectExplorerListViewItemDelegate(QObject *parent) : QStyledItemDelegate(parent) { @@ -77,3 +79,5 @@ void ProjectExplorerListViewItemDelegate::paint(QPainter *painter, const QStyleO painter->drawText(text_rect, static_cast(Qt::AlignLeft | Qt::AlignVCenter), text); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.h b/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.h index 00e9ddeff..0e99869d1 100644 --- a/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.h +++ b/app/widget/projectexplorer/projectexplorerlistviewitemdelegate.h @@ -23,6 +23,10 @@ #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + /** * @brief The delegate that's used to draw items when ProjectExplorer is in List view */ @@ -35,4 +39,6 @@ public: virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override; }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECTEXPLORERLISTVIEWITEMDELEGATE_H diff --git a/app/widget/projectexplorer/projectexplorernavigation.cpp b/app/widget/projectexplorer/projectexplorernavigation.cpp index bc2f16416..a67650a19 100644 --- a/app/widget/projectexplorer/projectexplorernavigation.cpp +++ b/app/widget/projectexplorer/projectexplorernavigation.cpp @@ -26,6 +26,8 @@ #include "common/define.h" #include "ui/icons/icons.h" +OLIVE_NAMESPACE_ENTER + ProjectExplorerNavigation::ProjectExplorerNavigation(QWidget *parent) : QWidget(parent) { @@ -93,3 +95,5 @@ void ProjectExplorerNavigation::UpdateIcons() size_slider_->setMaximum(kProjectIconSizeMaximum); size_slider_->setValue(kProjectIconSizeDefault); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/projectexplorer/projectexplorernavigation.h b/app/widget/projectexplorer/projectexplorernavigation.h index 736391247..3f91ec6eb 100644 --- a/app/widget/projectexplorer/projectexplorernavigation.h +++ b/app/widget/projectexplorer/projectexplorernavigation.h @@ -26,6 +26,10 @@ #include #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + /** * @brief A navigation bar widget for ProjectExplorer's Icon and List views * @@ -108,4 +112,6 @@ private: QSlider* size_slider_; }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECTEXPLORERLISTVIEWTOOLBAR_H diff --git a/app/widget/projectexplorer/projectexplorertreeview.cpp b/app/widget/projectexplorer/projectexplorertreeview.cpp index 92771d828..65d76dfd9 100644 --- a/app/widget/projectexplorer/projectexplorertreeview.cpp +++ b/app/widget/projectexplorer/projectexplorertreeview.cpp @@ -22,6 +22,8 @@ #include +OLIVE_NAMESPACE_ENTER + ProjectExplorerTreeView::ProjectExplorerTreeView(QWidget *parent) : QTreeView(parent) { @@ -51,3 +53,5 @@ void ProjectExplorerTreeView::mouseDoubleClickEvent(QMouseEvent *event) emit DoubleClickedEmptyArea(); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/projectexplorer/projectexplorertreeview.h b/app/widget/projectexplorer/projectexplorertreeview.h index 5e221e0ab..c3e4668e8 100644 --- a/app/widget/projectexplorer/projectexplorertreeview.h +++ b/app/widget/projectexplorer/projectexplorertreeview.h @@ -23,6 +23,10 @@ #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + /** * @brief The view widget used when ProjectExplorer is in Tree View * @@ -55,4 +59,6 @@ signals: void DoubleClickedEmptyArea(); }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECTEXPLORERTREEVIEW_H diff --git a/app/widget/projecttoolbar/projecttoolbar.cpp b/app/widget/projecttoolbar/projecttoolbar.cpp index 6abdf7dd1..056cd0ee5 100644 --- a/app/widget/projecttoolbar/projecttoolbar.cpp +++ b/app/widget/projecttoolbar/projecttoolbar.cpp @@ -26,6 +26,8 @@ #include "ui/icons/icons.h" +OLIVE_NAMESPACE_ENTER + ProjectToolbar::ProjectToolbar(QWidget *parent) : QWidget(parent) { @@ -150,3 +152,5 @@ void ProjectToolbar::ViewButtonClicked() abort(); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/projecttoolbar/projecttoolbar.h b/app/widget/projecttoolbar/projecttoolbar.h index b606a6018..7f5624484 100644 --- a/app/widget/projecttoolbar/projecttoolbar.h +++ b/app/widget/projecttoolbar/projecttoolbar.h @@ -25,6 +25,10 @@ #include #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + /** * @brief The ProjectToolbar class * @@ -83,4 +87,6 @@ private slots: void ViewButtonClicked(); }; +OLIVE_NAMESPACE_EXIT + #endif // PROJECTTOOLBAR_H diff --git a/app/widget/resizablescrollbar/resizablescrollbar.cpp b/app/widget/resizablescrollbar/resizablescrollbar.cpp index f18a86037..412f63a95 100644 --- a/app/widget/resizablescrollbar/resizablescrollbar.cpp +++ b/app/widget/resizablescrollbar/resizablescrollbar.cpp @@ -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 . + +***/ + #include "resizablescrollbar.h" #include @@ -7,6 +27,8 @@ #include "common/range.h" +OLIVE_NAMESPACE_ENTER + const int ResizableScrollBar::kHandleWidth = 10; ResizableScrollBar::ResizableScrollBar(QWidget *parent) : @@ -136,3 +158,5 @@ int ResizableScrollBar::GetActiveMousePos(QMouseEvent *event) return event->pos().y(); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/resizablescrollbar/resizablescrollbar.h b/app/widget/resizablescrollbar/resizablescrollbar.h index ac5f80a66..92652a617 100644 --- a/app/widget/resizablescrollbar/resizablescrollbar.h +++ b/app/widget/resizablescrollbar/resizablescrollbar.h @@ -1,8 +1,32 @@ +/*** + + 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 . + +***/ + #ifndef RESIZABLESCROLLBAR_H #define RESIZABLESCROLLBAR_H #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class ResizableScrollBar : public QScrollBar { Q_OBJECT @@ -41,4 +65,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // RESIZABLESCROLLBAR_H diff --git a/app/widget/slider/floatslider.cpp b/app/widget/slider/floatslider.cpp index c71f1cd3d..71e119258 100644 --- a/app/widget/slider/floatslider.cpp +++ b/app/widget/slider/floatslider.cpp @@ -22,6 +22,8 @@ #include +OLIVE_NAMESPACE_ENTER + FloatSlider::FloatSlider(QWidget *parent) : SliderBase(kFloat, parent), display_type_(kNormal) @@ -162,3 +164,5 @@ void FloatSlider::ConvertValue(QVariant v) { emit ValueChanged(v.toDouble()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/slider/floatslider.h b/app/widget/slider/floatslider.h index 56d43e88c..15dfb84ee 100644 --- a/app/widget/slider/floatslider.h +++ b/app/widget/slider/floatslider.h @@ -23,6 +23,8 @@ #include "sliderbase.h" +OLIVE_NAMESPACE_ENTER + class FloatSlider : public SliderBase { Q_OBJECT @@ -64,4 +66,6 @@ private: DisplayType display_type_; }; +OLIVE_NAMESPACE_EXIT + #endif // FLOATSLIDER_H diff --git a/app/widget/slider/integerslider.cpp b/app/widget/slider/integerslider.cpp index c7d52b846..25615e2a5 100644 --- a/app/widget/slider/integerslider.cpp +++ b/app/widget/slider/integerslider.cpp @@ -20,6 +20,8 @@ #include "integerslider.h" +OLIVE_NAMESPACE_ENTER + IntegerSlider::IntegerSlider(QWidget* parent) : SliderBase(kInteger, parent) { @@ -69,3 +71,5 @@ void IntegerSlider::ConvertValue(QVariant v) { emit ValueChanged(v.toInt()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/slider/integerslider.h b/app/widget/slider/integerslider.h index 86a7a33ba..01ea4f064 100644 --- a/app/widget/slider/integerslider.h +++ b/app/widget/slider/integerslider.h @@ -23,6 +23,8 @@ #include "sliderbase.h" +OLIVE_NAMESPACE_ENTER + class IntegerSlider : public SliderBase { Q_OBJECT @@ -47,4 +49,6 @@ private slots: void ConvertValue(QVariant v); }; +OLIVE_NAMESPACE_EXIT + #endif // INTEGERSLIDER_H diff --git a/app/widget/slider/sliderbase.cpp b/app/widget/slider/sliderbase.cpp index c696c9b7a..2a6420683 100644 --- a/app/widget/slider/sliderbase.cpp +++ b/app/widget/slider/sliderbase.cpp @@ -24,6 +24,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + SliderBase::SliderBase(Mode mode, QWidget *parent) : QStackedWidget(parent), decimal_places_(1), @@ -315,3 +317,5 @@ void SliderBase::LineEditCancelled() editor_->blockSignals(false); label_->blockSignals(false); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/slider/sliderbase.h b/app/widget/slider/sliderbase.h index a54372df4..06a50bbfe 100644 --- a/app/widget/slider/sliderbase.h +++ b/app/widget/slider/sliderbase.h @@ -26,6 +26,7 @@ #include "sliderlabel.h" #include "widget/focusablelineedit/focusablelineedit.h" +OLIVE_NAMESPACE_ENTER class SliderBase : public QStackedWidget { Q_OBJECT @@ -121,4 +122,6 @@ private slots: void LineEditCancelled(); }; +OLIVE_NAMESPACE_EXIT + #endif // SLIDERBASE_H diff --git a/app/widget/slider/sliderlabel.cpp b/app/widget/slider/sliderlabel.cpp index 9e09bbe3b..a54a54cf0 100644 --- a/app/widget/slider/sliderlabel.cpp +++ b/app/widget/slider/sliderlabel.cpp @@ -23,6 +23,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + SliderLabel::SliderLabel(QWidget *parent) : QLabel(parent) { @@ -90,3 +92,5 @@ void SliderLabel::focusInEvent(QFocusEvent *event) emit focused(); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/slider/sliderlabel.h b/app/widget/slider/sliderlabel.h index 8f02ee813..92771e669 100644 --- a/app/widget/slider/sliderlabel.h +++ b/app/widget/slider/sliderlabel.h @@ -23,6 +23,10 @@ #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class SliderLabel : public QLabel { Q_OBJECT @@ -52,4 +56,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // SLIDERLABEL_H diff --git a/app/widget/slider/stringslider.cpp b/app/widget/slider/stringslider.cpp index 5f52f2fee..c096eeed0 100644 --- a/app/widget/slider/stringslider.cpp +++ b/app/widget/slider/stringslider.cpp @@ -20,6 +20,8 @@ #include "stringslider.h" +OLIVE_NAMESPACE_ENTER + StringSlider::StringSlider(QWidget* parent) : SliderBase(kString, parent) { @@ -46,3 +48,5 @@ void StringSlider::ConvertValue(QVariant v) { emit ValueChanged(v.toString()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/slider/stringslider.h b/app/widget/slider/stringslider.h index f086d334a..573af0482 100644 --- a/app/widget/slider/stringslider.h +++ b/app/widget/slider/stringslider.h @@ -23,6 +23,8 @@ #include "sliderbase.h" +OLIVE_NAMESPACE_ENTER + class StringSlider : public SliderBase { Q_OBJECT @@ -45,4 +47,6 @@ private slots: void ConvertValue(QVariant v); }; +OLIVE_NAMESPACE_EXIT + #endif // STRINGSLIDER_H diff --git a/app/widget/slider/timeslider.cpp b/app/widget/slider/timeslider.cpp index 4d59c007c..5180819ff 100644 --- a/app/widget/slider/timeslider.cpp +++ b/app/widget/slider/timeslider.cpp @@ -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 . + +***/ + #include "timeslider.h" #include "common/timecodefunctions.h" #include "core.h" +OLIVE_NAMESPACE_ENTER + TimeSlider::TimeSlider(QWidget *parent) : IntegerSlider(parent) { @@ -40,3 +62,5 @@ void TimeSlider::TimecodeDisplayChanged() { UpdateLabel(Value()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/slider/timeslider.h b/app/widget/slider/timeslider.h index a69c0f31b..d1e835dca 100644 --- a/app/widget/slider/timeslider.h +++ b/app/widget/slider/timeslider.h @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #ifndef TIMESLIDER_H #define TIMESLIDER_H #include "common/rational.h" #include "integerslider.h" +OLIVE_NAMESPACE_ENTER + class TimeSlider : public IntegerSlider { Q_OBJECT @@ -25,4 +47,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMESLIDER_H diff --git a/app/widget/taskview/taskview.cpp b/app/widget/taskview/taskview.cpp index 0869097a7..a898b1917 100644 --- a/app/widget/taskview/taskview.cpp +++ b/app/widget/taskview/taskview.cpp @@ -22,6 +22,8 @@ #include +OLIVE_NAMESPACE_ENTER + TaskView::TaskView(QWidget* parent) : QScrollArea(parent) { @@ -46,3 +48,5 @@ void TaskView::AddTask(Task *t) // Create TaskViewItem (UI representation of a Task) and connect it layout_->insertWidget(layout_->count()-1, new TaskViewItem(t)); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/taskview/taskview.h b/app/widget/taskview/taskview.h index 18aa95317..d7f9831b1 100644 --- a/app/widget/taskview/taskview.h +++ b/app/widget/taskview/taskview.h @@ -26,6 +26,8 @@ #include "widget/taskview/taskviewitem.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A widget that shows a list of Tasks * @@ -53,4 +55,6 @@ private: QVBoxLayout* layout_; }; +OLIVE_NAMESPACE_EXIT + #endif // TASKVIEW_H diff --git a/app/widget/taskview/taskviewitem.cpp b/app/widget/taskview/taskviewitem.cpp index d270b07ef..80f0eb88f 100644 --- a/app/widget/taskview/taskviewitem.cpp +++ b/app/widget/taskview/taskviewitem.cpp @@ -24,6 +24,8 @@ #include "ui/icons/icons.h" +OLIVE_NAMESPACE_ENTER + TaskViewItem::TaskViewItem(Task* task, QWidget *parent) : QFrame(parent), task_(task) @@ -62,3 +64,5 @@ TaskViewItem::TaskViewItem(Task* task, QWidget *parent) : connect(task_, &Task::Removed, this, &TaskViewItem::deleteLater); connect(cancel_btn_, &QPushButton::clicked, task_, &Task::Cancel, Qt::DirectConnection); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/taskview/taskviewitem.h b/app/widget/taskview/taskviewitem.h index 1c5edf4f3..24297fe57 100644 --- a/app/widget/taskview/taskviewitem.h +++ b/app/widget/taskview/taskviewitem.h @@ -28,6 +28,8 @@ #include "task/task.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A widget that visually represents the status of a Task * @@ -53,4 +55,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TASKVIEWITEM_H diff --git a/app/widget/timebased/timebased.cpp b/app/widget/timebased/timebased.cpp index c17b3cbdb..01f787093 100644 --- a/app/widget/timebased/timebased.cpp +++ b/app/widget/timebased/timebased.cpp @@ -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 . + +***/ + #include "timebased.h" #include @@ -9,6 +29,8 @@ #include "project/item/sequence/sequence.h" #include "widget/timelinewidget/undo/undo.h" +OLIVE_NAMESPACE_ENTER + TimeBasedWidget::TimeBasedWidget(bool ruler_text_visible, bool ruler_cache_status_visible, QWidget *parent) : TimelineScaledWidget(parent), viewer_node_(nullptr), @@ -397,3 +419,5 @@ void TimeBasedWidget::SetMarker() points_->markers()->AddMarker(TimeRange(GetTime(), GetTime()), marker_name); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timebased/timebased.h b/app/widget/timebased/timebased.h index 40e8bf513..52377d6cc 100644 --- a/app/widget/timebased/timebased.h +++ b/app/widget/timebased/timebased.h @@ -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 . + +***/ + #ifndef TIMEBASEDWIDGET_H #define TIMEBASEDWIDGET_H @@ -9,6 +29,8 @@ #include "widget/timelinewidget/timelinescaledobject.h" #include "widget/timeruler/timeruler.h" +OLIVE_NAMESPACE_ENTER + class TimeBasedWidget : public TimelineScaledWidget { Q_OBJECT @@ -138,4 +160,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMEBASEDWIDGET_H diff --git a/app/widget/timelinewidget/timelineandtrackview.cpp b/app/widget/timelinewidget/timelineandtrackview.cpp index b4ad8603a..d233c25da 100644 --- a/app/widget/timelinewidget/timelineandtrackview.cpp +++ b/app/widget/timelinewidget/timelineandtrackview.cpp @@ -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 . + +***/ + #include "timelineandtrackview.h" #include #include +OLIVE_NAMESPACE_ENTER + TimelineAndTrackView::TimelineAndTrackView(Qt::Alignment vertical_alignment, QWidget *parent) : QWidget(parent) { @@ -50,3 +72,5 @@ void TimelineAndTrackView::TracksValueChanged(int v) { view_->verticalScrollBar()->setValue(view_->verticalScrollBar()->minimum() + v); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/timelineandtrackview.h b/app/widget/timelinewidget/timelineandtrackview.h index f7742aaea..7b482cde7 100644 --- a/app/widget/timelinewidget/timelineandtrackview.h +++ b/app/widget/timelinewidget/timelineandtrackview.h @@ -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 . + +***/ + #ifndef TIMELINEANDTRACKVIEW_H #define TIMELINEANDTRACKVIEW_H @@ -7,6 +27,8 @@ #include "view/timelineview.h" #include "trackview/trackview.h" +OLIVE_NAMESPACE_ENTER + class TimelineAndTrackView : public QWidget { public: @@ -33,4 +55,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEANDTRACKVIEW_H diff --git a/app/widget/timelinewidget/timelinescaledobject.cpp b/app/widget/timelinewidget/timelinescaledobject.cpp index cd0fb9bcc..979ecf048 100644 --- a/app/widget/timelinewidget/timelinescaledobject.cpp +++ b/app/widget/timelinewidget/timelinescaledobject.cpp @@ -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 . + +***/ + #include "timelinescaledobject.h" #include @@ -5,6 +25,8 @@ #include "common/clamp.h" +OLIVE_NAMESPACE_ENTER + TimelineScaledObject::TimelineScaledObject() : scale_(1.0), min_scale_(0), @@ -94,3 +116,5 @@ TimelineScaledWidget::TimelineScaledWidget(QWidget *parent) : QWidget(parent) { } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/timelinescaledobject.h b/app/widget/timelinewidget/timelinescaledobject.h index 0889064c8..c55cff296 100644 --- a/app/widget/timelinewidget/timelinescaledobject.h +++ b/app/widget/timelinewidget/timelinescaledobject.h @@ -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 . + +***/ + #ifndef TIMELINESCALEDOBJECT_H #define TIMELINESCALEDOBJECT_H @@ -5,6 +25,8 @@ #include "common/rational.h" +OLIVE_NAMESPACE_ENTER + class TimelineScaledObject { public: @@ -54,4 +76,6 @@ public: TimelineScaledWidget(QWidget* parent = nullptr); }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINESCALEDOBJECT_H diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp index 9d1bc5653..ec953cb12 100644 --- a/app/widget/timelinewidget/timelinewidget.cpp +++ b/app/widget/timelinewidget/timelinewidget.cpp @@ -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 . + +***/ + #include "timelinewidget.h" #include @@ -14,6 +34,8 @@ #include "widget/menu/menu.h" #include "widget/nodeview/nodeviewundo.h" +OLIVE_NAMESPACE_ENTER + TimelineWidget::TimelineWidget(QWidget *parent) : TimeBasedWidget(true, true, parent), rubberband_(QRubberBand::Rectangle, this), @@ -48,20 +70,20 @@ TimelineWidget::TimelineWidget(QWidget *parent) : views_.append(new TimelineAndTrackView(Qt::AlignTop)); // Create tools - tools_.resize(::Tool::kCount); + tools_.resize(OLIVE_NAMESPACE::Tool::kCount); tools_.fill(nullptr); - tools_.replace(::Tool::kPointer, new PointerTool(this)); - tools_.replace(::Tool::kEdit, new EditTool(this)); - tools_.replace(::Tool::kRipple, new RippleTool(this)); - tools_.replace(::Tool::kRolling, new RollingTool(this)); - tools_.replace(::Tool::kRazor, new RazorTool(this)); - tools_.replace(::Tool::kSlip, new SlipTool(this)); - tools_.replace(::Tool::kSlide, new SlideTool(this)); - tools_.replace(::Tool::kZoom, new ZoomTool(this)); - tools_.replace(::Tool::kTransition, new TransitionTool(this)); - //tools_.replace(::Tool::kRecord, new PointerTool(this)); FIXME: Implement - tools_.replace(::Tool::kAdd, new AddTool(this)); + tools_.replace(OLIVE_NAMESPACE::Tool::kPointer, new PointerTool(this)); + tools_.replace(OLIVE_NAMESPACE::Tool::kEdit, new EditTool(this)); + tools_.replace(OLIVE_NAMESPACE::Tool::kRipple, new RippleTool(this)); + tools_.replace(OLIVE_NAMESPACE::Tool::kRolling, new RollingTool(this)); + tools_.replace(OLIVE_NAMESPACE::Tool::kRazor, new RazorTool(this)); + tools_.replace(OLIVE_NAMESPACE::Tool::kSlip, new SlipTool(this)); + tools_.replace(OLIVE_NAMESPACE::Tool::kSlide, new SlideTool(this)); + tools_.replace(OLIVE_NAMESPACE::Tool::kZoom, new ZoomTool(this)); + tools_.replace(OLIVE_NAMESPACE::Tool::kTransition, new TransitionTool(this)); + //tools_.replace(OLIVE_NAMESPACE::Tool::kRecord, new PointerTool(this)); FIXME: Implement + tools_.replace(OLIVE_NAMESPACE::Tool::kAdd, new AddTool(this)); import_tool_ = new ImportTool(this); @@ -1250,3 +1272,5 @@ void TimelineWidget::EndRubberBandSelect(bool enable_selecting, bool select_link ViewSelectionChanged(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/timelinewidget.h b/app/widget/timelinewidget/timelinewidget.h index 1138134c5..aaf47d064 100644 --- a/app/widget/timelinewidget/timelinewidget.h +++ b/app/widget/timelinewidget/timelinewidget.h @@ -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 . + +***/ + #ifndef TIMELINEWIDGET_H #define TIMELINEWIDGET_H @@ -12,6 +32,8 @@ #include "widget/slider/timeslider.h" #include "widget/timebased/timebased.h" +OLIVE_NAMESPACE_ENTER + /** * @brief Full widget for working with TimelineOutput nodes * @@ -497,4 +519,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEWIDGET_H diff --git a/app/widget/timelinewidget/tool/add.cpp b/app/widget/timelinewidget/tool/add.cpp index 1e6cb8126..ce47e2888 100644 --- a/app/widget/timelinewidget/tool/add.cpp +++ b/app/widget/timelinewidget/tool/add.cpp @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #include "widget/timelinewidget/timelinewidget.h" #include "core.h" #include "node/factory.h" #include "widget/nodeview/nodeviewundo.h" +OLIVE_NAMESPACE_ENTER + TimelineWidget::AddTool::AddTool(TimelineWidget *parent) : Tool(parent), ghost_(nullptr) @@ -22,18 +44,18 @@ void TimelineWidget::AddTool::MousePress(TimelineViewMouseEvent *event) Timeline::TrackType add_type = Timeline::kTrackTypeNone; switch (Core::instance()->selected_addable_object()) { - case ::Tool::kAddableBars: - case ::Tool::kAddableSolid: - case ::Tool::kAddableTitle: + case OLIVE_NAMESPACE::Tool::kAddableBars: + case OLIVE_NAMESPACE::Tool::kAddableSolid: + case OLIVE_NAMESPACE::Tool::kAddableTitle: add_type = Timeline::kTrackTypeVideo; break; - case ::Tool::kAddableTone: + case OLIVE_NAMESPACE::Tool::kAddableTone: add_type = Timeline::kTrackTypeAudio; break; - case ::Tool::kAddableEmpty: + case OLIVE_NAMESPACE::Tool::kAddableEmpty: // Leave as "none", which means this block can be placed on any track break; - case ::Tool::kAddableCount: + case OLIVE_NAMESPACE::Tool::kAddableCount: return; } @@ -73,7 +95,7 @@ void TimelineWidget::AddTool::MouseRelease(TimelineViewMouseEvent *event) ClipBlock* clip = new ClipBlock(); clip->set_length_and_media_out(ghost_->AdjustedLength()); - clip->set_block_name(::Tool::GetAddableObjectName(Core::instance()->selected_addable_object())); + clip->set_block_name(OLIVE_NAMESPACE::Tool::GetAddableObjectName(Core::instance()->selected_addable_object())); NodeGraph* graph = static_cast(parent()->GetConnectedNode()->parent()); @@ -88,10 +110,10 @@ void TimelineWidget::AddTool::MouseRelease(TimelineViewMouseEvent *event) command); switch (Core::instance()->selected_addable_object()) { - case ::Tool::kAddableEmpty: + case OLIVE_NAMESPACE::Tool::kAddableEmpty: // Empty, nothing to be done break; - case ::Tool::kAddableSolid: + case OLIVE_NAMESPACE::Tool::kAddableSolid: { Node* solid = NodeFactory::CreateFromID(QStringLiteral("org.olivevideoeditor.Olive.solidgenerator")); @@ -102,13 +124,13 @@ void TimelineWidget::AddTool::MouseRelease(TimelineViewMouseEvent *event) new NodeEdgeAddCommand(solid->output(), clip->texture_input(), command); break; } - case ::Tool::kAddableBars: - case ::Tool::kAddableTitle: - case ::Tool::kAddableTone: + case OLIVE_NAMESPACE::Tool::kAddableBars: + case OLIVE_NAMESPACE::Tool::kAddableTitle: + case OLIVE_NAMESPACE::Tool::kAddableTone: // Not implemented yet qWarning() << "Unimplemented add object:" << Core::instance()->selected_addable_object(); break; - case ::Tool::kAddableCount: + case OLIVE_NAMESPACE::Tool::kAddableCount: // Invalid value, do nothing break; } @@ -155,3 +177,5 @@ void TimelineWidget::AddTool::MouseMoveInternal(const rational &cursor_frame, bo ghost_->SetOutAdjustment(outwards ? -movement : 0); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/tool/edit.cpp b/app/widget/timelinewidget/tool/edit.cpp index ad635b7cb..d7940f0c4 100644 --- a/app/widget/timelinewidget/tool/edit.cpp +++ b/app/widget/timelinewidget/tool/edit.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "widget/timelinewidget/timelinewidget.h" +OLIVE_NAMESPACE_ENTER + TimelineWidget::EditTool::EditTool(TimelineWidget* parent) : Tool(parent) { @@ -19,3 +41,5 @@ void TimelineWidget::EditTool::MouseRelease(TimelineViewMouseEvent *event) { Q_UNUSED(event) } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/tool/import.cpp b/app/widget/timelinewidget/tool/import.cpp index 1b7e697fc..213500ef6 100644 --- a/app/widget/timelinewidget/tool/import.cpp +++ b/app/widget/timelinewidget/tool/import.cpp @@ -37,6 +37,8 @@ #include "widget/nodeview/nodeviewundo.h" #include "window/mainwindow/mainwindow.h" +OLIVE_NAMESPACE_ENTER + Timeline::TrackType TrackTypeFromStreamType(Stream::Type stream_type) { switch (stream_type) { @@ -451,3 +453,5 @@ void TimelineWidget::ImportTool::DropGhosts(bool insert) Core::instance()->main_window()->OpenSequence(open_sequence); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/tool/pointer.cpp b/app/widget/timelinewidget/tool/pointer.cpp index 3110411a7..27fcbb3cd 100644 --- a/app/widget/timelinewidget/tool/pointer.cpp +++ b/app/widget/timelinewidget/tool/pointer.cpp @@ -34,6 +34,8 @@ #include "node/block/transition/transition.h" #include "widget/nodeview/nodeviewundo.h" +OLIVE_NAMESPACE_ENTER + TimelineWidget::PointerTool::PointerTool(TimelineWidget *parent) : Tool(parent), movement_allowed_(true), @@ -714,3 +716,5 @@ rational TimelineWidget::PointerTool::ValidateOutTrimming(rational movement, return movement; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/tool/razor.cpp b/app/widget/timelinewidget/tool/razor.cpp index 9b41faedc..d89e9125d 100644 --- a/app/widget/timelinewidget/tool/razor.cpp +++ b/app/widget/timelinewidget/tool/razor.cpp @@ -20,6 +20,8 @@ #include "widget/timelinewidget/timelinewidget.h" +OLIVE_NAMESPACE_ENTER + TimelineWidget::RazorTool::RazorTool(TimelineWidget* parent) : Tool(parent) { @@ -90,3 +92,5 @@ void TimelineWidget::RazorTool::MouseRelease(TimelineViewMouseEvent *event) dragging_ = false; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/tool/ripple.cpp b/app/widget/timelinewidget/tool/ripple.cpp index 7d8a20b2b..a9a3d099c 100644 --- a/app/widget/timelinewidget/tool/ripple.cpp +++ b/app/widget/timelinewidget/tool/ripple.cpp @@ -23,6 +23,8 @@ #include "node/block/gap/gap.h" #include "widget/nodeview/nodeviewundo.h" +OLIVE_NAMESPACE_ENTER + TimelineWidget::RippleTool::RippleTool(TimelineWidget* parent) : PointerTool(parent) { @@ -152,3 +154,5 @@ void TimelineWidget::RippleTool::InitiateGhosts(TimelineViewBlockItem *clicked_i } } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/tool/rolling.cpp b/app/widget/timelinewidget/tool/rolling.cpp index 1d0ca0839..38babb4e8 100644 --- a/app/widget/timelinewidget/tool/rolling.cpp +++ b/app/widget/timelinewidget/tool/rolling.cpp @@ -23,6 +23,8 @@ #include "node/block/gap/gap.h" #include "widget/nodeview/nodeviewundo.h" +OLIVE_NAMESPACE_ENTER + TimelineWidget::RollingTool::RollingTool(TimelineWidget* parent) : PointerTool(parent) { @@ -99,3 +101,5 @@ void TimelineWidget::RollingTool::InitiateGhosts(TimelineViewBlockItem *clicked_ } } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/tool/slide.cpp b/app/widget/timelinewidget/tool/slide.cpp index 4bf3eb599..beb60a4cf 100644 --- a/app/widget/timelinewidget/tool/slide.cpp +++ b/app/widget/timelinewidget/tool/slide.cpp @@ -23,6 +23,8 @@ #include "node/block/gap/gap.h" #include "widget/nodeview/nodeviewundo.h" +OLIVE_NAMESPACE_ENTER + TimelineWidget::SlideTool::SlideTool(TimelineWidget* parent) : PointerTool(parent) { @@ -89,3 +91,4 @@ void TimelineWidget::SlideTool::InitiateGhosts(TimelineViewBlockItem *clicked_it } } +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/tool/slip.cpp b/app/widget/timelinewidget/tool/slip.cpp index 229a351e4..a548993e4 100644 --- a/app/widget/timelinewidget/tool/slip.cpp +++ b/app/widget/timelinewidget/tool/slip.cpp @@ -25,6 +25,8 @@ #include "common/timecodefunctions.h" #include "config/config.h" +OLIVE_NAMESPACE_ENTER + TimelineWidget::SlipTool::SlipTool(TimelineWidget *parent) : PointerTool(parent) { @@ -80,3 +82,4 @@ void TimelineWidget::SlipTool::MouseReleaseInternal(TimelineViewMouseEvent *even Core::instance()->undo_stack()->pushIfHasChildren(command); } +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/tool/tool.cpp b/app/widget/timelinewidget/tool/tool.cpp index 1084d5ec8..957b2dca9 100644 --- a/app/widget/timelinewidget/tool/tool.cpp +++ b/app/widget/timelinewidget/tool/tool.cpp @@ -26,6 +26,8 @@ #include "node/block/transition/transition.h" #include "widget/nodeview/nodeviewundo.h" +OLIVE_NAMESPACE_ENTER + TimelineWidget::Tool::Tool(TimelineWidget *parent) : dragging_(false), parent_(parent) @@ -224,3 +226,5 @@ void TimelineWidget::Tool::InsertGapsAtGhostDestination(const QVectorInsertGapsAt(earliest_point, latest_point - earliest_point, command); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/tool/transition.cpp b/app/widget/timelinewidget/tool/transition.cpp index 8e304c575..6592581e9 100644 --- a/app/widget/timelinewidget/tool/transition.cpp +++ b/app/widget/timelinewidget/tool/transition.cpp @@ -1,9 +1,31 @@ +/*** + + 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 . + +***/ + #include "widget/timelinewidget/timelinewidget.h" #include "node/block/transition/transition.h" #include "node/factory.h" #include "widget/nodeview/nodeviewundo.h" +OLIVE_NAMESPACE_ENTER + TimelineWidget::TransitionTool::TransitionTool(TimelineWidget *parent) : AddTool(parent) { @@ -152,3 +174,5 @@ void TimelineWidget::TransitionTool::MouseRelease(TimelineViewMouseEvent *event) ghost_ = nullptr; } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/tool/zoom.cpp b/app/widget/timelinewidget/tool/zoom.cpp index 55830dfb3..123b821c8 100644 --- a/app/widget/timelinewidget/tool/zoom.cpp +++ b/app/widget/timelinewidget/tool/zoom.cpp @@ -20,6 +20,8 @@ #include "widget/timelinewidget/timelinewidget.h" +OLIVE_NAMESPACE_ENTER + TimelineWidget::ZoomTool::ZoomTool(TimelineWidget *parent) : Tool(parent) { @@ -90,3 +92,5 @@ void TimelineWidget::ZoomTool::MouseRelease(TimelineViewMouseEvent *event) // (using a hacky singleShot so the scroll occurs after the scene and its scrollbars have updated) QTimer::singleShot(0, parent(), &TimelineWidget::DeferredScrollAction); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/trackview/trackview.cpp b/app/widget/timelinewidget/trackview/trackview.cpp index 8ae8f2821..1d0721ea1 100644 --- a/app/widget/timelinewidget/trackview/trackview.cpp +++ b/app/widget/timelinewidget/trackview/trackview.cpp @@ -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 . + +***/ + #include "trackview.h" #include @@ -8,6 +28,8 @@ #include "trackviewitem.h" +OLIVE_NAMESPACE_ENTER + TrackView::TrackView(Qt::Alignment vertical_alignment, QWidget *parent) : QScrollArea(parent), list_(nullptr), @@ -110,3 +132,5 @@ void TrackView::RemoveTrack(TrackOutput *track) { splitter_->Remove(track->Index()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/trackview/trackview.h b/app/widget/timelinewidget/trackview/trackview.h index 77d80ef4d..1a7adc674 100644 --- a/app/widget/timelinewidget/trackview/trackview.h +++ b/app/widget/timelinewidget/trackview/trackview.h @@ -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 . + +***/ + #ifndef TRACKVIEW_H #define TRACKVIEW_H @@ -8,6 +28,8 @@ #include "trackviewitem.h" #include "trackviewsplitter.h" +OLIVE_NAMESPACE_ENTER + class TrackView : public QScrollArea { Q_OBJECT @@ -43,4 +65,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TRACKVIEW_H diff --git a/app/widget/timelinewidget/trackview/trackviewitem.cpp b/app/widget/timelinewidget/trackview/trackviewitem.cpp index 96c2d08c6..b9e5da7d2 100644 --- a/app/widget/timelinewidget/trackview/trackviewitem.cpp +++ b/app/widget/timelinewidget/trackview/trackviewitem.cpp @@ -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 . + +***/ + #include "trackviewitem.h" #include @@ -6,6 +26,8 @@ #include #include +OLIVE_NAMESPACE_ENTER + TrackViewItem::TrackViewItem(TrackOutput* track, QWidget *parent) : QWidget(parent), track_(track) @@ -84,3 +106,5 @@ void TrackViewItem::LineEditCancelled() line_edit_->blockSignals(false); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/trackview/trackviewitem.h b/app/widget/timelinewidget/trackview/trackviewitem.h index d578b5540..94a3db4f5 100644 --- a/app/widget/timelinewidget/trackview/trackviewitem.h +++ b/app/widget/timelinewidget/trackview/trackviewitem.h @@ -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 . + +***/ + #ifndef TRACKVIEWITEM_H #define TRACKVIEWITEM_H @@ -9,6 +29,8 @@ #include "widget/clickablelabel/clickablelabel.h" #include "widget/focusablelineedit/focusablelineedit.h" +OLIVE_NAMESPACE_ENTER + class TrackViewItem : public QWidget { Q_OBJECT @@ -39,4 +61,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TRACKVIEWITEM_H diff --git a/app/widget/timelinewidget/trackview/trackviewsplitter.cpp b/app/widget/timelinewidget/trackview/trackviewsplitter.cpp index c8e0b4625..b8895876e 100644 --- a/app/widget/timelinewidget/trackview/trackviewsplitter.cpp +++ b/app/widget/timelinewidget/trackview/trackviewsplitter.cpp @@ -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 . + +***/ + #include "trackviewsplitter.h" #include @@ -5,6 +25,8 @@ #include "node/output/track/track.h" +OLIVE_NAMESPACE_ENTER + TrackViewSplitter::TrackViewSplitter(Qt::Alignment vertical_alignment, QWidget* parent) : QSplitter(Qt::Vertical, parent), alignment_(vertical_alignment), @@ -169,3 +191,5 @@ void TrackViewSplitterHandle::paintEvent(QPaintEvent *) QPainter p(this); p.fillRect(rect(), palette().base()); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/trackview/trackviewsplitter.h b/app/widget/timelinewidget/trackview/trackviewsplitter.h index 125600216..0a617e301 100644 --- a/app/widget/timelinewidget/trackview/trackviewsplitter.h +++ b/app/widget/timelinewidget/trackview/trackviewsplitter.h @@ -1,8 +1,32 @@ +/*** + + 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 . + +***/ + #ifndef TRACKVIEWSPLITTER_H #define TRACKVIEWSPLITTER_H #include +#include "common/define.h" + +OLIVE_NAMESPACE_ENTER + class TrackViewSplitterHandle : public QSplitterHandle { Q_OBJECT @@ -53,4 +77,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TRACKVIEWSPLITTER_H diff --git a/app/widget/timelinewidget/undo/undo.cpp b/app/widget/timelinewidget/undo/undo.cpp index 2b7a6e983..3e52cafb0 100644 --- a/app/widget/timelinewidget/undo/undo.cpp +++ b/app/widget/timelinewidget/undo/undo.cpp @@ -25,6 +25,8 @@ #include "node/block/transition/transition.h" #include "widget/nodeview/nodeviewundo.h" +OLIVE_NAMESPACE_ENTER + Node* TakeNodeFromParentGraph(Node* n, QObject* new_parent = nullptr) { static_cast(n->parent())->TakeNode(n, new_parent); @@ -796,3 +798,5 @@ BlockLinkManyCommand::BlockLinkManyCommand(const QList blocks, bool lin } } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/undo/undo.h b/app/widget/timelinewidget/undo/undo.h index 02de0923a..170e47aef 100644 --- a/app/widget/timelinewidget/undo/undo.h +++ b/app/widget/timelinewidget/undo/undo.h @@ -30,6 +30,8 @@ #include "timeline/timelinepoints.h" #include "undo/undocommand.h" +OLIVE_NAMESPACE_ENTER + class BlockResizeCommand : public UndoCommand { public: BlockResizeCommand(Block* block, rational new_length, QUndoCommand* parent = nullptr); @@ -373,4 +375,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEUNDOABLE_H diff --git a/app/widget/timelinewidget/view/timelineview.cpp b/app/widget/timelinewidget/view/timelineview.cpp index 17d78283c..8c57c2469 100644 --- a/app/widget/timelinewidget/view/timelineview.cpp +++ b/app/widget/timelinewidget/view/timelineview.cpp @@ -33,6 +33,8 @@ #include "node/input/media/media.h" #include "project/item/footage/footage.h" +OLIVE_NAMESPACE_ENTER + TimelineView::TimelineView(Qt::Alignment vertical_alignment, QWidget *parent) : TimelineViewBase(parent), connected_track_list_(nullptr) @@ -354,3 +356,5 @@ void TimelineView::UserSetTime(const int64_t &time) SetTime(time); emit TimeChanged(time); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/view/timelineview.h b/app/widget/timelinewidget/view/timelineview.h index 3f8517edc..bb1e7e06e 100644 --- a/app/widget/timelinewidget/view/timelineview.h +++ b/app/widget/timelinewidget/view/timelineview.h @@ -35,6 +35,8 @@ #include "widget/timelinewidget/undo/undo.h" #include "undo/undostack.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A widget for viewing and interacting Sequences * @@ -108,4 +110,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEVIEW_H diff --git a/app/widget/timelinewidget/view/timelineviewbase.cpp b/app/widget/timelinewidget/view/timelineviewbase.cpp index dae4264d2..b328d816a 100644 --- a/app/widget/timelinewidget/view/timelineviewbase.cpp +++ b/app/widget/timelinewidget/view/timelineviewbase.cpp @@ -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 . + +***/ + #include "timelineviewbase.h" #include @@ -9,6 +29,8 @@ #include "common/timecodefunctions.h" #include "config/config.h" +OLIVE_NAMESPACE_ENTER + const double TimelineViewBase::kMaximumScale = 8192; TimelineViewBase::TimelineViewBase(QWidget *parent) : @@ -322,3 +344,5 @@ void TimelineViewBase::ApplicationToolChanged(Tool::Item tool) ToolChangedEvent(tool); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/view/timelineviewbase.h b/app/widget/timelinewidget/view/timelineviewbase.h index f63f534c3..63f95e43b 100644 --- a/app/widget/timelinewidget/view/timelineviewbase.h +++ b/app/widget/timelinewidget/view/timelineviewbase.h @@ -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 . + +***/ + #ifndef TIMELINEVIEWBASE_H #define TIMELINEVIEWBASE_H @@ -8,6 +28,8 @@ #include "timelineviewenditem.h" #include "widget/timelinewidget/timelinescaledobject.h" +OLIVE_NAMESPACE_ENTER + class TimelineViewBase : public QGraphicsView, public TimelineScaledObject { Q_OBJECT @@ -99,4 +121,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEVIEWBASE_H diff --git a/app/widget/timelinewidget/view/timelineviewblockitem.cpp b/app/widget/timelinewidget/view/timelineviewblockitem.cpp index 823a388d6..a4edf3c4b 100644 --- a/app/widget/timelinewidget/view/timelineviewblockitem.cpp +++ b/app/widget/timelinewidget/view/timelineviewblockitem.cpp @@ -35,6 +35,8 @@ #include "node/block/transition/transition.h" #include "widget/viewer/audiowaveformview.h" +OLIVE_NAMESPACE_ENTER + TimelineViewBlockItem::TimelineViewBlockItem(Block *block, QGraphicsItem* parent) : TimelineViewRect(parent), block_(block) @@ -196,3 +198,5 @@ void TimelineViewBlockItem::paint(QPainter *painter, const QStyleOptionGraphicsI } } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/view/timelineviewblockitem.h b/app/widget/timelinewidget/view/timelineviewblockitem.h index 7439acc1f..fa091e78b 100644 --- a/app/widget/timelinewidget/view/timelineviewblockitem.h +++ b/app/widget/timelinewidget/view/timelineviewblockitem.h @@ -24,6 +24,8 @@ #include "timelineviewrect.h" #include "node/block/clip/clip.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A graphical representation of a ClipBlock */ @@ -44,4 +46,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEVIEWCLIPITEM_H diff --git a/app/widget/timelinewidget/view/timelineviewenditem.cpp b/app/widget/timelinewidget/view/timelineviewenditem.cpp index 1d66b84ae..767a2a008 100644 --- a/app/widget/timelinewidget/view/timelineviewenditem.cpp +++ b/app/widget/timelinewidget/view/timelineviewenditem.cpp @@ -1,5 +1,27 @@ +/*** + + 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 . + +***/ + #include "timelineviewenditem.h" +OLIVE_NAMESPACE_ENTER + TimelineViewEndItem::TimelineViewEndItem(QGraphicsItem *parent) : TimelineViewRect(parent), end_padding_(0) @@ -35,3 +57,5 @@ void TimelineViewEndItem::paint(QPainter *painter, const QStyleOptionGraphicsIte Q_UNUSED(option) Q_UNUSED(widget) } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/view/timelineviewenditem.h b/app/widget/timelinewidget/view/timelineviewenditem.h index 4161cd6a3..e3f758af4 100644 --- a/app/widget/timelinewidget/view/timelineviewenditem.h +++ b/app/widget/timelinewidget/view/timelineviewenditem.h @@ -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 . + +***/ + #ifndef TIMELINEVIEWENDITEM_H #define TIMELINEVIEWENDITEM_H #include "timelineviewrect.h" +OLIVE_NAMESPACE_ENTER + /** * @brief An item placed at the end point of the Timeline to ensure the correct scene size */ @@ -26,4 +48,6 @@ private: int end_padding_; }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEVIEWENDITEM_H diff --git a/app/widget/timelinewidget/view/timelineviewghostitem.cpp b/app/widget/timelinewidget/view/timelineviewghostitem.cpp index cf2465584..6a3fe415d 100644 --- a/app/widget/timelinewidget/view/timelineviewghostitem.cpp +++ b/app/widget/timelinewidget/view/timelineviewghostitem.cpp @@ -22,6 +22,8 @@ #include +OLIVE_NAMESPACE_ENTER + TimelineViewGhostItem::TimelineViewGhostItem(QGraphicsItem *parent) : TimelineViewRect(parent), track_adj_(0), @@ -211,3 +213,5 @@ void TimelineViewGhostItem::UpdateRect() setPos(TimeToScene(GetAdjustedIn()), 0); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/view/timelineviewghostitem.h b/app/widget/timelinewidget/view/timelineviewghostitem.h index ce641eca2..06f8018b7 100644 --- a/app/widget/timelinewidget/view/timelineviewghostitem.h +++ b/app/widget/timelinewidget/view/timelineviewghostitem.h @@ -28,6 +28,7 @@ #include "timelineviewblockitem.h" #include "timelineviewrect.h" +OLIVE_NAMESPACE_ENTER /** * @brief A graphical representation of changes the user is making before they apply it */ @@ -105,4 +106,6 @@ private: bool can_move_tracks_; }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEVIEWGHOSTITEM_H diff --git a/app/widget/timelinewidget/view/timelineviewmouseevent.cpp b/app/widget/timelinewidget/view/timelineviewmouseevent.cpp index dc5bb4c32..fa8baf8df 100644 --- a/app/widget/timelinewidget/view/timelineviewmouseevent.cpp +++ b/app/widget/timelinewidget/view/timelineviewmouseevent.cpp @@ -24,6 +24,8 @@ #include "widget/timelinewidget/timelinescaledobject.h" +OLIVE_NAMESPACE_ENTER + TimelineViewMouseEvent::TimelineViewMouseEvent(const qreal &scene_x, const double &scale_x, const rational &timebase, @@ -90,3 +92,5 @@ void TimelineViewMouseEvent::ignore() if (source_event_ != nullptr) source_event_->ignore(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/view/timelineviewmouseevent.h b/app/widget/timelinewidget/view/timelineviewmouseevent.h index b79235756..65264078c 100644 --- a/app/widget/timelinewidget/view/timelineviewmouseevent.h +++ b/app/widget/timelinewidget/view/timelineviewmouseevent.h @@ -27,6 +27,8 @@ #include "timeline/timelinecoordinate.h" +OLIVE_NAMESPACE_ENTER + class TimelineViewMouseEvent { public: @@ -77,4 +79,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEVIEWMOUSEEVENT_H diff --git a/app/widget/timelinewidget/view/timelineviewrect.cpp b/app/widget/timelinewidget/view/timelineviewrect.cpp index cef41ce09..1948b4f5e 100644 --- a/app/widget/timelinewidget/view/timelineviewrect.cpp +++ b/app/widget/timelinewidget/view/timelineviewrect.cpp @@ -20,6 +20,8 @@ #include "timelineviewrect.h" +OLIVE_NAMESPACE_ENTER + TimelineViewRect::TimelineViewRect(QGraphicsItem* parent) : QGraphicsRectItem(parent), y_(0), @@ -59,3 +61,5 @@ void TimelineViewRect::TimebaseChangedEvent(const rational &tb) UpdateRect(); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timelinewidget/view/timelineviewrect.h b/app/widget/timelinewidget/view/timelineviewrect.h index cb35e759d..bfd31d6ab 100644 --- a/app/widget/timelinewidget/view/timelineviewrect.h +++ b/app/widget/timelinewidget/view/timelineviewrect.h @@ -26,6 +26,8 @@ #include "timeline/timelinecoordinate.h" #include "../timelinescaledobject.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A base class for graphical representations of Block nodes */ @@ -53,4 +55,6 @@ protected: TrackReference track_; }; +OLIVE_NAMESPACE_EXIT + #endif // TIMELINEVIEWRECT_H diff --git a/app/widget/timeruler/seekablewidget.cpp b/app/widget/timeruler/seekablewidget.cpp index 624261979..436ddcd72 100644 --- a/app/widget/timeruler/seekablewidget.cpp +++ b/app/widget/timeruler/seekablewidget.cpp @@ -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 . + +***/ + #include "seekablewidget.h" #include @@ -6,6 +26,8 @@ #include "common/qtutils.h" +OLIVE_NAMESPACE_ENTER + SeekableWidget::SeekableWidget(QWidget* parent) : TimelineScaledWidget(parent), time_(0), @@ -199,3 +221,5 @@ void SeekableWidget::DrawPlayhead(QPainter *p, int x, int y) p->setRenderHint(QPainter::Antialiasing, false); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timeruler/seekablewidget.h b/app/widget/timeruler/seekablewidget.h index e96c23b53..fef9531a5 100644 --- a/app/widget/timeruler/seekablewidget.h +++ b/app/widget/timeruler/seekablewidget.h @@ -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 . + +***/ + #ifndef SEEKABLEWIDGET_H #define SEEKABLEWIDGET_H @@ -6,6 +26,8 @@ #include "widget/timelinewidget/view/timelineplayhead.h" #include "widget/timelinewidget/timelinescaledobject.h" +OLIVE_NAMESPACE_ENTER + class SeekableWidget : public TimelineScaledWidget { Q_OBJECT @@ -85,4 +107,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // SEEKABLEWIDGET_H diff --git a/app/widget/timeruler/timeruler.cpp b/app/widget/timeruler/timeruler.cpp index 25b504995..c116e1355 100644 --- a/app/widget/timeruler/timeruler.cpp +++ b/app/widget/timeruler/timeruler.cpp @@ -28,6 +28,8 @@ #include "config/config.h" #include "core.h" +OLIVE_NAMESPACE_ENTER + TimeRuler::TimeRuler(bool text_visible, bool cache_status_visible, QWidget* parent) : SeekableWidget(parent), text_visible_(text_visible), @@ -312,3 +314,5 @@ void TimeRuler::UpdateHeight() setFixedHeight(height); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/timeruler/timeruler.h b/app/widget/timeruler/timeruler.h index 83ada935e..a57e84a8c 100644 --- a/app/widget/timeruler/timeruler.h +++ b/app/widget/timeruler/timeruler.h @@ -27,6 +27,8 @@ #include "common/timerange.h" #include "seekablewidget.h" +OLIVE_NAMESPACE_ENTER + class TimeRuler : public SeekableWidget { Q_OBJECT @@ -70,4 +72,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // TIMERULER_H diff --git a/app/widget/toolbar/toolbar.cpp b/app/widget/toolbar/toolbar.cpp index 8030c27c8..c04a4661c 100644 --- a/app/widget/toolbar/toolbar.cpp +++ b/app/widget/toolbar/toolbar.cpp @@ -28,6 +28,8 @@ #include "widget/menu/menu.h" #include "ui/icons/icons.h" +OLIVE_NAMESPACE_ENTER + Toolbar::Toolbar(QWidget *parent) : QWidget(parent) { @@ -183,3 +185,5 @@ void Toolbar::AddMenuItemTriggered(QAction* a) { emit AddableObjectChanged(static_cast(a->data().toInt())); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/toolbar/toolbar.h b/app/widget/toolbar/toolbar.h index b39e3e67d..2f315e738 100644 --- a/app/widget/toolbar/toolbar.h +++ b/app/widget/toolbar/toolbar.h @@ -27,6 +27,8 @@ #include "widget/toolbar/toolbarbutton.h" #include "tool/tool.h" +OLIVE_NAMESPACE_ENTER + /** * @brief A widget containing buttons for all of Olive's application-wide tools. * @@ -215,4 +217,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif // TOOLBAR_H diff --git a/app/widget/toolbar/toolbarbutton.cpp b/app/widget/toolbar/toolbarbutton.cpp index ea70f8a6a..b1e5630db 100644 --- a/app/widget/toolbar/toolbarbutton.cpp +++ b/app/widget/toolbar/toolbarbutton.cpp @@ -20,6 +20,8 @@ #include "toolbarbutton.h" +OLIVE_NAMESPACE_ENTER + ToolbarButton::ToolbarButton(QWidget *parent, const Tool::Item &tool) : QPushButton(parent), tool_(tool) @@ -31,3 +33,5 @@ const Tool::Item &ToolbarButton::tool() { return tool_; } + +OLIVE_NAMESPACE_EXIT diff --git a/app/widget/toolbar/toolbarbutton.h b/app/widget/toolbar/toolbarbutton.h index a8cdd51f2..0c36136bb 100644 --- a/app/widget/toolbar/toolbarbutton.h +++ b/app/widget/toolbar/toolbarbutton.h @@ -25,6 +25,8 @@ #include "tool/tool.h" +OLIVE_NAMESPACE_ENTER + /** * @brief Simple derived class of QPushButton to contain an Tool ID. Used as the main widget through Toolbar. */ @@ -57,4 +59,6 @@ private: Tool::Item tool_; }; +OLIVE_NAMESPACE_EXIT + #endif // TOOLBARBUTTON_H diff --git a/app/widget/viewer/audiowaveformview.cpp b/app/widget/viewer/audiowaveformview.cpp index 042c3c21e..e47deeb5d 100644 --- a/app/widget/viewer/audiowaveformview.cpp +++ b/app/widget/viewer/audiowaveformview.cpp @@ -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 . + +***/ + #include "audiowaveformview.h" #include @@ -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 diff --git a/app/widget/viewer/audiowaveformview.h b/app/widget/viewer/audiowaveformview.h index d660382ad..0daebf879 100644 --- a/app/widget/viewer/audiowaveformview.h +++ b/app/widget/viewer/audiowaveformview.h @@ -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 . + +***/ + +#ifndef AUDIOWAVEFORMVIEW_H +#define AUDIOWAVEFORMVIEW_H #include @@ -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 diff --git a/app/widget/viewer/footageviewer.cpp b/app/widget/viewer/footageviewer.cpp index b1a8821d1..4cfd170bc 100644 --- a/app/widget/viewer/footageviewer.cpp +++ b/app/widget/viewer/footageviewer.cpp @@ -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 . + +***/ + #include "footageviewer.h" #include @@ -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 diff --git a/app/widget/viewer/footageviewer.h b/app/widget/viewer/footageviewer.h index 39358b841..fa76ae57c 100644 --- a/app/widget/viewer/footageviewer.h +++ b/app/widget/viewer/footageviewer.h @@ -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 . + +***/ + #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 diff --git a/app/widget/viewer/pixelsamplerwidget.cpp b/app/widget/viewer/pixelsamplerwidget.cpp index 2a630167d..532bf4786 100644 --- a/app/widget/viewer/pixelsamplerwidget.cpp +++ b/app/widget/viewer/pixelsamplerwidget.cpp @@ -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 . + +***/ + #include "pixelsamplerwidget.h" #include +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 diff --git a/app/widget/viewer/pixelsamplerwidget.h b/app/widget/viewer/pixelsamplerwidget.h index e3a037dc5..414826962 100644 --- a/app/widget/viewer/pixelsamplerwidget.h +++ b/app/widget/viewer/pixelsamplerwidget.h @@ -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 . + +***/ + #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 diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp index 7bc8ef8c0..21645206d 100644 --- a/app/widget/viewer/viewer.cpp +++ b/app/widget/viewer/viewer.cpp @@ -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 diff --git a/app/widget/viewer/viewer.h b/app/widget/viewer/viewer.h index 3bf9650f9..87c15a935 100644 --- a/app/widget/viewer/viewer.h +++ b/app/widget/viewer/viewer.h @@ -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 diff --git a/app/widget/viewer/viewerglwidget.cpp b/app/widget/viewer/viewerglwidget.cpp index e02aff9f9..ceabe95fb 100644 --- a/app/widget/viewer/viewerglwidget.cpp +++ b/app/widget/viewer/viewerglwidget.cpp @@ -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 diff --git a/app/widget/viewer/viewerglwidget.h b/app/widget/viewer/viewerglwidget.h index 20f405055..046e5c2df 100644 --- a/app/widget/viewer/viewerglwidget.h +++ b/app/widget/viewer/viewerglwidget.h @@ -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 diff --git a/app/widget/viewer/viewersizer.cpp b/app/widget/viewer/viewersizer.cpp index d9d906bc1..8f492d488 100644 --- a/app/widget/viewer/viewersizer.cpp +++ b/app/widget/viewer/viewersizer.cpp @@ -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 . + +***/ + #include "viewersizer.h" #include +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 diff --git a/app/widget/viewer/viewersizer.h b/app/widget/viewer/viewersizer.h index 9b383b01f..2363f28cf 100644 --- a/app/widget/viewer/viewersizer.h +++ b/app/widget/viewer/viewersizer.h @@ -23,6 +23,10 @@ #include +#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 diff --git a/app/widget/viewer/viewerwindow.cpp b/app/widget/viewer/viewerwindow.cpp index b66b9b088..f05961e4a 100644 --- a/app/widget/viewer/viewerwindow.cpp +++ b/app/widget/viewer/viewerwindow.cpp @@ -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 . + +***/ + #include "viewerwindow.h" #include #include +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 diff --git a/app/widget/viewer/viewerwindow.h b/app/widget/viewer/viewerwindow.h index 8ad17229b..19c1676a4 100644 --- a/app/widget/viewer/viewerwindow.h +++ b/app/widget/viewer/viewerwindow.h @@ -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 . + +***/ + #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 diff --git a/app/window/mainwindow/mainmenu.cpp b/app/window/mainwindow/mainmenu.cpp index 955c378c4..32c2bc6b7 100644 --- a/app/window/mainwindow/mainmenu.cpp +++ b/app/window/mainwindow/mainmenu.cpp @@ -33,6 +33,8 @@ #include "widget/menu/menushared.h" #include "mainwindow.h" +OLIVE_NAMESPACE_ENTER + MainMenu::MainMenu(QMainWindow *parent) : QMenuBar(parent) { @@ -621,3 +623,5 @@ void MainMenu::Retranslate() help_debug_log_item_->setText(tr("Debug Log")); help_about_item_->setText(tr("&About...")); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/window/mainwindow/mainmenu.h b/app/window/mainwindow/mainmenu.h index bc70bed3c..3d072353a 100644 --- a/app/window/mainwindow/mainmenu.h +++ b/app/window/mainwindow/mainmenu.h @@ -27,6 +27,8 @@ #include "dialog/actionsearch/actionsearch.h" #include "widget/menu/menu.h" +OLIVE_NAMESPACE_ENTER + /** * @brief Olive's main menubar attached to its main window. * @@ -243,4 +245,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // MAINMENU_H diff --git a/app/window/mainwindow/mainstatusbar.cpp b/app/window/mainwindow/mainstatusbar.cpp index 54c6453cd..36a96d47b 100644 --- a/app/window/mainwindow/mainstatusbar.cpp +++ b/app/window/mainwindow/mainstatusbar.cpp @@ -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 . + +***/ + #include "mainstatusbar.h" #include +OLIVE_NAMESPACE_ENTER + MainStatusBar::MainStatusBar(QWidget *parent) : QStatusBar(parent), manager_(nullptr) @@ -53,3 +75,5 @@ void MainStatusBar::UpdateStatus() connect(t, &Task::ProgressChanged, bar_, &QProgressBar::setValue); } } + +OLIVE_NAMESPACE_EXIT diff --git a/app/window/mainwindow/mainstatusbar.h b/app/window/mainwindow/mainstatusbar.h index cc22a8dae..1a704860e 100644 --- a/app/window/mainwindow/mainstatusbar.h +++ b/app/window/mainwindow/mainstatusbar.h @@ -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 . + +***/ + #ifndef MAINSTATUSBAR_H #define MAINSTATUSBAR_H @@ -6,6 +26,8 @@ #include "task/taskmanager.h" +OLIVE_NAMESPACE_ENTER + /** * @brief Shows abbreviated information from a TaskManager object */ @@ -26,4 +48,6 @@ private: }; +OLIVE_NAMESPACE_EXIT + #endif // MAINSTATUSBAR_H diff --git a/app/window/mainwindow/mainwindow.cpp b/app/window/mainwindow/mainwindow.cpp index 26074e0b5..c37da80dd 100644 --- a/app/window/mainwindow/mainwindow.cpp +++ b/app/window/mainwindow/mainwindow.cpp @@ -28,6 +28,8 @@ #include "mainmenu.h" #include "mainstatusbar.h" +OLIVE_NAMESPACE_ENTER + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) { @@ -323,3 +325,5 @@ void MainWindow::SetDefaultLayout() {height()/2, height()/2}, Qt::Vertical); } + +OLIVE_NAMESPACE_EXIT diff --git a/app/window/mainwindow/mainwindow.h b/app/window/mainwindow/mainwindow.h index f57550db8..d9365978f 100644 --- a/app/window/mainwindow/mainwindow.h +++ b/app/window/mainwindow/mainwindow.h @@ -37,6 +37,8 @@ #include "panel/pixelsampler/pixelsamplerpanel.h" #include "project/project.h" +OLIVE_NAMESPACE_ENTER + /** * @brief Olive's main window responsible for docking widgets and the main menu bar. */ @@ -86,4 +88,6 @@ private slots: }; +OLIVE_NAMESPACE_EXIT + #endif