move session_manager inside include/livekit/ & clang

stephen-derosa · stephen-derosa · commit 8a60a999f721 · 2026-03-10T15:40:24.000-06:00
diff --git a/examples/human_robot/human.cpp b/examples/human_robot/human.cpp
@@ -44,11 +44,11 @@
  */
 
 #include "livekit/audio_frame.h"
+#include "livekit/session_manager/session_manager.h"
 #include "livekit/track.h"
 #include "livekit/video_frame.h"
 #include "lk_log.h"
 #include "sdl_media.h"
-#include "session_manager/session_manager.h"
 
 #include <SDL3/SDL.h>
 
diff --git a/examples/human_robot/robot.cpp b/examples/human_robot/robot.cpp
@@ -34,11 +34,11 @@
  */
 
 #include "livekit/audio_frame.h"
+#include "livekit/session_manager/session_manager.h"
 #include "livekit/track.h"
 #include "livekit/video_frame.h"
 #include "lk_log.h"
 #include "sdl_media.h"
-#include "session_manager/session_manager.h"
 
 #include <SDL3/SDL.h>
 
diff --git a/examples/mute_unmute/caller.cpp b/examples/mute_unmute/caller.cpp
@@ -33,10 +33,10 @@
 
 #include "livekit/audio_frame.h"
 #include "livekit/rpc_error.h"
+#include "livekit/session_manager/session_manager.h"
 #include "livekit/track.h"
 #include "livekit/video_frame.h"
 #include "sdl_media.h"
-#include "session_manager/session_manager.h"
 
 #include <SDL3/SDL.h>
 
diff --git a/examples/mute_unmute/receiver.cpp b/examples/mute_unmute/receiver.cpp
@@ -33,9 +33,9 @@
  *       --join --room my-room --identity receiver --valid-for 24h
  */
 
+#include "livekit/session_manager/session_manager.h"
 #include "livekit/track.h"
 #include "sdl_media.h"
-#include "session_manager/session_manager.h"
 
 #include <SDL3/SDL.h>
 
diff --git a/examples/rpc/custom_caller.cpp b/examples/rpc/custom_caller.cpp
@@ -31,7 +31,7 @@
  */
 
 #include "livekit/rpc_error.h"
-#include "session_manager/session_manager.h"
+#include "livekit/session_manager/session_manager.h"
 
 #include <atomic>
 #include <chrono>
diff --git a/examples/rpc/custom_receiver.cpp b/examples/rpc/custom_receiver.cpp
@@ -28,7 +28,7 @@
  *   lk token create --join --room <room> --identity receiver --valid-for 24h
  */
 
-#include "session_manager/session_manager.h"
+#include "livekit/session_manager/session_manager.h"
 
 #include <atomic>
 #include <chrono>
diff --git a/examples/session_manager_base_sdk/video_producer.cpp b/examples/session_manager_base_sdk/video_producer.cpp
@@ -31,9 +31,9 @@
  */
 
 #include "livekit/livekit.h"
+#include "livekit/session_manager/session_manager.h"
 #include "lk_log.h"
 #include "sdl_media.h"
-#include "session_manager/session_manager.h"
 
 #include <SDL3/SDL.h>
 
diff --git a/examples/session_manager_base_sdk/video_viewer.cpp b/examples/session_manager_base_sdk/video_viewer.cpp
@@ -30,8 +30,8 @@
  */
 
 #include "livekit/livekit.h"
+#include "livekit/session_manager/session_manager.h"
 #include "lk_log.h"
-#include "session_manager/session_manager.h"
 #include "sdl_media_manager.h"
 
 #include <SDL3/SDL.h>
diff --git a/include/livekit/session_manager/managed_audio_track.h b/include/livekit/session_manager/managed_audio_track.h
diff --git a/include/livekit/session_manager/managed_video_track.h b/include/livekit/session_manager/managed_video_track.h
diff --git a/include/livekit/session_manager/rpc_constants.h b/include/livekit/session_manager/rpc_constants.h
diff --git a/include/livekit/session_manager/session_manager.h b/include/livekit/session_manager/session_manager.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include "session_manager/managed_audio_track.h"
-#include "session_manager/managed_video_track.h"
-#include "session_manager/rpc_constants.h"
+#include "livekit/session_manager/managed_audio_track.h"
+#include "livekit/session_manager/managed_video_track.h"
+#include "livekit/session_manager/rpc_constants.h"
 
 #include "livekit/local_participant.h"
 #include "livekit/room.h"
