From 2d550c922a52d5da5d8c88bc9f7a96096e6149d4 Mon Sep 17 00:00:00 2001
From: acgist <289547414@qq.com>
Date: Sat, 11 May 2024 16:29:07 +0800
Subject: [PATCH] =?UTF-8?q?[*]=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../taoyao/media/src/main/cpp/include/Client.hpp |  4 ++--
 .../media/src/main/cpp/media/RemoteClient.cpp    | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Client.hpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Client.hpp
index 01c4c84..bf8c057 100644
--- a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Client.hpp
+++ b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Client.hpp
@@ -47,7 +47,7 @@ public:
     
 public:
     RoomClient(acgist::MediaManager* mediaManager);
-    virtual ~RoomClient();
+    virtual ~RoomClient() override;
     
 public:
     
@@ -75,7 +75,7 @@ public:
 
 public:
     RemoteClient(acgist::MediaManager* mediaManager);
-    virtual ~RemoteClient();
+    virtual ~RemoteClient() override;
 
 public:
     // 添加消费者
diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/RemoteClient.cpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/RemoteClient.cpp
index a21d4cf..13fbbbf 100644
--- a/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/RemoteClient.cpp
+++ b/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/RemoteClient.cpp
@@ -6,7 +6,8 @@
 
 static std::recursive_mutex clientMutex;
 
-acgist::RemoteClient::RemoteClient(acgist::MediaManager* mediaManager) : RoomClient(mediaManager) {}
+acgist::RemoteClient::RemoteClient(acgist::MediaManager* mediaManager) : RoomClient(mediaManager) {
+}
 
 acgist::RemoteClient::~RemoteClient() {
     for(auto iterator = this->consumers.begin(); iterator != this->consumers.end(); ++iterator) {
@@ -27,10 +28,17 @@ bool acgist::RemoteClient::addConsumer(const std::string& consumerId, mediasoupc
         oldConsumer->second = nullptr;
         this->consumers.erase(oldConsumer);
     }
-    OH_LOG_INFO(LOG_APP, "添加新的消费者：%s", consumerId.data());
     this->consumers.insert({ consumerId, consumer });
-    webrtc::MediaStreamTrackInterface* trackPointer = consumer->GetTrack();
-    // TODO: 播放
+    webrtc::MediaStreamTrackInterface* track = consumer->GetTrack();
+    OH_LOG_INFO(LOG_APP, "添加新的消费者：%s %s", consumerId.data(), track->kind().data());
+    if(track->kind() == webrtc::MediaStreamTrackInterface::kAudioKind) {
+        this->audioTrack = (webrtc::AudioTrackInterface*) track;
+        // TODO: old track
+    }
+    if(track->kind() == webrtc::MediaStreamTrackInterface::kVideoKind) {
+        this->videoTrack = (webrtc::VideoTrackInterface*) track;
+        // TODO: old track
+    }
     return true;
 }