Browse Source

Update copy-paste-capi examples reflecting the callback update adding ID.

Hanseul Jun 4 years ago
parent
commit
b3b4c27bb4
2 changed files with 28 additions and 28 deletions
  1. 14 14
      examples/copy-paste-capi/answerer.c
  2. 14 14
      examples/copy-paste-capi/offerer.c

+ 14 - 14
examples/copy-paste-capi/answerer.c

@@ -41,13 +41,13 @@ typedef struct {
         bool connected;
         bool connected;
 } Peer;
 } Peer;
 
 
-static void dataChannelCallback(int dc, void *ptr);
-static void descriptionCallback(const char *sdp, const char *type, void *ptr);
-static void candidateCallback(const char *cand, const char *mid, void *ptr);
-static void stateChangeCallback(rtcState state, void *ptr);
-static void gatheringStateCallback(rtcGatheringState state, void *ptr);
-static void closedCallback(void *ptr);
-static void messageCallback(const char *message, int size, void *ptr);
+static void dataChannelCallback(int pc, int dc, void *ptr);
+static void descriptionCallback(int pc, const char *sdp, const char *type, void *ptr);
+static void candidateCallback(int pc, const char *cand, const char *mid, void *ptr);
+static void stateChangeCallback(int pc, rtcState state, void *ptr);
+static void gatheringStateCallback(int pc, rtcGatheringState state, void *ptr);
+static void closedCallback(int id, void *ptr);
+static void messageCallback(int id, const char *message, int size, void *ptr);
 static void deletePeer(Peer *peer);
 static void deletePeer(Peer *peer);
 
 
 char* state_print(rtcState state);
 char* state_print(rtcState state);
@@ -194,35 +194,35 @@ int main(int argc, char **argv) {
         return 0;
         return 0;
 }
 }
 
 
-static void descriptionCallback(const char *sdp, const char *type, void *ptr) {
+static void descriptionCallback(int pc, const char *sdp, const char *type, void *ptr) {
         // Peer *peer = (Peer *)ptr;
         // Peer *peer = (Peer *)ptr;
         printf("Description %s:\n%s\n", "answerer", sdp);
         printf("Description %s:\n%s\n", "answerer", sdp);
 }
 }
 
 
-static void candidateCallback(const char *cand, const char *mid, void *ptr) {
+static void candidateCallback(int pc, const char *cand, const char *mid, void *ptr) {
         // Peer *peer = (Peer *)ptr;
         // Peer *peer = (Peer *)ptr;
         printf("Candidate %s: %s\n", "answerer", cand);
         printf("Candidate %s: %s\n", "answerer", cand);
 
 
 }
 }
 
 
-static void stateChangeCallback(rtcState state, void *ptr) {
+static void stateChangeCallback(int pc, rtcState state, void *ptr) {
         Peer *peer = (Peer *)ptr;
         Peer *peer = (Peer *)ptr;
         peer->state = state;
         peer->state = state;
         printf("State %s: %s\n", "answerer", state_print(state));
         printf("State %s: %s\n", "answerer", state_print(state));
 }
 }
 
 
-static void gatheringStateCallback(rtcGatheringState state, void *ptr) {
+static void gatheringStateCallback(int pc, rtcGatheringState state, void *ptr) {
         Peer *peer = (Peer *)ptr;
         Peer *peer = (Peer *)ptr;
         peer->gatheringState = state;
         peer->gatheringState = state;
         printf("Gathering state %s: %s\n", "answerer", rtcGatheringState_print(state));
         printf("Gathering state %s: %s\n", "answerer", rtcGatheringState_print(state));
 }
 }
 
 
-static void closedCallback(void *ptr) {
+static void closedCallback(int id, void *ptr) {
         Peer *peer = (Peer *)ptr;
         Peer *peer = (Peer *)ptr;
         peer->connected = false;
         peer->connected = false;
 }
 }
 
 
