Changeset 633 for pjproject/trunk/pjmedia/src/pjmedia/wav_player.c

Timestamp:

Jul 29, 2006 11:14:47 AM (18 years ago)

Author:

bennylp

Message:

Added pjmedia_port_info_init() to fill in pjmedia_port_info structure, avoiding manual initialization and thus improves consistency (and probably reduces size by a tiny bit). This involves modification in quite few places.

File:

• pjproject/trunk/pjmedia/src/pjmedia/wav_player.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia/wav_player.c

@@ -78 +78 @@
 static struct file_port *create_file_port(pj_pool_t *pool)
 {
+    const pj_str_t name = pj_str("file");
     struct file_port *port;
 
@@ -84 +85 @@
         return NULL;
 
-    port->base.info.name = pj_str("file");
-    port->base.info.signature = SIGNATURE;
-    port->base.info.type = PJMEDIA_TYPE_AUDIO;
-    port->base.info.has_info = PJ_TRUE;
-    port->base.info.need_info = PJ_FALSE;
-    port->base.info.pt = 0xFF;
-    port->base.info.encoding_name = pj_str("pcm");
+    /* Put in default values.
+     * These will be overriden once the file is read.
+     */
+    pjmedia_port_info_init(&port->base.info, &name, SIGNATURE, 
+                           8000, 1, 16, 80);
 
     port->base.put_frame = &file_put_frame;
@@ -96 +95 @@
     port->base.on_destroy = &file_on_destroy;
 
-
-    /* Put in default values.
-     * These will be overriden once the file is read.
-     */
-    port->base.info.clock_rate = 8000;
-    port->base.info.bits_per_sample = 16;
-    port->base.info.samples_per_frame = 160;
-    port->base.info.bytes_per_frame = 320;
 
     return port;
@@ -151 +142 @@
 
                 fport->eof = PJ_TRUE;
-                status = (*fport->cb)(&fport->base, fport->base.user_data);
+                status=(*fport->cb)(&fport->base,fport->base.port_data.pdata);
                 if (status != PJ_SUCCESS) {
                     /* This will crash if file port is destroyed in the 
@@ -425 +416 @@
     fport = (struct file_port*) port;
 
-    fport->base.user_data = user_data;
+    fport->base.port_data.pdata = user_data;
     fport->cb = cb;