Browse Source

Fixes to C API

Paul-Louis Ageneau 6 years ago
parent
commit
c778ad802a
2 changed files with 7 additions and 10 deletions
  1. 3 4
      include/rtc/rtc.h
  2. 4 6
      src/rtc.cpp

+ 3 - 4
include/rtc/rtc.h

@@ -26,12 +26,11 @@ void rtcDeletePeerConnection(int pc);
 int rtcCreateDataChannel(int pc, const char *label);
 int rtcCreateDataChannel(int pc, const char *label);
 void rtcDeleteDataChannel(int dc);
 void rtcDeleteDataChannel(int dc);
 void rtcSetDataChannelCallback(int pc, void (*dataChannelCallback)(int, void *));
 void rtcSetDataChannelCallback(int pc, void (*dataChannelCallback)(int, void *));
-void rtcSetLocalDescriptionCallback(int pc, void (*descriptionCallback)(const char *, const char *,
-                                                                        void *));
+void rtcSetLocalDescriptionCallback(int pc, void (*descriptionCallback)(const char *, void *));
 void rtcSetLocalCandidateCallback(int pc,
 void rtcSetLocalCandidateCallback(int pc,
                                   void (*candidateCallback)(const char *, const char *, void *));
                                   void (*candidateCallback)(const char *, const char *, void *));
-void rtcSetRemoteDescription(int pc, const char *sdp, const char *type);
-void rtcSetRemoteCandidate(int pc, const char *candidate, const char *sdpMid);
+void rtcSetRemoteDescription(int pc, const char *sdp);
+void rtcAddRemoteCandidate(int pc, const char *candidate, const char *mid);
 int rtcGetDataChannelLabel(int dc, char *data, int size);
 int rtcGetDataChannelLabel(int dc, char *data, int size);
 void rtcSetOpenCallback(int dc, void (*openCallback)(void *));
 void rtcSetOpenCallback(int dc, void (*openCallback)(void *));
 void rtcSetErrorCallback(int dc, void (*errorCallback)(const char *, void *));
 void rtcSetErrorCallback(int dc, void (*errorCallback)(const char *, void *));

+ 4 - 6
src/rtc.cpp

@@ -75,8 +75,7 @@ void rtcSetDataChannelCallback(int pc, void (*dataChannelCallback)(int, void *))
 	});
 	});
 }
 }
 
 
-void rtcSetLocalDescriptionCallback(int pc, void (*descriptionCallback)(const char *, const char *,
-                                                                        void *)) {
+void rtcSetLocalDescriptionCallback(int pc, void (*descriptionCallback)(const char *, void *)) {
 	auto it = peerConnectionMap.find(pc);
 	auto it = peerConnectionMap.find(pc);
 	if (it == peerConnectionMap.end())
 	if (it == peerConnectionMap.end())
 		return;
 		return;
@@ -85,8 +84,7 @@ void rtcSetLocalDescriptionCallback(int pc, void (*descriptionCallback)(const ch
 		void *userPointer = nullptr;
 		void *userPointer = nullptr;
 		if (auto jt = userPointerMap.find(pc); jt != userPointerMap.end())
 		if (auto jt = userPointerMap.find(pc); jt != userPointerMap.end())
 			userPointer = jt->second;
 			userPointer = jt->second;
-		string type = "offer";
-		descriptionCallback(string(description).c_str(), type.c_str(), userPointer);
+		descriptionCallback(string(description).c_str(), userPointer);
 	});
 	});
 }
 }
 
 
@@ -110,7 +108,7 @@ void rtcSetLocalCandidateCallback(int pc,
 	    });
 	    });
 }
 }
 
 
-void rtcSetRemoteDescription(int pc, const char *sdp, const char *type) {
+void rtcSetRemoteDescription(int pc, const char *sdp) {
 	auto it = peerConnectionMap.find(pc);
 	auto it = peerConnectionMap.find(pc);
 	if (it == peerConnectionMap.end())
 	if (it == peerConnectionMap.end())
 		return;
 		return;
@@ -118,7 +116,7 @@ void rtcSetRemoteDescription(int pc, const char *sdp, const char *type) {
 	it->second->setRemoteDescription(Description(string(sdp)));
 	it->second->setRemoteDescription(Description(string(sdp)));
 }
 }
 
 
-void rtcSetRemoteCandidate(int pc, const char *candidate, const char *mid) {
+void rtcAddRemoteCandidate(int pc, const char *candidate, const char *mid) {
 	auto it = peerConnectionMap.find(pc);
 	auto it = peerConnectionMap.find(pc);
 	if (it == peerConnectionMap.end())
 	if (it == peerConnectionMap.end())
 		return;
 		return;