Changeset 1266 for pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

Timestamp:

May 11, 2007 3:14:34 PM (17 years ago)

Author:

bennylp

Message:

HUGE changeset to make the rest of the libraries compile with C++ mode

File:

• pjproject/trunk/pjmedia/src/pjmedia/sound_port.c (modified) (10 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

@@ -74 +74 @@
                            /* out */  unsigned size)
 {
-    pjmedia_snd_port *snd_port = user_data;
+    pjmedia_snd_port *snd_port = (pjmedia_snd_port*) user_data;
     pjmedia_port *port;
     pjmedia_frame frame;
@@ -112 +112 @@
 
     if (snd_port->plc)
-        pjmedia_plc_save(snd_port->plc, output);
+        pjmedia_plc_save(snd_port->plc, (pj_int16_t*) output);
 
     if (snd_port->ec_state) {
@@ -121 +121 @@
         }
         snd_port->ec_suspend_count = 0;
-        pjmedia_echo_playback(snd_port->ec_state, output);
+        pjmedia_echo_playback(snd_port->ec_state, (pj_int16_t*)output);
     }
 
@@ -137 +137 @@
         if (snd_port->ec_state) {
             /* To maintain correct delay in EC */
-            pjmedia_echo_playback(snd_port->ec_state, output);
+            pjmedia_echo_playback(snd_port->ec_state, (pj_int16_t*)output);
         }
     }
@@ -144 +144 @@
     if (snd_port->plc) {
 
-        pjmedia_plc_generate(snd_port->plc, output);
+        pjmedia_plc_generate(snd_port->plc, (pj_int16_t*) output);
 #ifdef SIMULATE_LOST_PCT
         PJ_LOG(4,(THIS_FILE, "Lost frame generated"));
@@ -166 +166 @@
                           /* in*/    unsigned size)
 {
-    pjmedia_snd_port *snd_port = user_data;
+    pjmedia_snd_port *snd_port = (pjmedia_snd_port*) user_data;
     pjmedia_port *port;
     pjmedia_frame frame;
@@ -182 +182 @@
     /* Cancel echo */
     if (snd_port->ec_state && !snd_port->ec_suspended) {
-        pjmedia_echo_capture(snd_port->ec_state, input, 0);
+        pjmedia_echo_capture(snd_port->ec_state, (pj_int16_t*) input, 0);
     }
 
@@ -327 +327 @@
     PJ_ASSERT_RETURN(pool && p_port, PJ_EINVAL);
 
-    snd_port = pj_pool_zalloc(pool, sizeof(pjmedia_snd_port));
+    snd_port = PJ_POOL_ZALLOC_T(pool, pjmedia_snd_port);
     PJ_ASSERT_RETURN(snd_port, PJ_ENOMEM);
 
@@ -366 +366 @@
     PJ_ASSERT_RETURN(pool && p_port, PJ_EINVAL);
 
-    snd_port = pj_pool_zalloc(pool, sizeof(pjmedia_snd_port));
+    snd_port = PJ_POOL_ZALLOC_T(pool, pjmedia_snd_port);
     PJ_ASSERT_RETURN(snd_port, PJ_ENOMEM);
 
@@ -403 +403 @@
     PJ_ASSERT_RETURN(pool && p_port, PJ_EINVAL);
 
-    snd_port = pj_pool_zalloc(pool, sizeof(pjmedia_snd_port));
+    snd_port = PJ_POOL_ZALLOC_T(pool, pjmedia_snd_port);
     PJ_ASSERT_RETURN(snd_port, PJ_ENOMEM);