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

Timestamp:

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

Author:

bennylp

Message:

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

File:

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

pjproject/trunk/pjmedia/src/pjmedia/jbuf.c

@@ -31 +31 @@
 
 
-struct jb_framelist
+typedef struct jb_framelist_t
 {
     char        *flist_buffer;
@@ -41 +41 @@
     unsigned     flist_tail;
     unsigned     flist_origin;
-};
-
-
-typedef struct jb_framelist jb_framelist;
+} jb_framelist_t;
+
 
 struct pjmedia_jbuf
 {
     pj_str_t        name;                 // jitter buffer name
-    jb_framelist    jb_framelist;
+    jb_framelist_t  jb_framelist;
     pj_size_t       jb_frame_size;        // frame size 
     unsigned        jb_frame_ptime;       // frame duration.
@@ -93 +91 @@
 
 static pj_status_t jb_framelist_init( pj_pool_t *pool,
-                                      jb_framelist *framelist,
+                                      jb_framelist_t *framelist,
                                       unsigned frame_size,
                                       unsigned max_count) 
@@ -99 +97 @@
     PJ_ASSERT_RETURN(pool && framelist, PJ_EINVAL);
 
-    pj_bzero(framelist, sizeof(jb_framelist));
+    pj_bzero(framelist, sizeof(jb_framelist_t));
 
     framelist->flist_frame_size = frame_size;
     framelist->flist_max_count = max_count;
-    framelist->flist_buffer = pj_pool_zalloc(pool,
+    framelist->flist_buffer = (char*) 
+                              pj_pool_zalloc(pool,
                                              framelist->flist_frame_size * 
                                              framelist->flist_max_count);
 
-    framelist->flist_frame_type = 
+    framelist->flist_frame_type = (int*)
         pj_pool_zalloc(pool, sizeof(framelist->flist_frame_type[0]) * 
                                 framelist->flist_max_count);
@@ -117 +116 @@
 }
 
-static pj_status_t jb_framelist_destroy(jb_framelist *framelist) 
+static pj_status_t jb_framelist_destroy(jb_framelist_t *framelist) 
 {
     PJ_UNUSED_ARG(framelist);
@@ -124 +123 @@
 
 
-static unsigned jb_framelist_size(jb_framelist *framelist) 
+static unsigned jb_framelist_size(jb_framelist_t *framelist) 
 {
     if (framelist->flist_tail == framelist->flist_head) {
@@ -135 +134 @@
 
 
-static pj_bool_t jb_framelist_get(jb_framelist *framelist,
+static pj_bool_t jb_framelist_get(jb_framelist_t *framelist,
                                   void *frame,
                                   pjmedia_jb_frame_type *p_type) 
@@ -168 +167 @@
 
 
-static void jb_framelist_remove_head( jb_framelist *framelist,
+static void jb_framelist_remove_head( jb_framelist_t *framelist,
                                       unsigned count) 
 {
@@ -215 +214 @@
 
 
-static pj_bool_t jb_framelist_put_at(jb_framelist *framelist,
+static pj_bool_t jb_framelist_put_at(jb_framelist_t *framelist,
                                      unsigned index,
                                      const void *frame,
@@ -283 +282 @@
     pj_status_t status;
 
-    jb = pj_pool_zalloc(pool, sizeof(pjmedia_jbuf));
+    jb = PJ_POOL_ZALLOC_T(pool, pjmedia_jbuf);
 
     status = jb_framelist_init(pool, &jb->jb_framelist, frame_size, max_count);