Skip to content

move ffi_client.h to internal src/ folder #17

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

Merged
xianshijing-lk merged 1 commit into from
Dec 15, 2025
Merged

move ffi_client.h to internal src/ folder #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ add_library(livekit
include/livekit/room_event_types.h
include/livekit/room_delegate.h
include/livekit/ffi_handle.h
include/livekit/ffi_client.h
include/livekit/local_audio_track.h
include/livekit/remote_audio_track.h
include/livekit/participant.h
Expand All @@ -188,6 +187,7 @@ add_library(livekit
src/data_stream.cpp
src/ffi_handle.cpp
src/ffi_client.cpp
src/ffi_client.h
src/local_audio_track.cpp
src/remote_audio_track.cpp
src/room.cpp
Expand Down
2 changes: 1 addition & 1 deletion include/livekit/room.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#ifndef LIVEKIT_ROOM_H
#define LIVEKIT_ROOM_H

#include "ffi_client.h"
#include "livekit/data_stream.h"
#include "livekit/ffi_client.h"
#include "livekit/ffi_handle.h"
#include "livekit/room_event_types.h"
#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion src/audio_source.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

#include "audio_frame.pb.h"
#include "ffi.pb.h"
#include "ffi_client.h"
#include "livekit/audio_frame.h"
#include "livekit/ffi_client.h"

namespace livekit {

Expand Down
2 changes: 1 addition & 1 deletion src/audio_stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include "audio_frame.pb.h"
#include "ffi.pb.h"
#include "livekit/ffi_client.h"
#include "ffi_client.h"
#include "livekit/track.h"

namespace livekit {
Expand Down
2 changes: 1 addition & 1 deletion src/data_stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <random>
#include <stdexcept>

#include "livekit/ffi_client.h"
#include "ffi_client.h"
#include "livekit/local_participant.h"
#include "room.pb.h"

Expand Down
2 changes: 1 addition & 1 deletion src/ffi_client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "build.h"
#include "e2ee.pb.h"
#include "ffi.pb.h"
#include "livekit/ffi_client.h"
#include "ffi_client.h"
#include "livekit/ffi_handle.h"
#include "livekit/room.h" // TODO, maybe avoid circular deps by moving RoomOptions to a room_types.h ?
#include "livekit/rpc_error.h"
Expand Down
0 include/livekit/ffi_client.h → src/ffi_client.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/local_audio_track.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include "livekit/local_audio_track.h"

#include "ffi.pb.h"
#include "ffi_client.h"
#include "livekit/audio_source.h"
#include "livekit/ffi_client.h"
#include "track.pb.h"
#include "track_proto_converter.h"

Expand Down
2 changes: 1 addition & 1 deletion src/local_participant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

#include "livekit/local_participant.h"

#include "livekit/ffi_client.h"
#include "livekit/ffi_handle.h"
#include "livekit/local_track_publication.h"
#include "livekit/room_delegate.h"
#include "livekit/track.h"

#include "ffi.pb.h"
#include "ffi_client.h"
#include "participant.pb.h"
#include "room.pb.h"
#include "room_proto_converter.h"
Expand Down
2 changes: 1 addition & 1 deletion src/local_video_track.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "livekit/local_video_track.h"

#include "ffi.pb.h"
#include "livekit/ffi_client.h"
#include "ffi_client.h"
#include "livekit/video_source.h"
#include "track.pb.h"
#include "track_proto_converter.h"
Expand Down
2 changes: 1 addition & 1 deletion src/remote_audio_track.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include "livekit/remote_audio_track.h"

#include "ffi.pb.h"
#include "ffi_client.h"
#include "livekit/audio_source.h"
#include "livekit/ffi_client.h"
#include "track.pb.h"
#include "track_proto_converter.h"

Expand Down
2 changes: 1 addition & 1 deletion src/remote_track_publication.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "livekit/remote_track_publication.h"

#include "ffi.pb.h"
#include "livekit/ffi_client.h"
#include "ffi_client.h"
#include "livekit/track.h"
#include "track_proto_converter.h"

Expand Down
2 changes: 1 addition & 1 deletion src/remote_video_track.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "livekit/remote_video_track.h"

#include "ffi.pb.h"
#include "livekit/ffi_client.h"
#include "ffi_client.h"
#include "livekit/video_source.h"
#include "track.pb.h"
#include "track_proto_converter.h"
Expand Down
2 changes: 1 addition & 1 deletion src/room.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#include "livekit/room.h"

#include "livekit/audio_stream.h"
#include "livekit/ffi_client.h"
#include "livekit/local_participant.h"
#include "livekit/local_track_publication.h"
#include "livekit/remote_audio_track.h"
Expand All @@ -29,6 +28,7 @@
#include "livekit/video_stream.h"

#include "ffi.pb.h"
#include "ffi_client.h"
#include "room.pb.h"
#include "room_proto_converter.h"
#include "track.pb.h"
Expand Down
2 changes: 1 addition & 1 deletion src/track.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "livekit/track.h"

#include "livekit/ffi_client.h"
#include "ffi_client.h"
#include <future>
#include <optional>

Expand Down
5 changes: 2 additions & 3 deletions src/video_source.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
#include <chrono>
#include <stdexcept>

#include "livekit/ffi_client.h"
#include "livekit/video_frame.h"

#include "ffi.pb.h"
#include "ffi_client.h"
#include "livekit/video_frame.h"
#include "video_frame.pb.h"
#include "video_utils.h"

Expand Down
2 changes: 1 addition & 1 deletion src/video_stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <utility>

#include "ffi.pb.h"
#include "livekit/ffi_client.h"
#include "ffi_client.h"
#include "livekit/track.h"
#include "video_frame.pb.h"
#include "video_utils.h"
Expand Down
2 changes: 1 addition & 1 deletion src/video_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <vector>

#include "ffi.pb.h"
#include "livekit/ffi_client.h"
#include "ffi_client.h"
#include "livekit/ffi_handle.h"
#include "video_frame.pb.h"

Expand Down
Loading