From ad4b28c166d6fa82e86929294ed600c11d5f2a1e Mon Sep 17 00:00:00 2001 From: shijing xian Date: Mon, 15 Dec 2025 11:52:16 -0800 Subject: [PATCH] move ffi_client.h to internal src/ folder --- CMakeLists.txt | 2 +- include/livekit/room.h | 2 +- src/audio_source.cpp | 2 +- src/audio_stream.cpp | 2 +- src/data_stream.cpp | 2 +- src/ffi_client.cpp | 2 +- {include/livekit => src}/ffi_client.h | 0 src/local_audio_track.cpp | 2 +- src/local_participant.cpp | 2 +- src/local_video_track.cpp | 2 +- src/remote_audio_track.cpp | 2 +- src/remote_track_publication.cpp | 2 +- src/remote_video_track.cpp | 2 +- src/room.cpp | 2 +- src/track.cpp | 2 +- src/video_source.cpp | 5 ++--- src/video_stream.cpp | 2 +- src/video_utils.cpp | 2 +- 18 files changed, 18 insertions(+), 19 deletions(-) rename {include/livekit => src}/ffi_client.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45cce83..7745c13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 @@ -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 diff --git a/include/livekit/room.h b/include/livekit/room.h index 318baaf..ec8b74e 100644 --- a/include/livekit/room.h +++ b/include/livekit/room.h @@ -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 diff --git a/src/audio_source.cpp b/src/audio_source.cpp index 37c7960..8d57b7f 100644 --- a/src/audio_source.cpp +++ b/src/audio_source.cpp @@ -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 { diff --git a/src/audio_stream.cpp b/src/audio_stream.cpp index 45a3669..f6af96a 100644 --- a/src/audio_stream.cpp +++ b/src/audio_stream.cpp @@ -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 { diff --git a/src/data_stream.cpp b/src/data_stream.cpp index e9fa3be..980ed72 100644 --- a/src/data_stream.cpp +++ b/src/data_stream.cpp @@ -5,7 +5,7 @@ #include #include -#include "livekit/ffi_client.h" +#include "ffi_client.h" #include "livekit/local_participant.h" #include "room.pb.h" diff --git a/src/ffi_client.cpp b/src/ffi_client.cpp index ee7bba7..41304f2 100644 --- a/src/ffi_client.cpp +++ b/src/ffi_client.cpp @@ -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" diff --git a/include/livekit/ffi_client.h b/src/ffi_client.h similarity index 100% rename from include/livekit/ffi_client.h rename to src/ffi_client.h diff --git a/src/local_audio_track.cpp b/src/local_audio_track.cpp index 02d73b0..0481dc3 100644 --- a/src/local_audio_track.cpp +++ b/src/local_audio_track.cpp @@ -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" diff --git a/src/local_participant.cpp b/src/local_participant.cpp index 27b4dd3..7ec3c76 100644 --- a/src/local_participant.cpp +++ b/src/local_participant.cpp @@ -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" diff --git a/src/local_video_track.cpp b/src/local_video_track.cpp index 7294a99..fe514a3 100644 --- a/src/local_video_track.cpp +++ b/src/local_video_track.cpp @@ -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" diff --git a/src/remote_audio_track.cpp b/src/remote_audio_track.cpp index f8e4b81..7263189 100644 --- a/src/remote_audio_track.cpp +++ b/src/remote_audio_track.cpp @@ -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" diff --git a/src/remote_track_publication.cpp b/src/remote_track_publication.cpp index 6a7f8d0..3616af6 100644 --- a/src/remote_track_publication.cpp +++ b/src/remote_track_publication.cpp @@ -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" diff --git a/src/remote_video_track.cpp b/src/remote_video_track.cpp index 3fd9ee0..871ec67 100644 --- a/src/remote_video_track.cpp +++ b/src/remote_video_track.cpp @@ -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" diff --git a/src/room.cpp b/src/room.cpp index e3d93b2..538156f 100644 --- a/src/room.cpp +++ b/src/room.cpp @@ -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" @@ -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" diff --git a/src/track.cpp b/src/track.cpp index f8c26a6..2dd403d 100644 --- a/src/track.cpp +++ b/src/track.cpp @@ -16,7 +16,7 @@ #include "livekit/track.h" -#include "livekit/ffi_client.h" +#include "ffi_client.h" #include #include diff --git a/src/video_source.cpp b/src/video_source.cpp index 1caddc9..4d29e1c 100644 --- a/src/video_source.cpp +++ b/src/video_source.cpp @@ -19,10 +19,9 @@ #include #include -#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" diff --git a/src/video_stream.cpp b/src/video_stream.cpp index cb6d447..c7b5fc8 100644 --- a/src/video_stream.cpp +++ b/src/video_stream.cpp @@ -3,7 +3,7 @@ #include #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" diff --git a/src/video_utils.cpp b/src/video_utils.cpp index 746e4ef..d75b775 100644 --- a/src/video_utils.cpp +++ b/src/video_utils.cpp @@ -5,7 +5,7 @@ #include #include "ffi.pb.h" -#include "livekit/ffi_client.h" +#include "ffi_client.h" #include "livekit/ffi_handle.h" #include "video_frame.pb.h"