diff --git a/src/session_manager/README.md b/src/session_manager/README.md
@@ -6,7 +6,7 @@ The SessionManager abstracts away room lifecycle management, track creation, pub
 ## Usage Overview
 
 ```cpp
-#include "session_manager/session_manager.h"
+#include "livekit/session_manager/session_manager.h"
 #include "livekit/audio_frame.h"
 #include "livekit/video_frame.h"
 #include "livekit/track.h"
diff --git a/src/session_manager/managed_audio_track.cpp b/src/session_manager/managed_audio_track.cpp
@@ -17,7 +17,7 @@
 /// @file managed_audio_track.cpp
 /// @brief Implementation of ManagedAudioTrack.
 
-#include "session_manager/managed_audio_track.h"
+#include "livekit/session_manager/managed_audio_track.h"
 
 #include "livekit/audio_frame.h"
 #include "livekit/audio_source.h"
diff --git a/src/session_manager/managed_video_track.cpp b/src/session_manager/managed_video_track.cpp
@@ -17,7 +17,7 @@
 /// @file managed_video_track.cpp
 /// @brief Implementation of ManagedVideoTrack.
 
-#include "session_manager/managed_video_track.h"
+#include "livekit/session_manager/managed_video_track.h"
 
 #include "livekit/local_participant.h"
 #include "livekit/local_track_publication.h"
diff --git a/src/session_manager/rpc_controller.cpp b/src/session_manager/rpc_controller.cpp
@@ -18,7 +18,7 @@
 /// @brief Implementation of RpcController.
 
 #include "rpc_controller.h"
-#include "session_manager/rpc_constants.h"
+#include "livekit/session_manager/rpc_constants.h"
 
 #include "livekit/local_participant.h"
 #include "livekit/rpc_error.h"
diff --git a/src/session_manager/rpc_controller.h b/src/session_manager/rpc_controller.h
@@ -21,7 +21,7 @@
 #pragma once
 
 #include "livekit/local_participant.h"
-#include "session_manager/rpc_constants.h"
+#include "livekit/session_manager/rpc_constants.h"
 
 #include <cassert>
 #include <functional>
diff --git a/src/session_manager/session_manager.cpp b/src/session_manager/session_manager.cpp
@@ -17,9 +17,9 @@
 /// @file session_manager.cpp
 /// @brief Implementation of the SessionManager high-level API.
 
-#include "session_manager/session_manager.h"
+#include "livekit/session_manager/session_manager.h"
+#include "livekit/session_manager/rpc_constants.h"
 #include "rpc_controller.h"
-#include "session_manager/rpc_constants.h"
 #include "session_manager_room_delegate.h"
 
 #include "livekit/audio_frame.h"
diff --git a/src/session_manager/session_manager_room_delegate.cpp b/src/session_manager/session_manager_room_delegate.cpp
@@ -21,8 +21,8 @@
 
 #include "livekit/remote_participant.h"
 #include "livekit/remote_track_publication.h"
+#include "livekit/session_manager/session_manager.h"
 #include "livekit/track.h"
-#include "session_manager/session_manager.h"
 
 namespace session_manager {
 
diff --git a/src/session_manager/session_manager_room_delegate.h b/src/session_manager/session_manager_room_delegate.h
@@ -33,7 +33,8 @@ class SessionManager;
  */
 class SessionManagerRoomDelegate : public livekit::RoomDelegate {
 public:
-  explicit SessionManagerRoomDelegate(SessionManager &manager) : manager_(manager) {}
+  explicit SessionManagerRoomDelegate(SessionManager &manager)
+      : manager_(manager) {}
 
   /// Forwards a track-subscribed event to SessionManager::onTrackSubscribed().
   void onTrackSubscribed(livekit::Room &room,
diff --git a/src/tests/session_manager/test_callback_key.cpp b/src/tests/session_manager/test_callback_key.cpp
@@ -18,7 +18,7 @@
 /// @brief Unit tests for SessionManager::CallbackKey hash and equality.
 
 #include <gtest/gtest.h>
-#include <session_manager/session_manager.h>
+#include <livekit/session_manager/session_manager.h>
 
 #include <livekit/track.h>
 
diff --git a/src/tests/session_manager/test_managed_audio_track.cpp b/src/tests/session_manager/test_managed_audio_track.cpp
@@ -18,7 +18,7 @@
 /// @brief Unit tests for ManagedAudioTrack.
 
 #include <gtest/gtest.h>
-#include <session_manager/managed_audio_track.h>
+#include <livekit/session_manager/managed_audio_track.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/tests/session_manager/test_managed_video_track.cpp b/src/tests/session_manager/test_managed_video_track.cpp
@@ -18,7 +18,7 @@
 /// @brief Unit tests for ManagedVideoTrack.
 
 #include <gtest/gtest.h>
-#include <session_manager/managed_video_track.h>
+#include <livekit/session_manager/managed_video_track.h>
 
 #include <cstdint>
 #include <memory>
diff --git a/src/tests/session_manager/test_rpc_controller.cpp b/src/tests/session_manager/test_rpc_controller.cpp
@@ -19,8 +19,8 @@
 
 #include <gtest/gtest.h>
 
+#include "livekit/session_manager/rpc_constants.h"
 #include "rpc_controller.h"
-#include "session_manager/rpc_constants.h"
 
 #include "livekit/local_participant.h"
 #include "livekit/rpc_error.h"
diff --git a/src/tests/session_manager/test_session_manager.cpp b/src/tests/session_manager/test_session_manager.cpp
@@ -18,7 +18,7 @@
 /// @brief Unit tests for SessionManager.
 
 #include <gtest/gtest.h>
-#include <session_manager/session_manager.h>
+#include <livekit/session_manager/session_manager.h>
 
 #include <livekit/track.h>
 
