Changeset 3159

Timestamp:

May 5, 2010 4:23:27 AM (14 years ago)

Author:

ming

Message:

Implemented ticket #1065: audiodev register/unregister feature

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia-audiodev/audiodev.h (modified) (3 diffs)
• src/pjmedia-audiodev/audiodev.c (modified) (2 diffs)

pjproject/trunk/pjmedia/include/pjmedia-audiodev/audiodev.h

@@ -40 +40 @@
  */
 
-/** 
+/**
  * Type for device index.
  */
@@ -429 +429 @@
 typedef struct pjmedia_aud_dev_factory pjmedia_aud_dev_factory;
 
+/* typedef for factory creation function */
+typedef pjmedia_aud_dev_factory*
+(*pjmedia_aud_dev_factory_create_func_ptr)(pj_pool_factory*);
+
+
 /**
  * Get string info for the specified capability.
@@ -508 +513 @@
  */
 PJ_DECL(pj_status_t) pjmedia_aud_subsys_shutdown(void);
+
+
+/**
+ * Register a supported audio device factory to the audio subsystem. This
+ * function can only be called after calling #pjmedia_aud_subsys_init().
+ *
+ * @param adf           The audio device factory.
+ *
+ * @return              PJ_SUCCESS on successful operation or the appropriate
+ *                      error code.
+ */
+PJ_DECL(pj_status_t)
+pjmedia_aud_register_factory(pjmedia_aud_dev_factory_create_func_ptr adf);
+
+
+/**
+ * Unregister an audio device factory from the audio subsystem. This
+ * function can only be called after calling #pjmedia_aud_subsys_init().
+ * Devices from this factory will be unlisted. If a device from this factory
+ * is currently in use, then the behavior is undefined.
+ *
+ * @param adf           The audio device factory.
+ *
+ * @return              PJ_SUCCESS on successful operation or the appropriate
+ *                      error code.
+ */
+PJ_DECL(pj_status_t)
+pjmedia_aud_unregister_factory(pjmedia_aud_dev_factory_create_func_ptr adf);
 
 

pjproject/trunk/pjmedia/src/pjmedia-audiodev/audiodev.c

@@ -98 +98 @@
 #define MAX_DEVS        64
 
-/* typedef for factory creation function */
-typedef pjmedia_aud_dev_factory*  (*create_func_ptr)(pj_pool_factory*);
 
 /* driver structure */
 struct driver
 {
-    create_func_ptr          create;    /* Creation function.               */
-    pjmedia_aud_dev_factory *f;         /* Factory instance.                */
+    /* Creation function */
+    pjmedia_aud_dev_factory_create_func_ptr create;
+    /* Factory instance */
+    pjmedia_aud_dev_factory *f;
     char                     name[32];  /* Driver name                      */
     unsigned                 dev_cnt;   /* Number of devices                */
@@ -409 +409 @@
 
     return aud_subsys.dev_cnt ? PJ_SUCCESS : status;
+}
+
+/* API: register an audio device factory to the audio subsystem. */
+PJ_DEF(pj_status_t)
+pjmedia_aud_register_factory(pjmedia_aud_dev_factory_create_func_ptr adf)
+{
+    pj_status_t status;
+
+    if (aud_subsys.init_count == 0)
+        return PJMEDIA_EAUD_INIT;
+
+    aud_subsys.drv[aud_subsys.drv_cnt].create = adf;
+    status = init_driver(aud_subsys.drv_cnt);
+    if (status == PJ_SUCCESS) {
+        aud_subsys.drv_cnt++;
+    } else {
+        deinit_driver(aud_subsys.drv_cnt);
+    }
+
+    return status;
+}
+
+/* API: unregister an audio device factory from the audio subsystem. */
+PJ_DEF(pj_status_t)
+pjmedia_aud_unregister_factory(pjmedia_aud_dev_factory_create_func_ptr adf)
+{
+    unsigned i, j;
+
+    if (aud_subsys.init_count == 0)
+        return PJMEDIA_EAUD_INIT;
+
+    for (i=0; i<aud_subsys.drv_cnt; ++i) {
+        struct driver *drv = &aud_subsys.drv[i];
+
+        if (drv->create == adf) {
+            for (j = drv->start_idx; j < drv->start_idx + drv->dev_cnt; j++)
+            {
+                aud_subsys.dev_list[j] = PJMEDIA_AUD_INVALID_DEV;
+            }
+
+            deinit_driver(i);
+            pj_bzero(drv, sizeof(*drv));
+            return PJ_SUCCESS;
+        }
+    }
+
+    return PJMEDIA_EAUD_ERR;
 }