compiling

Author: stephen-derosa

bridge/include/livekit_bridge/livekit_bridge.h

@@ -382,6 +382,7 @@ class LiveKitBridge {
    * @return true if the track was unmuted successfully.
    */
   bool requestRemoteTrackUnmute(const std::string &destination_identity,
+                                const std::string &track_name);
   /**
    * Set the callback for data frames from a specific remote participant's
    * data track.

bridge/src/bridge_data_track.cpp

@@ -16,7 +16,7 @@
 
 #include "livekit_bridge/bridge_data_track.h"
 
-#include "lk_log.h"
+#include "livekit/lk_log.h"
 
 #include "livekit/data_frame.h"
 #include "livekit/local_data_track.h"

bridge/src/bridge_room_delegate.cpp

@@ -19,7 +19,7 @@
 
 #include "bridge_room_delegate.h"
 
-#include "lk_log.h"
+#include "livekit/lk_log.h"
 
 #include "livekit/remote_data_track.h"
 #include "livekit/remote_participant.h"

bridge/src/livekit_bridge.cpp

@@ -135,6 +135,7 @@ bool LiveKitBridge::connect(const std::string &url, const std::string &token,
 
   // ---- Phase 3: commit under lock ----
   // room_/delegate_/connected_ are now in a consistent state.
+  livekit::LocalParticipant *lp = nullptr;
   {
     std::lock_guard<std::mutex> lock(mutex_);
     room_ = std::move(room);

bridge/tests/CMakeLists.txt

@@ -83,12 +83,12 @@ if(BRIDGE_TEST_SOURCES)
     ${BRIDGE_TEST_SOURCES}
   )
 
-  target_include_directories(livekit_bridge_tests
+  target_include_directories(livekit_bridge_unit_tests
     PRIVATE
       ${CMAKE_CURRENT_SOURCE_DIR}/../src
   )
 
-  target_link_libraries(livekit_bridge_tests
+  target_link_libraries(livekit_bridge_unit_tests
     PRIVATE
       livekit_bridge
       GTest::gtest_main

bridge/tests/integration/test_bridge_rpc_roundtrip.cpp

@@ -57,8 +57,9 @@ TEST_F(BridgeRpcRoundtripTest, BasicRpcRoundTrip) {
   std::cout << "RPC handler registered, performing call..." << std::endl;
 
   std::string test_payload = "hello from bridge";
-  std::string response =
+  auto response =
       caller.performRpc(receiver_identity, "echo", test_payload, 10.0);
+  EXPECT_TRUE(response.has_value());
 
   size_t expected_checksum = 0;
   for (char c : test_payload) {
@@ -68,10 +69,10 @@ TEST_F(BridgeRpcRoundtripTest, BasicRpcRoundTrip) {
       "echo:" + std::to_string(test_payload.size()) + ":" +
       std::to_string(expected_checksum);
 
-  std::cout << "Response: " << response << std::endl;
+  std::cout << "Response: " << response.value() << std::endl;
   std::cout << "Expected: " << expected_response << std::endl;
 
-  EXPECT_EQ(response, expected_response);
+  EXPECT_EQ(response.value(), expected_response);
   EXPECT_EQ(rpc_calls_received.load(), 1);
 
   receiver.unregisterRpcMethod("echo");

src/ffi_client.cpp

@@ -324,7 +324,7 @@ FfiClient::connectAsync(const std::string &url, const std::string &token,
   auto *opts = connect->mutable_options();
   opts->set_auto_subscribe(options.auto_subscribe);
   opts->set_dynacast(options.dynacast);
-  opts->set_single_peer_connection(options.single_peer_connection);
+  // opts->set_single_peer_connection(options.single_peer_connection);
 
   LK_LOG_DEBUG("[FfiClient] connectAsync: auto_subscribe={}, dynacast={}, "
                "single_peer_connection={}",