diff --git a/basic_room/capture_utils.cpp b/basic_room/capture_utils.cpp index 0a13925..54dda95 100644 --- a/basic_room/capture_utils.cpp +++ b/basic_room/capture_utils.cpp @@ -30,8 +30,8 @@ using namespace livekit; // Test utils to run a capture loop to publish noisy audio frames to the room void runNoiseCaptureLoop(const std::shared_ptr& source, std::atomic& running_flag) { - const int sample_rate = source->sample_rate(); - const int num_channels = source->num_channels(); + const int sample_rate = source->sampleRate(); + const int num_channels = source->numChannels(); const int frame_ms = 10; const int samples_per_channel = sample_rate * frame_ms / 1000; diff --git a/basic_room/main.cpp b/basic_room/main.cpp index 8db1acb..59893bc 100644 --- a/basic_room/main.cpp +++ b/basic_room/main.cpp @@ -112,7 +112,7 @@ int main(int argc, char* argv[]) { options.dynacast = false; std::cout << "Connecting to: " << url << "\n"; - if (!room->Connect(url, token, options)) { + if (!room->connect(url, token, options)) { std::cerr << "Failed to connect\n"; livekit::shutdown(); return 1; diff --git a/hello_livekit/receiver/main.cpp b/hello_livekit/receiver/main.cpp index 413a845..7e877a5 100644 --- a/hello_livekit/receiver/main.cpp +++ b/hello_livekit/receiver/main.cpp @@ -77,7 +77,7 @@ int main(int argc, char* argv[]) { options.auto_subscribe = true; options.dynacast = false; - if (!room->Connect(url, receiver_token, options)) { + if (!room->connect(url, receiver_token, options)) { std::cerr << "[error] [receiver] Failed to connect\n"; livekit::shutdown(); return 1; @@ -86,7 +86,7 @@ int main(int argc, char* argv[]) { LocalParticipant* lp = room->localParticipant(); assert(lp); - std::cout << "[info] [receiver] Connected as identity='" << lp->identity() << "' room='" << room->room_info().name + std::cout << "[info] [receiver] Connected as identity='" << lp->identity() << "' room='" << room->roomInfo().name << "'; subscribing to sender identity='" << sender_identity << "'\n"; int video_frame_count = 0; diff --git a/hello_livekit/sender/main.cpp b/hello_livekit/sender/main.cpp index 780d2d8..d388f84 100644 --- a/hello_livekit/sender/main.cpp +++ b/hello_livekit/sender/main.cpp @@ -78,7 +78,7 @@ int main(int argc, char* argv[]) { options.auto_subscribe = true; options.dynacast = false; - if (!room->Connect(url, sender_token, options)) { + if (!room->connect(url, sender_token, options)) { std::cerr << "[error] [sender] Failed to connect\n"; livekit::shutdown(); return 1; @@ -87,7 +87,7 @@ int main(int argc, char* argv[]) { LocalParticipant* lp = room->localParticipant(); assert(lp); - std::cout << "[info] [sender] Connected as identity='" << lp->identity() << "' room='" << room->room_info().name + std::cout << "[info] [sender] Connected as identity='" << lp->identity() << "' room='" << room->roomInfo().name << "' — pass this identity to HelloLivekitReceiver\n"; auto video_source = std::make_shared(kWidth, kHeight); diff --git a/ping_pong/ping/main.cpp b/ping_pong/ping/main.cpp index c2f6e62..b21c125 100644 --- a/ping_pong/ping/main.cpp +++ b/ping_pong/ping/main.cpp @@ -92,7 +92,7 @@ int main(int argc, char* argv[]) { options.auto_subscribe = true; options.dynacast = false; - if (!room->Connect(url, token, options)) { + if (!room->connect(url, token, options)) { std::cerr << "[error] Failed to connect to room\n"; livekit::shutdown(); return 1; @@ -102,7 +102,7 @@ int main(int argc, char* argv[]) { assert(local_participant); std::cout << "[info] ping connected as identity='" << local_participant->identity() << "' room='" - << room->room_info().name << "'\n"; + << room->roomInfo().name << "'\n"; auto publish_result = local_participant->publishDataTrack(ping_pong::kPingTrackName); if (!publish_result) { diff --git a/ping_pong/pong/main.cpp b/ping_pong/pong/main.cpp index 6e1fea4..3421779 100644 --- a/ping_pong/pong/main.cpp +++ b/ping_pong/pong/main.cpp @@ -71,7 +71,7 @@ int main(int argc, char* argv[]) { options.auto_subscribe = true; options.dynacast = false; - if (!room->Connect(url, token, options)) { + if (!room->connect(url, token, options)) { std::cerr << "[error] Failed to connect to room\n"; livekit::shutdown(); return 1; @@ -81,7 +81,7 @@ int main(int argc, char* argv[]) { assert(local_participant); std::cout << "[info] pong connected as identity='" << local_participant->identity() << "' room='" - << room->room_info().name << "'\n"; + << room->roomInfo().name << "'\n"; auto publish_result = local_participant->publishDataTrack(ping_pong::kPongTrackName); if (!publish_result) { diff --git a/simple_data_stream/main.cpp b/simple_data_stream/main.cpp index e3f63e3..1edb2f7 100644 --- a/simple_data_stream/main.cpp +++ b/simple_data_stream/main.cpp @@ -213,7 +213,7 @@ int main(int argc, char* argv[]) { options.auto_subscribe = true; options.dynacast = false; - bool ok = room->Connect(url, token, options); + bool ok = room->connect(url, token, options); std::cout << "[DataStream] Connect result: " << std::boolalpha << ok << "\n"; if (!ok) { std::cerr << "[DataStream] Failed to connect to room\n"; @@ -221,7 +221,7 @@ int main(int argc, char* argv[]) { return 1; } - auto info = room->room_info(); + auto info = room->roomInfo(); std::cout << "[DataStream] Connected to room '" << info.name << "', participants: " << info.num_participants << "\n"; // Register stream handlers diff --git a/simple_joystick/receiver/main.cpp b/simple_joystick/receiver/main.cpp index 5f835ba..f227606 100644 --- a/simple_joystick/receiver/main.cpp +++ b/simple_joystick/receiver/main.cpp @@ -65,7 +65,7 @@ int main(int argc, char* argv[]) { options.auto_subscribe = true; options.dynacast = false; - bool res = room->Connect(url, token, options); + bool res = room->connect(url, token, options); std::cout << "[Receiver] Connect result: " << std::boolalpha << res << "\n"; if (!res) { std::cerr << "[Receiver] Failed to connect to room\n"; @@ -73,7 +73,7 @@ int main(int argc, char* argv[]) { return 1; } - auto info = room->room_info(); + auto info = room->roomInfo(); std::cout << "[Receiver] Connected to room: " << info.name << "\n"; std::cout << "[Receiver] Waiting for sender peer (up to 2 minutes)...\n"; diff --git a/simple_joystick/sender/main.cpp b/simple_joystick/sender/main.cpp index 2d1b749..128c662 100644 --- a/simple_joystick/sender/main.cpp +++ b/simple_joystick/sender/main.cpp @@ -133,7 +133,7 @@ int main(int argc, char* argv[]) { options.auto_subscribe = true; options.dynacast = false; - bool res = room->Connect(url, token, options); + bool res = room->connect(url, token, options); std::cout << "[Sender] Connect result: " << std::boolalpha << res << "\n"; if (!res) { std::cerr << "[Sender] Failed to connect to room\n"; @@ -141,7 +141,7 @@ int main(int argc, char* argv[]) { return 1; } - auto info = room->room_info(); + auto info = room->roomInfo(); std::cout << "[Sender] Connected to room: " << info.name << "\n"; // Enable raw terminal mode for immediate keypress detection diff --git a/simple_room/fallback_capture.cpp b/simple_room/fallback_capture.cpp index 9fa080e..2a3f977 100644 --- a/simple_room/fallback_capture.cpp +++ b/simple_room/fallback_capture.cpp @@ -30,8 +30,8 @@ using namespace livekit; // Test utils to run a capture loop to publish noisy audio frames to the room void runNoiseCaptureLoop(const std::shared_ptr& source, std::atomic& running_flag) { - const int sample_rate = source->sample_rate(); - const int num_channels = source->num_channels(); + const int sample_rate = source->sampleRate(); + const int num_channels = source->numChannels(); const int frame_ms = 10; const int samples_per_channel = sample_rate * frame_ms / 1000; diff --git a/simple_room/main.cpp b/simple_room/main.cpp index 8b9367f..1ae15cb 100644 --- a/simple_room/main.cpp +++ b/simple_room/main.cpp @@ -272,7 +272,7 @@ int main(int argc, char* argv[]) { } } - bool res = room->Connect(url, token, options); + bool res = room->connect(url, token, options); std::cout << "Connect result is " << std::boolalpha << res << std::endl; if (!res) { std::cerr << "[error] Failed to connect to room\n"; @@ -280,7 +280,7 @@ int main(int argc, char* argv[]) { return 1; } - auto info = room->room_info(); + auto info = room->roomInfo(); std::cout << "Connected to room:\n" << " SID: " << (info.sid ? *info.sid : "(none)") << "\n" << " Name: " << info.name << "\n" diff --git a/simple_room/sdl_media_manager.cpp b/simple_room/sdl_media_manager.cpp index b0be500..ea955d5 100644 --- a/simple_room/sdl_media_manager.cpp +++ b/simple_room/sdl_media_manager.cpp @@ -82,8 +82,8 @@ bool SDLMediaManager::startMic(const std::shared_ptr& audio_source) mic_using_sdl_ = true; mic_sdl_ = std::make_unique( - mic_source_->sample_rate(), mic_source_->num_channels(), - mic_source_->sample_rate() / 100, // ~10ms + mic_source_->sampleRate(), mic_source_->numChannels(), + mic_source_->sampleRate() / 100, // ~10ms [src = mic_source_](const int16_t* samples, int num_samples_per_channel, int sample_rate, int num_channels) { AudioFrame frame = AudioFrame::create(sample_rate, num_channels, num_samples_per_channel); std::memcpy(frame.data().data(), samples, num_samples_per_channel * num_channels * sizeof(int16_t)); @@ -263,8 +263,8 @@ void SDLMediaManager::speakerLoopSDL() { if (!localStream) { SDL_AudioSpec want{}; want.format = SDL_AUDIO_S16; - want.channels = static_cast(frame.num_channels()); - want.freq = frame.sample_rate(); + want.channels = static_cast(frame.numChannels()); + want.freq = frame.sampleRate(); localStream = SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &want, /*callback=*/nullptr, diff --git a/simple_room/wav_audio_source.cpp b/simple_room/wav_audio_source.cpp index 62a430b..c08c636 100644 --- a/simple_room/wav_audio_source.cpp +++ b/simple_room/wav_audio_source.cpp @@ -136,7 +136,7 @@ WavAudioSource::WavAudioSource(const std::string& path, int expected_sample_rate void WavAudioSource::fillFrame(AudioFrame& frame) { const std::size_t frame_samples = - static_cast(frame.num_channels()) * static_cast(frame.samples_per_channel()); + static_cast(frame.numChannels()) * static_cast(frame.samplesPerChannel()); int16_t* dst = frame.data().data(); const std::size_t total_wav_samples = wav_.samples.size(); diff --git a/simple_rpc/main.cpp b/simple_rpc/main.cpp index 9ecdf74..2e22989 100644 --- a/simple_rpc/main.cpp +++ b/simple_rpc/main.cpp @@ -86,7 +86,7 @@ bool ensurePeerPresent(Room* room, const std::string& identity, const std::strin return true; } // Timed out - auto info = room->room_info(); + auto info = room->roomInfo(); const std::string room_name = info.name; std::cout << "[Caller] Timed out after " << timeout.count() << "s waiting for " << friendly_role << " (identity=\"" << identity << "\").\n"; @@ -408,7 +408,7 @@ int main(int argc, char* argv[]) { options.auto_subscribe = true; options.dynacast = false; - bool res = room->Connect(url, token, options); + bool res = room->connect(url, token, options); std::cout << "Connect result is " << std::boolalpha << res << "\n"; if (!res) { std::cerr << "Failed to connect to room\n"; @@ -416,7 +416,7 @@ int main(int argc, char* argv[]) { return 1; } - auto info = room->room_info(); + auto info = room->roomInfo(); std::cout << "Connected to room:\n" << " Name: " << info.name << "\n" << " Metadata: " << info.metadata << "\n" diff --git a/user_timestamped_video/consumer/main.cpp b/user_timestamped_video/consumer/main.cpp index 904b37c..291f646 100644 --- a/user_timestamped_video/consumer/main.cpp +++ b/user_timestamped_video/consumer/main.cpp @@ -159,12 +159,12 @@ int main(int argc, char* argv[]) { room.setDelegate(&delegate); std::cout << "[consumer] connecting to " << cli_options.url << "\n"; - if (!room.Connect(cli_options.url, cli_options.token, options)) { + if (!room.connect(cli_options.url, cli_options.token, options)) { std::cerr << "[consumer] failed to connect\n"; exit_code = 1; } else { std::cout << "[consumer] connected as " << room.localParticipant()->identity() << " to room '" - << room.room_info().name << "' with user timestamp " + << room.roomInfo().name << "' with user timestamp " << (cli_options.use_user_timestamp ? "enabled" : "ignored") << "\n"; delegate.registerExistingParticipants(); diff --git a/user_timestamped_video/producer/main.cpp b/user_timestamped_video/producer/main.cpp index 73cd608..13830a0 100644 --- a/user_timestamped_video/producer/main.cpp +++ b/user_timestamped_video/producer/main.cpp @@ -89,12 +89,12 @@ int main(int argc, char* argv[]) { options.dynacast = false; std::cout << "[producer] connecting to " << cli_options.url << "\n"; - if (!room.Connect(cli_options.url, cli_options.token, options)) { + if (!room.connect(cli_options.url, cli_options.token, options)) { std::cerr << "[producer] failed to connect\n"; exit_code = 1; } else { std::cout << "[producer] connected as " << room.localParticipant()->identity() << " to room '" - << room.room_info().name << "'\n"; + << room.roomInfo().name << "'\n"; auto source = std::make_shared(kFrameWidth, kFrameHeight); auto track = LocalVideoTrack::createLocalVideoTrack("timestamped-camera", source);