Rename nageru/db.h to decibel.h, since it is confusing to also have futatabi/db.h...

diff --git a/nageru/audio_mixer.cpp b/nageru/audio_mixer.cpp
index 7bb1ddd8e4cb9b1a3d02deeca9c401e115660373..f63fe242460fcfbc1fa51f3b5f23809d627e68ab 100644 (file)
--- a/nageru/audio_mixer.cpp
+++ b/nageru/audio_mixer.cpp
@@ -18,7 +18,7 @@
 #include <limits>
 #include <utility>
 
-#include "db.h"
+#include "decibel.h"
 #include "flags.h"
 #include "shared/metrics.h"
 #include "state.pb.h"

diff --git a/nageru/audio_mixer.h b/nageru/audio_mixer.h
index 9793646c9bac3493651e39643a610c7df75c5d0f..a7ab9a5a0d60378e632fbd34a7105865c05b0ef0 100644 (file)
--- a/nageru/audio_mixer.h
+++ b/nageru/audio_mixer.h
@@ -23,7 +23,7 @@
 
 #include "alsa_pool.h"
 #include "correlation_measurer.h"
-#include "db.h"
+#include "decibel.h"
 #include "defs.h"
 #include "ebu_r128_proc.h"
 #include "filter.h"

diff --git a/nageru/benchmark_audio_mixer.cpp b/nageru/benchmark_audio_mixer.cpp
index f140a512c299f848187fdab4e594266aab9f3e1b..7ec3450dc60d942d617cbfeff0210f58a9b4ddc5 100644 (file)
--- a/nageru/benchmark_audio_mixer.cpp
+++ b/nageru/benchmark_audio_mixer.cpp
@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "audio_mixer.h"
-#include "db.h"
+#include "decibel.h"
 #include "defs.h"
 #include "input_mapping.h"
 #include "resampling_queue.h"

diff --git a/nageru/db.h b/nageru/decibel.h
similarity index 74%
rename from nageru/db.h
rename to nageru/decibel.h
index 53261abd058bd0b80f8881a182a4f93d2e3474d0..acbb5d622c7e109bc3b40fb13b49b1dcf5f94b4c 100644 (file)
--- a/nageru/db.h
+++ b/nageru/decibel.h
@@ -1,5 +1,5 @@
-#ifndef _DB_H
-#define _DB_H 1
+#ifndef _DECIBEL_H
+#define _DECIBEL_H 1
 
 // Utility routines for working with decibels.
 
@@ -8,4 +8,4 @@
 static inline double from_db(double db) { return pow(10.0, db / 20.0); }
 static inline double to_db(double val) { return 20.0 * log10(val); }
 
-#endif  // !defined(_DB_H)
+#endif  // !defined(_DECIBEL_H)