dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use anonymous namespace for constants

Browse Source
This commit is contained in:
Jonas Kvinge
2024-08-07 00:52:58 +02:00
parent c69777ca39
commit 819463a865
67 changed files with 186 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/engine/chromaprinter.cpp
View File

@@ -43,10 +43,12 @@
using u_int32_t = unsigned int;
#endif
static const int kDecodeRate = 11025;
static const int kDecodeChannels = 1;
static const int kPlayLengthSecs = 30;
static const int kTimeoutSecs = 10;
namespace {
constexpr int kDecodeRate = 11025;
constexpr int kDecodeChannels = 1;
constexpr int kPlayLengthSecs = 30;
constexpr int kTimeoutSecs = 10;
} // namespace
Chromaprinter::Chromaprinter(const QString &filename)
: filename_(filename),

4
src/engine/ebur128analysis.cpp
View File

@@ -47,10 +47,10 @@
using std::unique_ptr;
static const int kTimeoutSecs = 60;
namespace {
constexpr int kTimeoutSecs = 60;
struct ebur128_state_deleter {
void operator()(ebur128_state *p) const { ebur128_destroy(&p); };
};

33
src/engine/gstengine.cpp
View File

@@ -64,21 +64,24 @@ using std::make_shared;
const char *GstEngine::kAutoSink = "autoaudiosink";
const char *GstEngine::kALSASink = "alsasink";
const char *GstEngine::kOpenALSASink = "openalsink";
const char *GstEngine::kOSSSink = "osssink";
const char *GstEngine::kOSS4Sink = "oss4sink";
const char *GstEngine::kJackAudioSink = "jackaudiosink";
const char *GstEngine::kPulseSink = "pulsesink";
const char *GstEngine::kA2DPSink = "a2dpsink";
const char *GstEngine::kAVDTPSink = "avdtpsink";
const char *GstEngine::InterAudiosink = "interaudiosink";
const char *GstEngine::kDirectSoundSink = "directsoundsink";
const char *GstEngine::kOSXAudioSink = "osxaudiosink";
const char *GstEngine::kWASAPISink = "wasapisink";
const int GstEngine::kDiscoveryTimeoutS = 10;
const qint64 GstEngine::kTimerIntervalNanosec = 1000 * kNsecPerMsec; // 1s
const qint64 GstEngine::kPreloadGapNanosec = 8000 * kNsecPerMsec; // 8s
const qint64 GstEngine::kSeekDelayNanosec = 100 * kNsecPerMsec; // 100msec
namespace {
constexpr char kOpenALSASink[] = "openalsink";
constexpr char kOSSSink[] = "osssink";
constexpr char kOSS4Sink[] = "oss4sink";
constexpr char kJackAudioSink[] = "jackaudiosink";
constexpr char kPulseSink[] = "pulsesink";
constexpr char kA2DPSink[] = "a2dpsink";
constexpr char kAVDTPSink[] = "avdtpsink";
constexpr char InterAudiosink[] = "interaudiosink";
constexpr char kDirectSoundSink[] = "directsoundsink";
constexpr char kOSXAudioSink[] = "osxaudiosink";
constexpr char kWASAPISink[] = "wasapisink";
constexpr int kDiscoveryTimeoutS = 10;
constexpr qint64 kTimerIntervalNanosec = 1000 * kNsecPerMsec; // 1s
constexpr qint64 kPreloadGapNanosec = 8000 * kNsecPerMsec; // 8s
constexpr qint64 kSeekDelayNanosec = 100 * kNsecPerMsec; // 100msec
} // namespace
GstEngine::GstEngine(SharedPtr<TaskManager> task_manager, QObject *parent)
: EngineBase(parent),

18
src/engine/gstengine.h
View File

@@ -56,6 +56,7 @@ class GstEngine : public EngineBase, public GstBufferConsumer {
~GstEngine() override;
static const char *kAutoSink;
static const char *kALSASink;
Type type() const override { return Type::GStreamer; }
bool Init() override;
@@ -142,23 +143,6 @@ class GstEngine : public EngineBase, public GstBufferConsumer {
static QString GSTdiscovererErrorMessage(GstDiscovererResult result);
private:
static const char *kALSASink;
static const char *kOpenALSASink;
static const char *kOSSSink;
static const char *kOSS4Sink;
static const char *kJackAudioSink;
static const char *kPulseSink;
static const char *kA2DPSink;
static const char *kAVDTPSink;
static const char *InterAudiosink;
static const char *kDirectSoundSink;
static const char *kOSXAudioSink;
static const char *kWASAPISink;
static const int kDiscoveryTimeoutS;
static const qint64 kTimerIntervalNanosec;
static const qint64 kPreloadGapNanosec;
static const qint64 kSeekDelayNanosec;
SharedPtr<TaskManager> task_manager_;
GstStartup *gst_startup_;
GstDiscoverer *discoverer_;

12
src/engine/gstenginepipeline.cpp
View File

@@ -62,11 +62,15 @@
#include "gstenginepipeline.h"
#include "gstbufferconsumer.h"
constexpr int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000;
constexpr int GstEnginePipeline::kFaderFudgeMsec = 2000;
namespace {
constexpr int GstEnginePipeline::kEqBandCount = 10;
constexpr int GstEnginePipeline::kEqBandFrequencies[] = { 60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000 };
constexpr int kGstStateTimeoutNanosecs = 10000000;
constexpr int kFaderFudgeMsec = 2000;
constexpr int kEqBandCount = 10;
constexpr int kEqBandFrequencies[] = { 60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000 };
} // namespace
int GstEnginePipeline::sId = 1;

5
src/engine/gstenginepipeline.h
View File

@@ -193,11 +193,6 @@ class GstEnginePipeline : public QObject {
void FaderTimelineFinished();
private:
static const int kGstStateTimeoutNanosecs;
static const int kFaderFudgeMsec;
static const int kEqBandCount;
static const int kEqBandFrequencies[];
// Using == to compare two pipelines is a bad idea, because new ones often get created in the same address as old ones. This ID will be unique for each pipeline.
// Threading warning: access to the static ID field isn't protected by a mutex because all pipeline creation is currently done in the main thread.
static int sId;