feat: change MediasoupEngine to Mediasoup

Change-Id: Ib13c6f6e6a85d26a961d966566e378f59bc2227a
zyjiang08 · Jul 18, 2020 · 17ab327 · 17ab327
1 parent 3aa1386
commit 17ab327
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 37 deletions.
diff --git a/demo/main.cpp b/demo/main.cpp
@@ -1,17 +1,17 @@
 #include <stdio.h>
 
-#include "IMediasoupEngine.hpp"
+#include "IMediasoup.hpp"
 
 int main(int argc, char *argv[])
 {   
-    mediasoup::IMediasoupEngine* engine = mediasoup::CreateMediasoupEngine();
-    engine->Init();
-    engine->Test();
+    mediasoup::IMediasoup* mediasoup = mediasoup::CreateMediasoup();
+    mediasoup->Init();
+    mediasoup->Test();
 
     getchar();
 
-    engine->Destroy();
-    mediasoup::DestroyMediasoupEngine(engine);
+    mediasoup->Destroy();
+    mediasoup::DestroyMediasoup(mediasoup);
 
     getchar();
 }
diff --git a/mediasoup/CMakeLists.txt b/mediasoup/CMakeLists.txt
@@ -5,15 +5,15 @@ project(${PROJECT_NAME})
 
 set(mediasoup_headers
   Logger.hpp
-  IMediasoupEngine.hpp
-  MediasoupEngine.hpp
+  IMediasoup.hpp
+  Mediasoup.hpp
   EventEmitter.hpp
   Promise.hpp
   Worker.hpp
 )
 set(mediasoup_sources
   Logger.cpp
-  MediasoupEngine.cpp
+  Mediasoup.cpp
   EventEmitter.cpp
   Worker.cpp
 )

diff --git a/mediasoup/IMediasoupEngine.hpp → mediasoup/IMediasoup.hpp b/mediasoup/IMediasoupEngine.hpp → mediasoup/IMediasoup.hpp
@@ -3,9 +3,9 @@
 namespace mediasoup
 {
 
-class IMediasoupEngine {
+class IMediasoup {
   public:
-    virtual ~IMediasoupEngine() {}
+    virtual ~IMediasoup() {}
 
     virtual void Test() = 0;
 	  virtual bool Init() = 0;
@@ -14,8 +14,8 @@ class IMediasoupEngine {
     virtual IWorker* CreateWorker() = 0;
 };
 
-mediasoup::IMediasoupEngine* CreateMediasoupEngine();
+mediasoup::IMediasoup* CreateMediasoup();
 
-void DestroyMediasoupEngine(mediasoup::IMediasoupEngine *engine);
+void DestroyMediasoup(mediasoup::IMediasoup* mediasoup);
 
 }
diff --git a/mediasoup/MediasoupEngine.cpp → mediasoup/Mediasoup.cpp b/mediasoup/MediasoupEngine.cpp → mediasoup/Mediasoup.cpp
@@ -1,4 +1,4 @@
-#include "MediasoupEngine.hpp"
+#include "Mediasoup.hpp"
 #include "Logger.hpp"
 #include "EventEmitter.hpp"
 #include "Promise.hpp"
@@ -9,27 +9,27 @@ using namespace promise;
 namespace mediasoup
 {
 
-mediasoup::IMediasoupEngine* CreateMediasoupEngine() {
-    MS_lOGGERI("CreateMediasoupEngine");
-    return &mediasoup::MediasoupEngine::GetInstance();
+mediasoup::IMediasoup* CreateMediasoup() {
+    MS_lOGGERI("CreateMediasoup");
+    return &mediasoup::Mediasoup::GetInstance();
 }
 
-void DestroyMediasoupEngine(mediasoup::IMediasoupEngine *engine) {
-    if (!engine) {
+void DestroyMediasoup(mediasoup::IMediasoup* mediasoup) {
+    if (!mediasoup) {
         return;
     }
-    MS_lOGGERI("DestroyMediasoupEngine");
+    MS_lOGGERI("DestroyMediasoup");
 }
 
-MediasoupEngine::MediasoupEngine() {
+Mediasoup::Mediasoup() {
 
 }
 
-MediasoupEngine::~MediasoupEngine() {
+Mediasoup::~Mediasoup() {
 
 }
 
-void MediasoupEngine::Test() {
+void Mediasoup::Test() {
     return;
     MS_lOGGERD("Support for int: {0:d};  hex: {0:x};  oct: {0:o}; bin: {0:b}", 42);
     MS_lOGGERW("Some error message with arg: {}", 1);
@@ -79,15 +79,15 @@ void MediasoupEngine::Test() {
     });
 }
 
-void StaticWorkerFun(void *arg) {
-    static_cast<MediasoupEngine*>(arg)->WorkerFun();
+void StaticWorkerFun(void* arg) {
+    static_cast<Mediasoup*>(arg)->WorkerFun();
 }
 
-void StaticAsync(uv_async_t *handle) {
-    static_cast<MediasoupEngine*>(handle->loop->data)->Async(handle);
+void StaticAsync(uv_async_t* handle) {
+    static_cast<Mediasoup*>(handle->loop->data)->Async(handle);
 }
 
-bool MediasoupEngine::Init() {
+bool Mediasoup::Init() {
     if (m_workThreadCreated) {
         MS_lOGGERI("already Init");
         return true;
@@ -104,7 +104,7 @@ bool MediasoupEngine::Init() {
 	return true;
 }
 
-void MediasoupEngine::Destroy()  {
+void Mediasoup::Destroy()  {
     if (!m_workThreadCreated) {
         MS_lOGGERI("need Init first");
         return;
@@ -119,11 +119,11 @@ void MediasoupEngine::Destroy()  {
     MS_lOGGERI("work thread quit");
 }
 
-IWorker* MediasoupEngine::CreateWorker()  {
+IWorker* Mediasoup::CreateWorker()  {
     return new Worker();
 }
 
-void MediasoupEngine::WorkerFun() {
+void Mediasoup::WorkerFun() {
     MS_lOGGERI("WorkerFun begine");
 
     uv_loop_t* loop = new uv_loop_t;
@@ -150,7 +150,7 @@ void MediasoupEngine::WorkerFun() {
     MS_lOGGERI("WorkerFun end");
 }
 
-void MediasoupEngine::Async(uv_async_t *handle) {
+void Mediasoup::Async(uv_async_t* handle) {
     MS_lOGGERI("async stop");
     uv_stop(handle->loop);
 }

diff --git a/mediasoup/MediasoupEngine.hpp → mediasoup/Mediasoup.hpp b/mediasoup/MediasoupEngine.hpp → mediasoup/Mediasoup.hpp
@@ -1,15 +1,15 @@
 #pragma once
-#include "IMediasoupEngine.hpp"
+#include "IMediasoup.hpp"
 #include "common/Singleton.hpp"
 #include "uv.h"
 
 namespace mediasoup
 {
 
-class MediasoupEngine : public IMediasoupEngine, public mediasoup::Singleton<MediasoupEngine> {
+class Mediasoup : public IMediasoup, public mediasoup::Singleton<Mediasoup> {
 public:
-    MediasoupEngine();
-    virtual ~MediasoupEngine();
+    Mediasoup();
+    virtual ~Mediasoup();
 
     virtual void Test() override;
 	virtual bool Init() override;
@@ -18,7 +18,7 @@ class MediasoupEngine : public IMediasoupEngine, public mediasoup::Singleton<Med
 
 public:
     void WorkerFun();
-    void Async(uv_async_t *handle);
+    void Async(uv_async_t* handle);
 
 private:
     uv_thread_t m_workThread;