Changeset 481

Timestamp:

May 28, 2006 2:55:22 PM (18 years ago)

Author:

bennylp

Message:

Sound device id zero mean autoselect device

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• conference.c (modified) (3 diffs)
• pasound.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/conference.c

@@ -193 +193 @@
 static pj_status_t get_frame(pjmedia_port *this_port, 
                              pjmedia_frame *frame);
+static pj_status_t destroy_port(pjmedia_port *this_port);
 
 
@@ -455 +456 @@
     conf->master_port->get_frame = &get_frame;
     conf->master_port->put_frame = &put_frame;
+    conf->master_port->on_destroy = &destroy_port;
 
     conf->master_port->user_data = conf;
@@ -532 +534 @@
 
     return PJ_SUCCESS;
+}
+
+
+/*
+ * Destroy the master port (will destroy the conference)
+ */
+static pj_status_t destroy_port(pjmedia_port *this_port)
+{
+    pjmedia_conf *conf = this_port->user_data;
+    return pjmedia_conf_destroy(conf);
 }
 

pjproject/trunk/pjmedia/src/pjmedia/pasound.c

@@ -244 +244 @@
     PaError err;
 
-    if (index == -1) {
+    if (index <= 0) {
         int count = Pa_GetDeviceCount();
         for (index=0; index<count; ++index) {
@@ -337 +337 @@
     PaError err;
 
-    if (index == -1) {
+    if (index <= 0) {
         int count = Pa_GetDeviceCount();
         for (index=0; index<count; ++index) {
@@ -439 +439 @@
     PaError err;
 
-    if (rec_id == -1) {
+    if (rec_id <= 0) {
         int count = Pa_GetDeviceCount();
         for (rec_id=0; rec_id<count; ++rec_id) {
@@ -458 +458 @@
     }
 
-    if (play_id == -1) {
+    if (play_id <= 0) {
         int count = Pa_GetDeviceCount();
         for (play_id=0; play_id<count; ++play_id) {