Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions basic_room/capture_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<AudioSource>& source, std::atomic<bool>& 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;

Expand Down
2 changes: 1 addition & 1 deletion basic_room/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions hello_livekit/receiver/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions hello_livekit/sender/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<VideoSource>(kWidth, kHeight);
Expand Down
4 changes: 2 additions & 2 deletions ping_pong/ping/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions ping_pong/pong/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions simple_data_stream/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,15 +213,15 @@ 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";
livekit::shutdown();
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
Expand Down
4 changes: 2 additions & 2 deletions simple_joystick/receiver/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ 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";
livekit::shutdown();
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";

Expand Down
4 changes: 2 additions & 2 deletions simple_joystick/sender/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ 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";
livekit::shutdown();
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
Expand Down
4 changes: 2 additions & 2 deletions simple_room/fallback_capture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<AudioSource>& source, std::atomic<bool>& 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;

Expand Down
4 changes: 2 additions & 2 deletions simple_room/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -272,15 +272,15 @@ 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";
livekit::shutdown();
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"
Expand Down
8 changes: 4 additions & 4 deletions simple_room/sdl_media_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ bool SDLMediaManager::startMic(const std::shared_ptr<AudioSource>& audio_source)
mic_using_sdl_ = true;

mic_sdl_ = std::make_unique<SDLMicSource>(
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));
Expand Down Expand Up @@ -263,8 +263,8 @@ void SDLMediaManager::speakerLoopSDL() {
if (!localStream) {
SDL_AudioSpec want{};
want.format = SDL_AUDIO_S16;
want.channels = static_cast<Uint8>(frame.num_channels());
want.freq = frame.sample_rate();
want.channels = static_cast<Uint8>(frame.numChannels());
want.freq = frame.sampleRate();

localStream = SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &want,
/*callback=*/nullptr,
Expand Down
2 changes: 1 addition & 1 deletion simple_room/wav_audio_source.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::size_t>(frame.num_channels()) * static_cast<std::size_t>(frame.samples_per_channel());
static_cast<std::size_t>(frame.numChannels()) * static_cast<std::size_t>(frame.samplesPerChannel());

int16_t* dst = frame.data().data();
const std::size_t total_wav_samples = wav_.samples.size();
Expand Down
6 changes: 3 additions & 3 deletions simple_rpc/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -408,15 +408,15 @@ 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";
livekit::shutdown();
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"
Expand Down
4 changes: 2 additions & 2 deletions user_timestamped_video/consumer/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions user_timestamped_video/producer/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<VideoSource>(kFrameWidth, kFrameHeight);
auto track = LocalVideoTrack::createLocalVideoTrack("timestamped-camera", source);
Expand Down
Loading