more

versatica · Jun 21, 2023 · 01cf2a8 · 01cf2a8
1 parent bdee272
commit 01cf2a8
Show file tree

Hide file tree

Showing 20 changed files with 141 additions and 141 deletions.
diff --git a/worker/fbs/request.fbs b/worker/fbs/request.fbs
@@ -15,19 +15,19 @@ enum Method: uint8 {
   WORKER_UPDATE_SETTINGS,
   WORKER_CREATE_WEBRTC_SERVER,
   WORKER_CREATE_ROUTER,
-  WORKER_WEBRTC_SERVER_CLOSE,
+  WORKER_WEBRTCSERVER_CLOSE,
   WORKER_CLOSE_ROUTER,
   WEBRTC_SERVER_DUMP,
   ROUTER_DUMP,
-  ROUTER_CREATE_WEBRTC_TRANSPORT,
-  ROUTER_CREATE_WEBRTC_TRANSPORT_WITH_SERVER,
-  ROUTER_CREATE_PLAIN_TRANSPORT,
-  ROUTER_CREATE_PIPE_TRANSPORT,
-  ROUTER_CREATE_DIRECT_TRANSPORT,
+  ROUTER_CREATE_WEBRTCTRANSPORT,
+  ROUTER_CREATE_WEBRTCTRANSPORT_WITH_SERVER,
+  ROUTER_CREATE_PLAINTRANSPORT,
+  ROUTER_CREATE_PIPETRANSPORT,
+  ROUTER_CREATE_DIRECTTRANSPORT,
   ROUTER_CLOSE_TRANSPORT,
-  ROUTER_CREATE_ACTIVE_SPEAKER_OBSERVER,
-  ROUTER_CREATE_AUDIO_LEVEL_OBSERVER,
-  ROUTER_CLOSE_RTP_OBSERVER,
+  ROUTER_CREATE_ACTIVESPEAKEROBSERVER,
+  ROUTER_CREATE_AUDIOLEVELOBSERVER,
+  ROUTER_CLOSE_RTPOBSERVER,
   TRANSPORT_DUMP,
   TRANSPORT_GET_STATS,
   TRANSPORT_CONNECT,
@@ -42,11 +42,11 @@ enum Method: uint8 {
   TRANSPORT_ENABLE_TRACE_EVENT,
   TRANSPORT_CLOSE_PRODUCER,
   TRANSPORT_CLOSE_CONSUMER,
-  TRANSPORT_CLOSE_DATA_PRODUCER,
-  TRANSPORT_CLOSE_DATA_CONSUMER,
-  PLAIN_TRANSPORT_CONNECT,
-  PIPE_TRANSPORT_CONNECT,
-  WEBRTC_TRANSPORT_CONNECT,
+  TRANSPORT_CLOSE_DATAPRODUCER,
+  TRANSPORT_CLOSE_DATACONSUMER,
+  PLAINTRANSPORT_CONNECT,
+  PIPETRANSPORT_CONNECT,
+  WEBRTCTRANSPORT_CONNECT,
   PRODUCER_DUMP,
   PRODUCER_GET_STATS,
   PRODUCER_PAUSE,
@@ -60,21 +60,21 @@ enum Method: uint8 {
   CONSUMER_SET_PRIORITY,
   CONSUMER_REQUEST_KEY_FRAME,
   CONSUMER_ENABLE_TRACE_EVENT,
-  DATA_PRODUCER_DUMP,
-  DATA_PRODUCER_GET_STATS,
-  DATA_PRODUCER_PAUSE,
-  DATA_PRODUCER_RESUME,
-  DATA_CONSUMER_DUMP,
-  DATA_CONSUMER_GET_STATS,
-  DATA_CONSUMER_PAUSE,
-  DATA_CONSUMER_RESUME,
-  DATA_CONSUMER_GET_BUFFERED_AMOUNT,
-  DATA_CONSUMER_SET_BUFFERED_AMOUNT_LOW_THRESHOLD,
-  DATA_CONSUMER_SEND,
-  RTP_OBSERVER_PAUSE,
-  RTP_OBSERVER_RESUME,
-  RTP_OBSERVER_ADD_PRODUCER,
-  RTP_OBSERVER_REMOVE_PRODUCER,
+  DATAPRODUCER_DUMP,
+  DATAPRODUCER_GET_STATS,
+  DATAPRODUCER_PAUSE,
+  DATAPRODUCER_RESUME,
+  DATACONSUMER_DUMP,
+  DATACONSUMER_GET_STATS,
+  DATACONSUMER_PAUSE,
+  DATACONSUMER_RESUME,
+  DATACONSUMER_GET_BUFFERED_AMOUNT,
+  DATACONSUMER_SET_BUFFERED_AMOUNT_LOW_THRESHOLD,
+  DATACONSUMER_SEND,
+  RTPOBSERVER_PAUSE,
+  RTPOBSERVER_RESUME,
+  RTPOBSERVER_ADD_PRODUCER,
+  RTPOBSERVER_REMOVE_PRODUCER,
 }
 
 union Body {

diff --git a/worker/include/RTC/ActiveSpeakerObserver.hpp b/worker/include/RTC/ActiveSpeakerObserver.hpp
@@ -1,5 +1,5 @@
-#ifndef MS_RTC_ACTIVE_SPEAKER_OBSERVER_HPP
-#define MS_RTC_ACTIVE_SPEAKER_OBSERVER_HPP
+#ifndef MS_RTC_ACTIVESPEAKEROBSERVER_HPP
+#define MS_RTC_ACTIVESPEAKEROBSERVER_HPP
 
 #include "RTC/RtpObserver.hpp"
 #include "RTC/Shared.hpp"

diff --git a/worker/include/RTC/AudioLevelObserver.hpp b/worker/include/RTC/AudioLevelObserver.hpp
@@ -1,5 +1,5 @@
-#ifndef MS_RTC_AUDIO_LEVEL_OBSERVER_HPP
-#define MS_RTC_AUDIO_LEVEL_OBSERVER_HPP
+#ifndef MS_RTC_AUDIOLEVELOBSERVER_HPP
+#define MS_RTC_AUDIOLEVELOBSERVER_HPP
 
 #include "RTC/RtpObserver.hpp"
 #include "RTC/Shared.hpp"

diff --git a/worker/include/RTC/DirectTransport.hpp b/worker/include/RTC/DirectTransport.hpp
@@ -1,5 +1,5 @@
-#ifndef MS_RTC_DIRECT_TRANSPORT_HPP
-#define MS_RTC_DIRECT_TRANSPORT_HPP
+#ifndef MS_RTC_DIRECTTRANSPORT_HPP
+#define MS_RTC_DIRECTTRANSPORT_HPP
 
 #include "RTC/Shared.hpp"
 #include "RTC/Transport.hpp"

diff --git a/worker/include/RTC/PipeConsumer.hpp b/worker/include/RTC/PipeConsumer.hpp
@@ -1,5 +1,5 @@
-#ifndef MS_RTC_PIPE_CONSUMER_HPP
-#define MS_RTC_PIPE_CONSUMER_HPP
+#ifndef MS_RTC_PIPECONSUMER_HPP
+#define MS_RTC_PIPECONSUMER_HPP
 
 #include "RTC/Consumer.hpp"
 #include "RTC/RtpStreamSend.hpp"

diff --git a/worker/include/RTC/PlainTransport.hpp b/worker/include/RTC/PlainTransport.hpp
@@ -1,5 +1,5 @@
-#ifndef MS_RTC_PLAIN_TRANSPORT_HPP
-#define MS_RTC_PLAIN_TRANSPORT_HPP
+#ifndef MS_RTC_PLAINTRANSPORT_HPP
+#define MS_RTC_PLAINTRANSPORT_HPP
 
 #include "FBS/plainTransport_generated.h"
 #include "RTC/Shared.hpp"

diff --git a/worker/include/RTC/RtpObserver.hpp b/worker/include/RTC/RtpObserver.hpp
@@ -1,5 +1,5 @@
-#ifndef MS_RTC_RTP_PACKET_OBSERVER_HPP
-#define MS_RTC_RTP_PACKET_OBSERVER_HPP
+#ifndef MS_RTC_RTPOBSERVER_HPP
+#define MS_RTC_RTPOBSERVER_HPP
 
 #include "common.hpp"
 #include "RTC/Producer.hpp"

diff --git a/worker/include/RTC/WebRtcServer.hpp b/worker/include/RTC/WebRtcServer.hpp
@@ -1,5 +1,5 @@
-#ifndef MS_RTC_WEBRTC_SERVER_HPP
-#define MS_RTC_WEBRTC_SERVER_HPP
+#ifndef MS_RTC_WEBRTCSERVER_HPP
+#define MS_RTC_WEBRTCSERVER_HPP
 
 #include "Channel/ChannelRequest.hpp"
 #include "RTC/IceCandidate.hpp"

diff --git a/worker/include/RTC/WebRtcTransport.hpp b/worker/include/RTC/WebRtcTransport.hpp
@@ -1,5 +1,5 @@
-#ifndef MS_RTC_WEBRTC_TRANSPORT_HPP
-#define MS_RTC_WEBRTC_TRANSPORT_HPP
+#ifndef MS_RTC_WEBRTCTRANSPORT_HPP
+#define MS_RTC_WEBRTCTRANSPORT_HPP
 
 #include "RTC/DtlsTransport.hpp"
 #include "RTC/IceCandidate.hpp"

diff --git a/worker/src/Channel/ChannelNotification.cpp b/worker/src/Channel/ChannelNotification.cpp
@@ -13,8 +13,8 @@ namespace Channel
 	absl::flat_hash_map<FBS::Notification::Event, const char*> ChannelNotification::event2String =
 	{
 		{ FBS::Notification::Event::TRANSPORT_SEND_RTCP, "transport.sendRtcp" },
-		{ FBS::Notification::Event::PRODUCER_SEND,       "producer.send" },
-		{ FBS::Notification::Event::DATA_PRODUCER_SEND,  "dataProducer.send" },
+		{ FBS::Notification::Event::PRODUCER_SEND,       "producer.send"      },
+		{ FBS::Notification::Event::DATAPRODUCER_SEND,   "dataProducer.send"  },
 	};
 	// clang-format on