LocalDataTrack: make proto constructor private

Author: stephen-derosa

include/livekit/local_data_track.h

@@ -68,13 +68,11 @@ class LocalDataTrack {
   /// Whether the track is still published in the room.
   bool isPublished() const;
 
-  /// Construct from an owned proto (called by LocalParticipant).
-  explicit LocalDataTrack(const proto::OwnedLocalDataTrack &owned);
-
 private:
   friend class LocalParticipant;
 
-  /// Raw FFI handle id for internal use.
+  explicit LocalDataTrack(const proto::OwnedLocalDataTrack &owned);
+
   uintptr_t ffi_handle_id() const noexcept { return handle_.get(); }
 
   /** RAII wrapper for the Rust-owned FFI resource. */

include/livekit/remote_data_track.h

@@ -60,9 +60,6 @@ class RemoteDataTrack {
     return publisher_identity_;
   }
 
-  /// Raw FFI handle id for internal use.
-  uintptr_t ffi_handle_id() const noexcept { return handle_.get(); }
-
   /// Whether the track is still published by the remote participant.
   bool isPublished() const;
 
@@ -77,10 +74,12 @@ class RemoteDataTrack {
   std::shared_ptr<DataTrackSubscription>
   subscribe(const DataTrackSubscription::Options &options = {});
 
-  /// Construct from an owned proto (called by Room event handling).
+private:
+  friend class Room;
+
   explicit RemoteDataTrack(const proto::OwnedRemoteDataTrack &owned);
 
-private:
+  uintptr_t ffi_handle_id() const noexcept { return handle_.get(); }
   /** RAII wrapper for the Rust-owned FFI resource. */
   FfiHandle handle_;
 

src/local_participant.cpp

@@ -237,7 +237,7 @@ LocalParticipant::publishDataTrack(const std::string &name) {
       static_cast<std::uint64_t>(handle_id), name);
 
   proto::OwnedLocalDataTrack owned = fut.get();
-  return std::make_shared<LocalDataTrack>(owned);
+  return std::shared_ptr<LocalDataTrack>(new LocalDataTrack(owned));
 }
 
 void LocalParticipant::unpublishDataTrack(

src/room.cpp

@@ -606,7 +606,8 @@ void Room::OnEvent(const FfiEvent &event) {
     }
     case proto::RoomEvent::kRemoteDataTrackPublished: {
       const auto &rdtp = re.remote_data_track_published();
-      auto remote_track = std::make_shared<RemoteDataTrack>(rdtp.track());
+      auto remote_track =
+          std::shared_ptr<RemoteDataTrack>(new RemoteDataTrack(rdtp.track()));
       std::cout << "[Room] RoomEvent::kRemoteDataTrackPublished: \""
                 << remote_track->info().name << "\" from \""
                 << remote_track->publisherIdentity()