Skip to content

Commit 932475e

Browse files
Remove second arg to init/LogSink
1 parent 069b78d commit 932475e

19 files changed

Lines changed: 21 additions & 165 deletions

.github/workflows/builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ env:
5858
# failing the build.
5959
SCCACHE_GHA_ENABLED: "true"
6060
# Pinned commit for cpp-example-collection smoke build (https://github.com/livekit-examples/cpp-example-collection)
61-
CPP_EXAMPLE_COLLECTION_REF: 56815733a71c14692569e8adf2916a56a14d4882
61+
CPP_EXAMPLE_COLLECTION_REF: 361237b7dc52e939b0572aac14cc792678c5cc40
6262
# vcpkg binary caching for Windows
6363
VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
6464
VCPKG_DEFAULT_HOST_TRIPLET: x64-windows-static-md

.github/workflows/docker-validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111

1212
env:
1313
# Pinned commit for cpp-example-collection smoke build (https://github.com/livekit-examples/cpp-example-collection)
14-
CPP_EXAMPLE_COLLECTION_REF: 56815733a71c14692569e8adf2916a56a14d4882
14+
CPP_EXAMPLE_COLLECTION_REF: 361237b7dc52e939b0572aac14cc792678c5cc40
1515

1616
jobs:
1717
validate-x64:

docs/doxygen/index.md

Lines changed: 0 additions & 135 deletions
This file was deleted.

include/livekit/livekit.h

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,16 @@
4444
/// @brief Public API for the LiveKit C++ Client SDK.
4545
namespace livekit {
4646

47-
/// The log sink to use for SDK messages.
48-
enum class LogSink {
49-
/// Log messages to the console.
50-
kConsole = 0,
51-
/// Log messages to a callback function.
52-
kCallback = 1,
53-
};
54-
5547
/// Initialize the LiveKit SDK.
5648
///
5749
/// This **must be the first LiveKit API called** in the process.
5850
/// It configures global SDK state, including log routing.
5951
///
6052
/// @param level Minimum log level for SDK messages (default: Info).
6153
/// Use setLogLevel() to change at runtime.
62-
/// @param log_sink The log sink to use for SDK messages (default: Console).
6354
/// @returns true if initialization happened on this call, false if it was
6455
/// already initialized.
65-
LIVEKIT_API bool initialize(const LogLevel& level = LogLevel::Info, const LogSink& log_sink = LogSink::kConsole);
56+
LIVEKIT_API bool initialize(const LogLevel& level = LogLevel::Info);
6657

6758
/// Shut down the LiveKit SDK.
6859
///

src/livekit.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121

2222
namespace livekit {
2323

24-
bool initialize(const LogLevel& level, const LogSink& log_sink) {
24+
bool initialize(const LogLevel& level) {
2525
// Initializes logger if singleton instance is not already initialized
2626
setLogLevel(level);
27-
auto& ffi_client = FfiClient::instance();
28-
return ffi_client.initialize(log_sink == LogSink::kCallback);
27+
// Note: capture_logs currently disabled, requires event support in FfiClient
28+
return FfiClient::instance().initialize(false);
2929
}
3030

3131
bool isInitialized() { return FfiClient::instance().isInitialized(); }

src/tests/common/test_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ class StressTestStats {
456456
class LiveKitTestBase : public ::testing::Test {
457457
protected:
458458
void SetUp() override {
459-
livekit::initialize(livekit::LogLevel::Info, livekit::LogSink::kConsole);
459+
livekit::initialize(livekit::LogLevel::Info);
460460
config_ = TestConfig::fromEnv();
461461

462462
// Tracing is controlled by compile-time macro LIVEKIT_TEST_ENABLE_TRACING

src/tests/integration/test_room.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace livekit::test {
2323
class RoomTest : public ::testing::Test {
2424
protected:
2525
void SetUp() override {
26-
livekit::initialize(livekit::LogLevel::Info, livekit::LogSink::kConsole);
26+
livekit::initialize(livekit::LogLevel::Info);
2727

2828
const char* url_env = std::getenv("LIVEKIT_URL");
2929
const char* token_env = std::getenv("LIVEKIT_TOKEN_A");

src/tests/integration/test_rpc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ std::string generateRandomPayload(size_t size) {
9393
class RpcIntegrationTest : public ::testing::Test {
9494
protected:
9595
void SetUp() override {
96-
livekit::initialize(livekit::LogLevel::Info, livekit::LogSink::kConsole);
96+
livekit::initialize(livekit::LogLevel::Info);
9797
config_ = RpcTestConfig::fromEnv();
9898
}
9999

src/tests/stress/test_audio_frame_stress.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace livekit::test {
2727

2828
class AudioFrameStressTest : public ::testing::Test {
2929
protected:
30-
void SetUp() override { livekit::initialize(livekit::LogLevel::Info, livekit::LogSink::kConsole); }
30+
void SetUp() override { livekit::initialize(livekit::LogLevel::Info); }
3131

3232
void TearDown() override { livekit::shutdown(); }
3333
};

0 commit comments

Comments
 (0)