use hardcoded namespace

The macro defined namespaces confused the hell out of lupdate and more or less broke translations permanently. Looks like the only way we can do it is to have a hardcoded namespace, which goes against my instinct, but honestly how likely is it that we'll change the namespace anyway (I guess forks might want to do it, but that's their problem ;) )
This commit is contained in:
itsmattkc
2020-11-17 20:24:42 +11:00
parent d241090a9f
commit 75d4cd899b
626 changed files with 1971 additions and 1972 deletions
+2 -2
View File
@@ -24,7 +24,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
AudioManager* AudioManager::instance_ = nullptr;
@@ -268,4 +268,4 @@ void AudioManager::InputDevicesRefreshed()
emit InputListReady();
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -32,7 +32,7 @@
#include "render/audioparams.h"
#include "render/audioplaybackcache.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief Audio input and output management class
@@ -124,6 +124,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // AUDIOMANAGER_H
+2 -2
View File
@@ -24,7 +24,7 @@
#include "config/config.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
const int AudioVisualWaveform::kSumSampleRate = 200;
@@ -330,4 +330,4 @@ void AudioVisualWaveform::ExpandMinMax(AudioVisualWaveform::SamplePerChannel &su
}
}
OLIVE_NAMESPACE_EXIT
}
+3 -3
View File
@@ -27,7 +27,7 @@
#include "codec/samplebuffer.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief A buffer of data used to store a visual representation of audio
@@ -108,8 +108,8 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
Q_DECLARE_METATYPE(OLIVE_NAMESPACE::AudioVisualWaveform)
Q_DECLARE_METATYPE(olive::AudioVisualWaveform)
#endif // SUMSAMPLES_H
+2 -2
View File
@@ -22,7 +22,7 @@
#include "audiomanager.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
AudioOutputDeviceProxy::AudioOutputDeviceProxy(QObject *parent) :
QIODevice(parent),
@@ -137,4 +137,4 @@ qint64 AudioOutputDeviceProxy::ReverseAwareRead(char *data, qint64 maxlen)
return read_count;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -26,7 +26,7 @@
#include "common/define.h"
#include "tempoprocessor.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
/**
* @brief QIODevice wrapper that can adjust speed/reverse an audio file
@@ -61,6 +61,6 @@ private:
};
OLIVE_NAMESPACE_EXIT
}
#endif // AUDIOOUTPUTDEVICEPROXY_H
+2 -2
View File
@@ -25,7 +25,7 @@
#include <QFile>
OLIVE_NAMESPACE_ENTER
namespace olive {
AudioOutputManager::AudioOutputManager(QObject *parent) :
QObject(parent),
@@ -151,4 +151,4 @@ void AudioOutputManager::OutputStateChanged(QAudio::State state)
qDebug() << state << output_->error();
}
OLIVE_NAMESPACE_EXIT
}
+3 -3
View File
@@ -30,7 +30,7 @@
#include "outputdeviceproxy.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class AudioOutputManager : public QObject
{
@@ -59,7 +59,7 @@ public slots:
void ResetToPushMode();
// Queued
void SetParameters(OLIVE_NAMESPACE::AudioParams params);
void SetParameters(olive::AudioParams params);
// Queued
void Close();
@@ -84,6 +84,6 @@ private slots:
};
OLIVE_NAMESPACE_EXIT
}
#endif // AUDIOHYBRIDDEVICE_H
+2 -2
View File
@@ -30,7 +30,7 @@ extern "C" {
#include "common/ffmpegutils.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
TempoProcessor::TempoProcessor() :
filter_graph_(nullptr),
@@ -274,4 +274,4 @@ AVFilterContext *TempoProcessor::CreateTempoFilter(AVFilterGraph* graph, AVFilte
return nullptr;
}
OLIVE_NAMESPACE_EXIT
}
+2 -2
View File
@@ -35,7 +35,7 @@ extern "C" {
#include "render/audioparams.h"
OLIVE_NAMESPACE_ENTER
namespace olive {
class TempoProcessor
{
@@ -78,6 +78,6 @@ private:
bool flushed_;
};
OLIVE_NAMESPACE_EXIT
}
#endif // TEMPOPROCESSOR_H