Skip to content

unified sockets (1): server #2718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
zmerp wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

unified sockets (1): server #2718

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03f29f8
unified sockets (1): server
zmerp Feb 21, 2025
bdac508
address comments
zmerp Feb 28, 2025
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion alvr/packets/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ pub enum ClientConnectionResult {
ConnectionAccepted {
client_protocol_id: u64,
display_name: String,
server_ip: IpAddr,
server_ip: IpAddr, // must be unused for now
streaming_capabilities: Option<VideoStreamingCapabilitiesLegacy>, // todo: use String
},
ClientStandby,
Expand Down
7 changes: 0 additions & 7 deletions alvr/server_core/src/c_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,13 +551,6 @@ pub unsafe extern "C" fn alvr_duration_until_next_vsync(out_ns: *mut u64) -> boo
}
}

#[no_mangle]
pub unsafe extern "C" fn alvr_restart() {
if let Some(context) = SERVER_CORE_CONTEXT.write().take() {
context.restart();
}
}

#[no_mangle]
pub unsafe extern "C" fn alvr_shutdown() {
SERVER_CORE_CONTEXT.write().take();
Expand Down
Loading
Loading