Modernize namespaces

Author: alan-george-lk

bridge/include/livekit_bridge/rpc_constants.h

@@ -31,15 +31,7 @@
 #define LIVEKIT_BRIDGE_API
 #endif
 
-namespace livekit_bridge {
-namespace rpc {
-
-/// Built-in RPC method name used by remote track control.
-/// Allows remote participants to mute or unmute tracks
-/// published by this bridge. Must be called after connect().
-/// Audio/video tracks support mute and unmute. Data tracks
-/// only support mute and unmute.
-namespace track_control {
+namespace livekit_bridge::rpc::track_control {
 
 enum class Action { kActionMute, kActionUnmute };
 
@@ -60,6 +52,4 @@ LIVEKIT_BRIDGE_API extern const char *const kResponseOk;
 LIVEKIT_BRIDGE_API std::string formatPayload(const char *action,
                                              const std::string &track_name);
 
-} // namespace track_control
-} // namespace rpc
-} // namespace livekit_bridge
+} // namespace livekit_bridge::rpc::track_control

bridge/src/rpc_constants.cpp

@@ -16,9 +16,7 @@
 
 #include "livekit_bridge/rpc_constants.h"
 
-namespace livekit_bridge {
-namespace rpc {
-namespace track_control {
+namespace livekit_bridge::rpc::track_control {
 
 const char *const kMethod = "lk.bridge.track-control";
 const char *const kActionMute = "mute";
@@ -36,6 +34,4 @@ std::string formatPayload(const char *action, const std::string &track_name) {
   return payload;
 }
 
-} // namespace track_control
-} // namespace rpc
-} // namespace livekit_bridge
+} // namespace livekit_bridge::rpc::track_control

bridge/tests/integration/test_bridge_rpc_roundtrip.cpp

@@ -17,8 +17,7 @@
 #include "../common/bridge_test_common.h"
 #include <livekit/rpc_error.h>
 
-namespace livekit_bridge {
-namespace test {
+namespace livekit_bridge::test {
 
 class BridgeRpcRoundtripTest : public BridgeTestBase {};
 
@@ -267,5 +266,4 @@ TEST_F(BridgeRemoteTrackControlTest, RemoteMuteNonexistentTrack) {
   }
 }
 
-} // namespace test
-} // namespace livekit_bridge
+} // namespace livekit_bridge::test

bridge/tests/test_bridge_audio_track.cpp

@@ -24,8 +24,7 @@
 #include <memory>
 #include <vector>
 
-namespace livekit_bridge {
-namespace test {
+namespace livekit_bridge::test {
 
 class BridgeAudioTrackTest : public ::testing::Test {
 protected:
@@ -114,5 +113,4 @@ TEST_F(BridgeAudioTrackTest, UnmuteOnReleasedTrackDoesNotCrash) {
       << "unmute() on a released track should be a no-op";
 }
 
-} // namespace test
-} // namespace livekit_bridge
+} // namespace livekit_bridge::test

bridge/tests/test_bridge_video_track.cpp

@@ -24,8 +24,7 @@
 #include <memory>
 #include <vector>
 
-namespace livekit_bridge {
-namespace test {
+namespace livekit_bridge::test {
 
 class BridgeVideoTrackTest : public ::testing::Test {
 protected:
@@ -110,5 +109,4 @@ TEST_F(BridgeVideoTrackTest, UnmuteOnReleasedTrackDoesNotCrash) {
       << "unmute() on a released track should be a no-op";
 }
 
-} // namespace test
-} // namespace livekit_bridge
+} // namespace livekit_bridge::test

bridge/tests/test_livekit_bridge.cpp

@@ -24,8 +24,7 @@
 
 #include <stdexcept>
 
-namespace livekit_bridge {
-namespace test {
+namespace livekit_bridge::test {
 
 class LiveKitBridgeTest : public ::testing::Test {
 protected:
@@ -134,5 +133,4 @@ TEST_F(LiveKitBridgeTest, ClearNonExistentCallbackIsNoOp) {
   }) << "Clearing a callback that was never registered should be a no-op";
 }
 
-} // namespace test
-} // namespace livekit_bridge
+} // namespace livekit_bridge::test

bridge/tests/test_rpc_controller.cpp

@@ -28,8 +28,7 @@
 #include <string>
 #include <vector>
 
-namespace livekit_bridge {
-namespace test {
+namespace livekit_bridge::test {
 
 // Records (action, track_name) pairs passed to the TrackActionFn callback.
 struct TrackActionRecord {
@@ -269,5 +268,4 @@ TEST_F(RpcControllerTest, FormatPayloadRoundTrip) {
   EXPECT_EQ(recorded_actions_[0].track_name, track_name);
 }
 
-} // namespace test
-} // namespace livekit_bridge
+} // namespace livekit_bridge::test

src/lk_log.h

@@ -20,8 +20,7 @@
 #include <memory>
 #include <spdlog/spdlog.h>
 
-namespace livekit {
-namespace detail {
+namespace livekit::detail {
 
 /// Returns the shared "livekit" logger instance.
 /// The logger is created lazily on first access and lives until
@@ -31,8 +30,7 @@ std::shared_ptr<spdlog::logger> getLogger();
 /// Tears down the spdlog logger. Called by livekit::shutdown().
 void shutdownLogger();
 
-} // namespace detail
-} // namespace livekit
+} // namespace livekit::detail
 
 // Convenience macros — two-tier filtering:
 //

src/tests/common/audio_utils.h

@@ -24,8 +24,7 @@
 #include <memory>
 #include <thread>
 
-namespace livekit {
-namespace test {
+namespace livekit::test {
 
 // Default audio parameters for tests
 constexpr int kDefaultAudioSampleRate = 48000;
@@ -116,5 +115,4 @@ inline void fillToneFrame(AudioFrame &frame, double freq_hz, int sample_rate,
   }
 }
 
-} // namespace test
-} // namespace livekit
+} // namespace livekit::test

src/tests/common/test_common.h

@@ -34,8 +34,7 @@
 #include <thread>
 #include <vector>
 
-namespace livekit {
-namespace test {
+namespace livekit::test {
 
 using namespace std::chrono_literals;
 
@@ -435,5 +434,4 @@ class LiveKitTestBase : public ::testing::Test {
   TestConfig config_;
 };
 
-} // namespace test
-} // namespace livekit
+} // namespace livekit::test