include lk_log.h inside livekit.h, rpc_constants.cpp/h

Author: stephen-derosa

.gitignore

@@ -29,3 +29,4 @@ lib/
 *.dll
 *.exe
 livekit.log
+web/

CMakeLists.txt

@@ -12,7 +12,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 option(LIVEKIT_BUILD_EXAMPLES "Build LiveKit examples" OFF)
 option(LIVEKIT_BUILD_TESTS "Build LiveKit tests" OFF)
-option(LIVEKIT_BUILD_BRIDGE "Build LiveKit Bridge (simplified high-level API)" OFF)
 
 # vcpkg is only used on Windows; Linux/macOS use system package managers
 if(WIN32)
@@ -372,10 +371,11 @@ target_include_directories(livekit
 )
 
 target_link_libraries(livekit
+  PUBLIC
+    $<BUILD_INTERFACE:spdlog::spdlog>
   PRIVATE
     livekit_ffi
     ${LIVEKIT_PROTOBUF_TARGET}
-    spdlog::spdlog
 )
 
 target_compile_definitions(livekit

bridge/CMakeLists.txt

@@ -11,6 +11,7 @@ add_library(livekit_bridge SHARED
   src/bridge_video_track.cpp
   src/bridge_room_delegate.cpp
   src/bridge_room_delegate.h
+  src/rpc_constants.cpp
   src/rpc_controller.cpp
   src/rpc_controller.h
 )

bridge/include/livekit_bridge/livekit_bridge.h

@@ -23,6 +23,7 @@
 #include "livekit_bridge/bridge_video_track.h"
 #include "livekit_bridge/rpc_constants.h"
 
+#include "livekit/lk_log.h"
 #include "livekit/local_participant.h"
 #include "livekit/room.h"
 #include "livekit/rpc_error.h"

bridge/include/livekit_bridge/rpc_constants.h

@@ -34,29 +34,20 @@ namespace track_control {
 enum class Action { kActionMute, kActionUnmute };
 
 /// RPC method name registered by the bridge for remote track control.
-constexpr const char *kMethod = "lk.bridge.track-control";
+extern const char *const kMethod;
 
 /// Payload action strings.
-constexpr const char *kActionMute = "mute";
-constexpr const char *kActionUnmute = "unmute";
+extern const char *const kActionMute;
+extern const char *const kActionUnmute;
 
 /// Delimiter between action and track name in the payload (e.g. "mute:cam").
-constexpr char kDelimiter = ':';
+extern const char kDelimiter;
 
 /// Response payload returned on success.
-constexpr const char *kResponseOk = "ok";
+extern const char *const kResponseOk;
 
 /// Build a track-control RPC payload: "<action>:<track_name>".
-inline std::string formatPayload(const char *action,
-                                 const std::string &track_name) {
-  std::string payload;
-  payload.reserve(std::char_traits<char>::length(action) + 1 +
-                  track_name.size());
-  payload += action;
-  payload += kDelimiter;
-  payload += track_name;
-  return payload;
-}
+std::string formatPayload(const char *action, const std::string &track_name);
 
 } // namespace track_control
 } // namespace rpc

bridge/src/bridge_audio_track.cpp

@@ -27,7 +27,7 @@
 
 #include <stdexcept>
 
-#include "lk_log.h"
+#include "livekit/lk_log.h"
 
 namespace livekit_bridge {
 

bridge/src/bridge_video_track.cpp

@@ -27,7 +27,7 @@
 
 #include <stdexcept>
 
-#include "lk_log.h"
+#include "livekit/lk_log.h"
 
 namespace livekit_bridge {
 

bridge/src/livekit_bridge.cpp

@@ -39,8 +39,6 @@
 #include <cassert>
 #include <stdexcept>
 
-#include "lk_log.h"
-
 namespace livekit_bridge {
 
 // ---------------------------------------------------------------

bridge/src/rpc_constants.cpp

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2026 LiveKit
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "livekit_bridge/rpc_constants.h"
+
+namespace livekit_bridge {
+namespace rpc {
+namespace track_control {
+
+const char *const kMethod = "lk.bridge.track-control";
+const char *const kActionMute = "mute";
+const char *const kActionUnmute = "unmute";
+const char kDelimiter = ':';
+const char *const kResponseOk = "ok";
+
+std::string formatPayload(const char *action, const std::string &track_name) {
+  std::string payload;
+  payload.reserve(std::char_traits<char>::length(action) + 1 +
+                  track_name.size());
+  payload += action;
+  payload += kDelimiter;
+  payload += track_name;
+  return payload;
+}
+
+} // namespace track_control
+} // namespace rpc
+} // namespace livekit_bridge

build.sh

@@ -37,6 +37,7 @@ Commands:
   release           Configure + build Release version (build-release/)
   release-examples  Configure + build Release version with examples
   release-tests     Configure + build Release version with tests
+  build-all         Configure + build all of the above (debug/release + examples + tests)
   clean             Clean both Debug and Release build directories
   clean-all         Full clean (build dirs + Rust targets)
   help              Show this help message
@@ -60,6 +61,7 @@ Examples:
   ./build.sh debug
   ./build.sh debug-tests
   ./build.sh release-tests
+  ./build.sh build-all
   ./build.sh clean
   ./build.sh clean-all
 EOF
@@ -401,6 +403,26 @@ case "${cmd}" in
       fi
     fi
     ;;
+  build-all)
+    echo "==> Build-all: debug, debug-examples, debug-tests, release, release-examples, release-tests"
+    BUILD_TYPE="Debug"
+    BUILD_DIR="${PROJECT_ROOT}/build-debug"
+    PRESET="${OS_TYPE}-debug"
+    configure && build
+    PRESET="${OS_TYPE}-debug-examples"
+    configure && build
+    PRESET="${OS_TYPE}-debug-tests"
+    configure && build
+    BUILD_TYPE="Release"
+    BUILD_DIR="${PROJECT_ROOT}/build-release"
+    PRESET="${OS_TYPE}-release"
+    configure && build
+    PRESET="${OS_TYPE}-release-examples"
+    configure && build
+    PRESET="${OS_TYPE}-release-tests"
+    configure && build
+    echo "==> Build-all complete."
+    ;;
   clean)
     clean
     ;;