-static void messageCallback(const char *message, int size, void *ptr) {
+static void messageCallback(int id, const char *message, int size, void *ptr) {
         if (size < 0) { // negative size indicates a null-terminated string
         if (size < 0) { // negative size indicates a null-terminated string
                 printf("Message %s: %s\n", "answerer", message);
                 printf("Message %s: %s\n", "answerer", message);
         } else {
         } else {
@@ -240,7 +240,7 @@ static void deletePeer(Peer *peer) {
         }
         }
 }
 }
 
 
-static void dataChannelCallback(int dc, void *ptr) {
+static void dataChannelCallback(int pc, int dc, void *ptr) {
         Peer *peer = (Peer *)ptr;
         Peer *peer = (Peer *)ptr;
         peer->dc = dc;
         peer->dc = dc;
         peer->connected = true;
         peer->connected = true;

+ 14 - 14
examples/copy-paste-capi/offerer.c

@@ -41,13 +41,13 @@ typedef struct {
         bool connected;
         bool connected;
 } Peer;
 } Peer;
 
 
-static void descriptionCallback(const char *sdp, const char *type, void *ptr);
-static void candidateCallback(const char *cand, const char *mid, void *ptr);
-static void stateChangeCallback(rtcState state, void *ptr);
-static void gatheringStateCallback(rtcGatheringState state, void *ptr);
-static void openCallback(void *ptr);
-static void closedCallback(void *ptr);
-static void messageCallback(const char *message, int size, void *ptr);
+static void descriptionCallback(int pc, const char *sdp, const char *type, void *ptr);
+static void candidateCallback(int pc, const char *cand, const char *mid, void *ptr);
+static void stateChangeCallback(int pc, rtcState state, void *ptr);
+static void gatheringStateCallback(int pc, rtcGatheringState state, void *ptr);
+static void openCallback(int id, void *ptr);
+static void closedCallback(int id, void *ptr);
+static void messageCallback(int id, const char *message, int size, void *ptr);
 static void deletePeer(Peer *peer);
 static void deletePeer(Peer *peer);
 
 
 char *state_print(rtcState state);
 char *state_print(rtcState state);
@@ -199,30 +199,30 @@ int main(int argc, char **argv){
         return 0;
         return 0;
 }
 }
 
 
-static void descriptionCallback(const char *sdp, const char *type, void *ptr) {
+static void descriptionCallback(int pc, const char *sdp, const char *type, void *ptr) {
         // Peer *peer = (Peer *)ptr;
         // Peer *peer = (Peer *)ptr;
         printf("Description %s:\n%s\n", "offerer", sdp);
         printf("Description %s:\n%s\n", "offerer", sdp);
 }
 }
 
 
-static void candidateCallback(const char *cand, const char *mid, void *ptr) {
+static void candidateCallback(int pc, const char *cand, const char *mid, void *ptr) {
         // Peer *peer = (Peer *)ptr;
         // Peer *peer = (Peer *)ptr;
         printf("Candidate %s: %s\n", "offerer", cand);
         printf("Candidate %s: %s\n", "offerer", cand);
 
 
 }
 }
 
 
-static void stateChangeCallback(rtcState state, void *ptr) {
+static void stateChangeCallback(int pc, rtcState state, void *ptr) {
         Peer *peer = (Peer *)ptr;
         Peer *peer = (Peer *)ptr;
         peer->state = state;
         peer->state = state;
         printf("State %s: %s\n", "offerer", state_print(state));
         printf("State %s: %s\n", "offerer", state_print(state));
 }
 }
 
 
-static void gatheringStateCallback(rtcGatheringState state, void *ptr) {
+static void gatheringStateCallback(int pc, rtcGatheringState state, void *ptr) {
         Peer *peer = (Peer *)ptr;
         Peer *peer = (Peer *)ptr;
         peer->gatheringState = state;
         peer->gatheringState = state;
         printf("Gathering state %s: %s\n", "offerer", rtcGatheringState_print(state));
         printf("Gathering state %s: %s\n", "offerer", rtcGatheringState_print(state));
 }
 }
 
 
-static void openCallback(void *ptr) {
+static void openCallback(int id, void *ptr) {
         Peer *peer = (Peer *)ptr;
         Peer *peer = (Peer *)ptr;
         peer->connected = true;
         peer->connected = true;
         char buffer[256];
         char buffer[256];
@@ -230,12 +230,12 @@ static void openCallback(void *ptr) {
                 printf("DataChannel %s: Received with label \"%s\"\n","offerer", buffer);
                 printf("DataChannel %s: Received with label \"%s\"\n","offerer", buffer);
 }
 }
 
 
-static void closedCallback(void *ptr) {
+static void closedCallback(int id, void *ptr) {
         Peer *peer = (Peer *)ptr;
         Peer *peer = (Peer *)ptr;
         peer->connected = false;
         peer->connected = false;
 }
 }
 
 
-static void messageCallback(const char *message, int size, void *ptr) {
+static void messageCallback(int id, const char *message, int size, void *ptr) {
         // Peer *peer = (Peer *)ptr;
         // Peer *peer = (Peer *)ptr;
         if (size < 0) { // negative size indicates a null-terminated string
         if (size < 0) { // negative size indicates a null-terminated string
                 printf("Message %s: %s\n", "offerer", message);
                 printf("Message %s: %s\n", "offerer", message);