Changeset 2234

Timestamp:

02/18/99 14:11:06 (14 years ago)

Author:

ucaccsp

Message:

Remove support for multiple mbus channels. Note that the session struct has
changed, so you'll have to make clean.

Location:

rat/trunk

Files:

• main.c (modified) (4 diffs)
• mbus_engine.c (modified) (58 diffs)
• net.c (modified) (1 diff)
• rtcp_db.c (modified) (1 diff)
• session.c (modified) (3 diffs)
• session.h (modified) (1 diff)
• tcltk.c (modified) (1 diff)
• ui.c (modified) (61 diffs)

rat/trunk/main.c

@@ -121 +121 @@
         if (sp[0]->mode == AUDIO_TOOL) {
                 sprintf(mbus_engine_addr, "(audio engine rat %lu)", (u_int32) getpid());
-                sp[0]->mbus_engine_base = mbus_init(0, mbus_engine_rx, NULL); 
-                mbus_addr(sp[0]->mbus_engine_base, mbus_engine_addr);
-                if (sp[0]->mbus_channel == 0) {
-                        sp[0]->mbus_engine_conf = sp[0]->mbus_engine_base;
-                } else {
-                        sp[0]->mbus_engine_conf = mbus_init((short)sp[0]->mbus_channel, mbus_engine_rx, NULL); 
-                        mbus_addr(sp[0]->mbus_engine_conf, mbus_engine_addr);
-                }
+                sp[0]->mbus_engine = mbus_init(0, mbus_engine_rx, NULL); 
+                mbus_addr(sp[0]->mbus_engine, mbus_engine_addr);
 
                 if (sp[0]->ui_on) {
                         sprintf(mbus_ui_addr, "(audio ui rat %lu)", (u_int32) getpid());
-                        sp[0]->mbus_ui_base = mbus_init(0, mbus_ui_rx, NULL);
-                        mbus_addr(sp[0]->mbus_ui_base, mbus_ui_addr);
-                        if (sp[0]->mbus_channel == 0) {
-                                sp[0]->mbus_ui_conf = sp[0]->mbus_ui_base;
-                        } else {
-                                sp[0]->mbus_ui_conf = mbus_init((short)sp[0]->mbus_channel, mbus_ui_rx, NULL);
-                                mbus_addr(sp[0]->mbus_ui_conf, mbus_ui_addr);
-                        }
+                        sp[0]->mbus_ui = mbus_init(0, mbus_ui_rx, NULL);
+                        mbus_addr(sp[0]->mbus_ui, mbus_ui_addr);
                         tcl_init(sp[0], argc, argv, mbus_engine_addr);
                 } else {
@@ -154 +142 @@
         do {
                 network_process_mbus(sp[0]);
-                mbus_heartbeat(sp[0]->mbus_engine_base, 1);
+                mbus_heartbeat(sp[0]->mbus_engine, 1);
                 usleep(20000);
         } while (sp[0]->wait_on_startup);
@@ -273 +261 @@
                         if (sp[i]->ui_on) {
                                 tcl_process_events(sp[i]);
-                                mbus_send(sp[i]->mbus_ui_base); mbus_retransmit(sp[i]->mbus_ui_base);
-                                mbus_send(sp[i]->mbus_ui_conf); mbus_retransmit(sp[i]->mbus_ui_conf);
+                                mbus_send(sp[i]->mbus_ui); mbus_retransmit(sp[i]->mbus_ui);
                         }
-                        mbus_retransmit(sp[i]->mbus_engine_base);
-                        mbus_retransmit(sp[i]->mbus_engine_conf);
-                        mbus_send(sp[i]->mbus_engine_base); 
-                        mbus_send(sp[i]->mbus_engine_conf); 
-                        mbus_recv(sp[i]->mbus_engine_base, (void *) sp[i]);
-                        mbus_recv(sp[i]->mbus_ui_base    , (void *) sp[i]);
-                        if (sp[i]->mbus_channel != 0) {
-                                mbus_recv(sp[i]->mbus_engine_conf, (void *) sp[i]);
-                                mbus_recv(sp[i]->mbus_ui_conf    , (void *) sp[i]);
-                        }
-                        mbus_heartbeat(sp[i]->mbus_engine_base, 10);
+                        mbus_retransmit(sp[i]->mbus_engine);
+                        mbus_send(sp[i]->mbus_engine); 
+                        mbus_recv(sp[i]->mbus_engine, (void *) sp[i]);
+                        mbus_recv(sp[i]->mbus_ui    , (void *) sp[i]);
+                        mbus_heartbeat(sp[i]->mbus_engine, 10);
 
                         /* wait for mbus messages - closing audio device
@@ -314 +295 @@
 
         if (sp[0]->mode == AUDIO_TOOL) {
-                if (sp[0]->mbus_engine_conf != sp[0]->mbus_engine_base) {
-                        mbus_exit(sp[0]->mbus_engine_conf);
-                }
-                mbus_exit(sp[0]->mbus_engine_base);
-
+                mbus_exit(sp[0]->mbus_engine);
                 if (sp[0]->ui_on) {
-                        if (sp[0]->mbus_ui_base != sp[0]->mbus_ui_base) {
-                                mbus_exit(sp[0]->mbus_ui_conf);
-                        }
-                        mbus_exit(sp[0]->mbus_ui_base);
+                        mbus_exit(sp[0]->mbus_ui);
                 }
         }

rat/trunk/mbus_engine.c

@@ -103 +103 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 sp->meter = i;
                 ui_input_level(sp, 0);
@@ -111 +111 @@
                 printf("mbus: usage \"tool.rat.powermeter <boolean>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -120 +120 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 sp->detect_silence = i;
         } else {
                 printf("mbus: usage \"tool.rat.silence <boolean>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -135 +135 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 sp->render_3d = (i ? 1 : 0);
         } else {
                 printf("mbus: usage \"tool.rat.3d.enabled <boolean>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -152 +152 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &cname) &&
-            mbus_parse_str(sp->mbus_engine_conf, &filter_name) &&
-            mbus_parse_int(sp->mbus_engine_conf, &filter_length) &&
-            mbus_parse_int(sp->mbus_engine_conf, &azimuth)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &cname) &&
+            mbus_parse_str(sp->mbus_engine, &filter_name) &&
+            mbus_parse_int(sp->mbus_engine, &filter_length) &&
+            mbus_parse_int(sp->mbus_engine, &azimuth)) {
 
                 mbus_decode_str(cname);
@@ -173 +173 @@
                 printf("mbus: usage \"tool.rat.3d.user.settings <cname> <filter name> <filter len> <azimuth>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -184 +184 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &cname)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &cname)) {
                 mbus_decode_str(cname);
                 e = rtcp_get_dbentry_by_cname(sp, cname);
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 
         if (e) {
@@ -204 +204 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 sp->lecture = i;
         } else {
                 printf("mbus: usage \"tool.rat.lecture <boolean>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -219 +219 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
-                if (sp->mbus_channel != 0) {
-                        sp->sync_on = i;
-                } else {
-                        ui_update_sync(sp, FALSE);
-                }
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
+                sp->sync_on = i;
         } else {
                 printf("mbus: usage \"tool.rat.sync <boolean>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -238 +234 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 sp->agc_on = i;
         } else {
                 printf("mbus: usage \"tool.rat.agc <boolean>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -253 +249 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 if (i) {
                         audio_loopback(sp->audio_device, 100);
@@ -263 +259 @@
                 printf("mbus: usage \"tool.rat.audio.loopback <boolean>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -272 +268 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 sp->echo_suppress = i;
                 if (sp->echo_suppress) {
@@ -281 +277 @@
                 printf("mbus: usage \"tool.rat.echo.suppress <boolean>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -290 +286 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 assert(sp->channel_coder != NULL);
                 channel_encoder_set_units_per_packet(sp->channel_coder, (u_int16)i);
@@ -297 +293 @@
                 printf("mbus: usage \"tool.rat.rate <integer>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -306 +302 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 if (i) {
                         if (tx_is_sending(sp->tb)) {
@@ -322 +318 @@
                 printf("mbus: usage \"audio.input.mute <boolean>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -331 +327 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 sp->input_gain = i;
                 audio_set_gain(sp->audio_device, sp->input_gain);
@@ -339 +335 @@
                 printf("mbus: usage \"audio.input.gain <integer>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -348 +344 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &s)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &s)) {
                 s = mbus_decode_str(s);
                 if (strcmp(s, "microphone") == 0) {
@@ -366 +362 @@
                 debug_msg("mbus: usage \"audio.input.port <port>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -375 +371 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 sp->playing_audio = !i; 
                 ui_update_output_port(sp);
@@ -382 +378 @@
                 printf("mbus: usage \"audio.output.mute <boolean>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -391 +387 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 sp->output_gain = i;
                 audio_set_volume(sp->audio_device, sp->output_gain);
@@ -398 +394 @@
                 printf("mbus: usage \"audio.output.gain <integer>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -407 +403 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &s)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &s)) {
                 s = mbus_decode_str(s);
                 if (strcmp(s, "speaker") == 0) {
@@ -422 +418 @@
                 printf("mbus: usage \"audio.output.port <port>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
         sp->output_mode = audio_get_oport(sp->audio_device);
         ui_update_output_port(sp);
@@ -433 +429 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &s)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &s)) {
                 s = mbus_decode_str(s);
                 sp->repair = repair_get_by_name(s);
@@ -440 +436 @@
                 printf("mbus: usage \"audio.channel.repair <repair>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -450 +446 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &key)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &key)) {
                 Set_Key(mbus_decode_str(key));
         } else {
                 printf("mbus: usage \"security.encryption.key <key>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -476 +472 @@
         UNUSED(sp);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &file)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &file)) {
                 mbus_decode_str(file);
                 if (sp->in_file) snd_read_close(&sp->in_file);
@@ -486 +482 @@
                 printf("mbus: usage \"audio.file.play.open <filename>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 
         if (sp->in_file) ui_update_playback_file(sp, file);
@@ -498 +494 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-
-        if (mbus_parse_int(sp->mbus_engine_conf, &pause)) {
+        mbus_parse_init(sp->mbus_engine, args);
+
+        if (mbus_parse_int(sp->mbus_engine, &pause)) {
                 if (sp->in_file) {
                         if (pause) {
@@ -511 +507 @@
                 printf("mbus: usage \"audio.file.play.pause <bool>\"\n");        
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -539 +535 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &file)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &file)) {
                 const audio_format *ofmt;
                 ofmt = audio_get_ofmt(sp->audio_device);
@@ -552 +548 @@
                 printf("mbus: usage \"audio.file.record.open <filename>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
         
         if (sp->out_file) ui_update_record_file(sp, file);
@@ -563 +559 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-
-        if (mbus_parse_int(sp->mbus_engine_conf, &pause)) {
+        mbus_parse_init(sp->mbus_engine, args);
+
+        if (mbus_parse_int(sp->mbus_engine, &pause)) {
                 if (sp->out_file) {
                         if (pause) {
@@ -576 +572 @@
                 printf("mbus: usage \"audio.file.record.pause <bool>\"\n");        
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -596 +592 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &s)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &s)) {
                 s = mbus_decode_str(s);
                 purge_chars(s, "[]()");
@@ -625 +621 @@
                 printf("mbus: usage \"audio.device <string>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
         
         sp->next_selected_device = next_device;
@@ -636 +632 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &cname) && (strcmp(mbus_decode_str(cname), sp->db->my_dbe->sentry->cname) == 0) && mbus_parse_str(sp->mbus_engine_conf, &arg)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &cname) && (strcmp(mbus_decode_str(cname), sp->db->my_dbe->sentry->cname) == 0) && mbus_parse_str(sp->mbus_engine, &arg)) {
                 rtcp_set_attribute(sp, RTCP_SDES_NAME,  mbus_decode_str(arg));
         } else {
                 printf("mbus: usage \"rtp_source_name <cname> <name>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -651 +647 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &cname) && (strcmp(mbus_decode_str(cname), sp->db->my_dbe->sentry->cname) == 0) && mbus_parse_str(sp->mbus_engine_conf, &arg)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &cname) && (strcmp(mbus_decode_str(cname), sp->db->my_dbe->sentry->cname) == 0) && mbus_parse_str(sp->mbus_engine, &arg)) {
                 rtcp_set_attribute(sp, RTCP_SDES_EMAIL,  mbus_decode_str(arg));
         } else {
                 printf("mbus: usage \"rtp_source_email <cname> <email>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -666 +662 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &cname) && (strcmp(mbus_decode_str(cname), sp->db->my_dbe->sentry->cname) == 0) && mbus_parse_str(sp->mbus_engine_conf, &arg)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &cname) && (strcmp(mbus_decode_str(cname), sp->db->my_dbe->sentry->cname) == 0) && mbus_parse_str(sp->mbus_engine, &arg)) {
                 rtcp_set_attribute(sp, RTCP_SDES_PHONE,  mbus_decode_str(arg));
         } else {
                 printf("mbus: usage \"rtp_source_phone <cname> <phone>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -681 +677 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &cname) && (strcmp(mbus_decode_str(cname), sp->db->my_dbe->sentry->cname) == 0) && mbus_parse_str(sp->mbus_engine_conf, &arg)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &cname) && (strcmp(mbus_decode_str(cname), sp->db->my_dbe->sentry->cname) == 0) && mbus_parse_str(sp->mbus_engine, &arg)) {
                 rtcp_set_attribute(sp, RTCP_SDES_LOC,  mbus_decode_str(arg));
         } else {
                 printf("mbus: usage \"rtp_source_loc <cname> <loc>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -698 +694 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &cname) && mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &cname) && mbus_parse_int(sp->mbus_engine, &i)) {
                 mbus_decode_str(cname);
                 e = rtcp_get_dbentry_by_cname(sp, cname);
@@ -709 +705 @@
                 printf("mbus: usage \"rtp_source_mute <cname> <bool>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -721 +717 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &cname) && mbus_parse_int(sp->mbus_engine_conf, &playout)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &cname) && mbus_parse_int(sp->mbus_engine, &playout)) {
                 for (e = sp->db->ssrc_db; e != NULL; e = e->next) {
                         if (strcmp(e->sentry->cname, mbus_decode_str(cname)) == 0) break;
@@ -731 +727 @@
                 printf("mbus: usage \"rtp_source_playout <cname> <playout>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -744 +740 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &short_name) &&
-            mbus_parse_str(sp->mbus_engine_conf, &schan) &&
-            mbus_parse_str(sp->mbus_engine_conf, &sfreq)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &short_name) &&
+            mbus_parse_str(sp->mbus_engine, &schan) &&
+            mbus_parse_str(sp->mbus_engine, &sfreq)) {
                 mbus_decode_str(short_name);
                 mbus_decode_str(schan);
                 mbus_decode_str(sfreq);
-                mbus_parse_done(sp->mbus_engine_conf);
+                mbus_parse_done(sp->mbus_engine);
         } else {
                 printf("mbus: usage \"audio.codec <codec> <freq> <channels>\"\n");
-                mbus_parse_done(sp->mbus_engine_conf);
+                mbus_parse_done(sp->mbus_engine);
                 return;
         }
@@ -797 +793 @@
 
         freq = channels = 0;
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &sfreq) && 
-            mbus_parse_str(sp->mbus_engine_conf, &schan)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &sfreq) && 
+            mbus_parse_str(sp->mbus_engine, &schan)) {
                 mbus_decode_str(sfreq);
                 mbus_decode_str(schan);
@@ -817 +813 @@
         }
         
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -825 +821 @@
 
         UNUSED(srce);
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i) && (1 == i || 0 == i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i) && (1 == i || 0 == i)) {
                 sp->limit_playout = i;
         } else {
                 printf("mbus: usage \"tool.rat.playout.limit <bool>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -840 +836 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 sp->min_playout = i;
         } else {
                 printf("mbus: usage \"tool.rat.playout.min <integer>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -855 +851 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_int(sp->mbus_engine_conf, &i)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_int(sp->mbus_engine, &i)) {
                 sp->max_playout = i;
         } else {
                 printf("mbus: usage \"tool.rat.playout.max <integer>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -872 +868 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        if (mbus_parse_str(sp->mbus_engine_conf, &name)) {
+        mbus_parse_init(sp->mbus_engine, args);
+        if (mbus_parse_str(sp->mbus_engine, &name)) {
                 mbus_decode_str(name);
                 n = converter_get_count();
@@ -886 +882 @@
                 printf("mbus: usage \"tool.rat.converter <name>\"\n");
         }
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_done(sp->mbus_engine);
 }
 
@@ -893 +889 @@
         UNUSED(srce);
 
-        mbus_parse_init(sp->mbus_engine_conf, args);
-        mbus_parse_done(sp->mbus_engine_conf);
+        mbus_parse_init(sp->mbus_engine, args);
+        mbus_parse_done(sp->mbus_engine);
         ui_update_channel(sp);
 }

rat/trunk/net.c

@@ -155 +155 @@
         int     rc;
         do {
-                mbus_send(sp->mbus_ui_base);
-                rc  = mbus_recv(sp->mbus_engine_base, (void *) sp); 
-                mbus_send(sp->mbus_engine_base);
-                rc |= mbus_recv(sp->mbus_ui_base    , (void *) sp); 
-                if (sp->mbus_channel != 0) {
-                        mbus_send(sp->mbus_ui_conf);
-                        rc |= mbus_recv(sp->mbus_engine_conf, (void *) sp); 
-                        mbus_send(sp->mbus_engine_conf);
-                        rc |= mbus_recv(sp->mbus_ui_conf    , (void *) sp); 
-                }
+                mbus_send(sp->mbus_ui);
+                rc  = mbus_recv(sp->mbus_engine, (void *) sp); 
+                mbus_send(sp->mbus_engine);
+                rc |= mbus_recv(sp->mbus_ui, (void *) sp); 
         } while (rc);
 }

rat/trunk/rtcp_db.c

@@ -338 +338 @@
                 if (dbptr->ssrc == ssrc) {
                         struct s_source *s;
-                        s = source_get_by_rtcp_dbentry(sp->active_sources, 
-                                                       dbptr);
-                        if (s) source_remove(sp->active_sources, s);
+                        s = source_get_by_rtcp_dbentry(sp->active_sources, dbptr);
+                        if (s != NULL) {
+                                source_remove(sp->active_sources, s);
+                        }
                         ui_info_remove(sp, dbptr);
                         *pprev = dbptr->next;

rat/trunk/session.c

@@ -126 +126 @@
         sp->rtp_seq                     = lrand48() & 0xffff;
         sp->speakers_active             = NULL;
-        sp->mbus_engine_base            = NULL;
-        sp->mbus_engine_conf            = NULL;
-        sp->mbus_ui_base                = NULL;
-        sp->mbus_ui_conf                = NULL;
-        sp->mbus_channel                = 0;
+        sp->mbus_engine                 = NULL;
+        sp->mbus_ui                     = NULL;
         sp->min_playout                 = 0;
         sp->max_playout                 = 1000;
@@ -193 +190 @@
                         if ((strcmp(argv[i], "-C") == 0) && (argc > i+1)) {
                                 strncpy(sp[s]->title, argv[i+1], SESSION_TITLE_LEN);
-                                i++;
-                        }
-                        if ((strcmp(argv[i], "-mbus") == 0) && (argc > i+1)) {
-                                sp[s]->mbus_channel = atoi(argv[i + 1]);
                                 i++;
                         }
@@ -374 +367 @@
                         }
                         if (strcmp(argv[i], "-sync") == 0) {
-                                if (sp[s]->mbus_channel != 0) {
-                                        sp[s]->sync_on = TRUE;
-                                } else {
-                                        printf("Lip-sync can only be used if an mbus channel is specified\n");
-                                        usage();
-                                }
+                                sp[s]->sync_on = TRUE;
                         }
                         if ((strcmp(argv[i], "-agc") == 0) && (argc > i+1)) {

rat/trunk/session.h

@@ -130 +130 @@
         u_int32          last_depart_ts;
         struct s_speaker_table  *speakers_active;
-        struct mbus     *mbus_engine_base;
-        struct mbus     *mbus_engine_conf;
-        struct mbus     *mbus_ui_base;
-        struct mbus     *mbus_ui_conf;
-        int              mbus_channel;
+        struct mbus     *mbus_engine;
+        struct mbus     *mbus_ui;
         int              wait_on_startup;
 } session_struct;

rat/trunk/tcltk.c

@@ -90 +90 @@
         }
 
-        mbus_qmsg(sp->mbus_ui_conf, engine_addr, argv[2], argv[3], strcmp(argv[1], "R") == 0);
+        mbus_qmsg(sp->mbus_ui, engine_addr, argv[2], argv[3], strcmp(argv[1], "R") == 0);
         return TCL_OK;
 }

rat/trunk/ui.c

@@ -97 +97 @@
         
         sprintf(args, "%s %s", cname, name);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.name", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.name", args, TRUE);
         xfree(cname);
         xfree(name);
@@ -111 +111 @@
         
         cname = mbus_encode_str(e->sentry->cname);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.exists", cname, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.exists", cname, TRUE);
         xfree(cname);
 }
@@ -126 +126 @@
         args = (char*)xmalloc(strlen(cname) + strlen(arg) + 2);
         sprintf(args, "%s %s", cname, arg);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.email", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.email", args, TRUE);
         xfree(cname);
         xfree(arg);
@@ -143 +143 @@
         args = (char*)xmalloc(strlen(cname) + strlen(arg) + 2);
         sprintf(args, "%s %s", cname, arg);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.phone", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.phone", args, TRUE);
         xfree(cname);
         xfree(arg);
@@ -160 +160 @@
         args = (char*)xmalloc(strlen(cname) + strlen(arg) + 2);
         sprintf(args, "%s %s", cname, arg);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.loc", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.loc", args, TRUE);
         xfree(cname);
         xfree(arg);
@@ -173 +173 @@
         char *args = (char*)xmalloc(strlen(cname) + strlen(arg) + 2);
         sprintf(args, "%s %s", cname, arg);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.tool", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.tool", args, TRUE);
         xfree(cname);
         xfree(arg);
@@ -186 +186 @@
         char *args = (char*)xmalloc(strlen(cname) + strlen(arg) + 2);
         sprintf(args, "%s %s", cname, arg);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.note", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.note", args, TRUE);
         xfree(cname);
         xfree(arg);
@@ -198 +198 @@
         char *args = (char*)xmalloc(strlen(cname) + 4);
         sprintf(args, "%s %2d", cname, e->mute);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.mute", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.mute", args, TRUE);
         xfree(cname);
         xfree(args);
@@ -211 +211 @@
         
         cname = mbus_encode_str(e->sentry->cname);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.remove", cname, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.remove", cname, TRUE);
         xfree(cname);
 }
@@ -223 +223 @@
         
         cname = mbus_encode_str(e->sentry->cname);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.active", cname, FALSE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.active", cname, FALSE);
         xfree(cname);
 }
@@ -235 +235 @@
         
         cname = mbus_encode_str(e->sentry->cname);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.inactive", cname, FALSE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.inactive", cname, FALSE);
         xfree(cname);
 }
@@ -254 +254 @@
         msg = (char*)xmalloc(strlen(cname) + strlen(filter_name) + 10);
         sprintf(msg, "%s %s %d %d", cname, filter_name, filter_length, azimuth);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.3d.user.settings", msg, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.3d.user.settings", msg, TRUE);
         xfree(cname);
         xfree(filter_name);
@@ -290 +290 @@
         }
 
-        mbus_qmsg(sp->mbus_engine_base, 
+        mbus_qmsg(sp->mbus_engine, 
                   mbus_name_ui, 
                   "rtp.source.codec", 
@@ -317 +317 @@
                 their_cname, 
                 buffered);
-        mbus_qmsg(sp->mbus_engine_base, 
+        mbus_qmsg(sp->mbus_engine, 
                   mbus_name_ui, 
                   "tool.rat.audio.buffered", 
@@ -327 +327 @@
                 their_cname, 
                 delay);
-        mbus_qmsg(sp->mbus_engine_base, 
+        mbus_qmsg(sp->mbus_engine, 
                   mbus_name_ui, 
                   "tool.rat.audio.delay", 
@@ -338 +338 @@
                 their_cname, 
                 (e->lost_frac * 100) >> 8);
-        mbus_qmsg(sp->mbus_engine_base, 
+        mbus_qmsg(sp->mbus_engine, 
                   mbus_name_ui, 
                   "rtp.source.packet.loss", 
@@ -354 +354 @@
         switch (sp->input_mode) {
         case AUDIO_MICROPHONE:
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.input.port", "\"microphone\"", TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.input.port", "\"microphone\"", TRUE);
                 break;
         case AUDIO_LINE_IN:
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.input.port", "\"line_in\"", TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.input.port", "\"line_in\"", TRUE);
                 break;  
         case AUDIO_CD:
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.input.port", "\"cd\"", TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.input.port", "\"cd\"", TRUE);
                 break;
         default:
@@ -367 +367 @@
         }
         if (tx_is_sending(sp->tb)) {
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.input.mute", "0", TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.input.mute", "0", TRUE);
         } else {
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.input.mute", "1", TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.input.mute", "1", TRUE);
         }
 }
@@ -378 +378 @@
         switch (sp->output_mode) {
         case AUDIO_SPEAKER:
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.output.port", "speaker", TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.output.port", "speaker", TRUE);
                 break;
         case AUDIO_HEADPHONE:
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.output.port", "headphone", TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.output.port", "headphone", TRUE);
                 break;
         case AUDIO_LINE_OUT:
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.output.port", "line_out", TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.output.port", "line_out", TRUE);
                 break;
         default:
@@ -391 +391 @@
         }
         if (sp->playing_audio) {
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.output.mute", "0", TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.output.mute", "0", TRUE);
         } else {
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.output.mute", "1", TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.output.mute", "1", TRUE);
         }
 }
@@ -410 +410 @@
 
         sprintf(args, "%3d", level);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.input.powermeter", args, FALSE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.input.powermeter", args, FALSE);
         ol = level;
 }
@@ -426 +426 @@
 
         sprintf(args, "%3d", level);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.output.powermeter", args, FALSE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.output.powermeter", args, FALSE);
         ol = level;
 }
@@ -436 +436 @@
 
         mbes = mbus_encode_str(repair_get_name((u_int16)sp->repair));
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.channel.repair", mbes, FALSE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.channel.repair", mbes, FALSE);
         xfree(mbes);
 }
@@ -449 +449 @@
         if (af && audio_format_name(af, fmt_buf, 64)) {
                 mbes = mbus_encode_str(fmt_buf);
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.format.in", mbes, TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.format.in", mbes, TRUE);
                 xfree(mbes);
         } else {
@@ -458 +458 @@
         if (af && audio_format_name(af, fmt_buf, 64)) {
                 mbes = mbus_encode_str(fmt_buf);
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.format.out", mbes, TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.format.out", mbes, TRUE);
                 xfree(mbes);
         } else {
@@ -475 +475 @@
         pri_cf = codec_get_format(pri_id);
         mbes = mbus_encode_str(pri_cf->short_name);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.codec", mbes, FALSE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.codec", mbes, FALSE);
         xfree(mbes);
 }
@@ -506 +506 @@
 
         sprintf(args,"\"interleaved\" %d %d",iu, isep);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.channel.coding", args, TRUE);        
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.channel.coding", args, TRUE);        
 
         UNUSED(sp);
@@ -557 +557 @@
         sprintf(args,"\"redundant\" %s %2d", codec_name, ioff);
         assert(strlen(args) < (strlen(codec_name) + 16));
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.channel.coding", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.channel.coding", args, TRUE);
         xfree(codec_name);
         xfree(args);
@@ -569 +569 @@
         cc_coder_t *ccp;
         */
-        mbus_qmsg(sp->mbus_engine_base, 
+        mbus_qmsg(sp->mbus_engine, 
                   mbus_name_ui, 
                   "audio.channel.coding", "\"none\"", TRUE);
@@ -575 +575 @@
         ccp = get_channel_coder(sp->cc_encoding);
         if (strcmp(ccp->name, "VANILLA") == 0) {
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.channel.coding", "\"none\"", TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.channel.coding", "\"none\"", TRUE);
         } else if (strcmp(ccp->name, "REDUNDANCY") == 0) {
                 ui_update_redundancy(sp);
@@ -594 +594 @@
         sprintf(args, "%3d", audio_get_gain(sp->audio_device)); 
         assert(strlen(args) < 4);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.input.gain", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.input.gain", args, TRUE);
 }
 
@@ -604 +604 @@
         sprintf(args, "%3d", audio_get_volume(sp->audio_device)); 
         assert(strlen(args) < 4);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.output.gain", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.output.gain", args, TRUE);
 }
 
@@ -612 +612 @@
         char args[2];
         sprintf(args, "%d", (sp->render_3d ? 1 : 0));
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.3d.enabled", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.3d.enabled", args, TRUE);
 }
 
@@ -635 +635 @@
 
         mbes = mbus_encode_str(buf);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.devices", mbes, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.devices", mbes, TRUE);
         xfree(mbes);
 }
@@ -657 +657 @@
         if (cur_dev) {
                 mbes = mbus_encode_str(cur_dev);
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.device", mbes, TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.device", mbes, TRUE);
                 xfree(mbes);
         }
@@ -695 +695 @@
 
         mbes = mbus_encode_str(modes);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.sampling.supported", mbes, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.sampling.supported", mbes, TRUE);
         xfree(mbes);
 }
@@ -712 +712 @@
                 done=1;
         } else {
-                sprintf(args, "%3d", sp->output_gain); mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.output.gain", args, TRUE);
+                sprintf(args, "%3d", sp->output_gain); mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.output.gain", args, TRUE);
                 assert(strlen(args) < 4);
-                sprintf(args, "%3d", sp->input_gain ); mbus_qmsg(sp->mbus_engine_base, mbus_name_ui,  "audio.input.gain", args, TRUE);
+                sprintf(args, "%3d", sp->input_gain ); mbus_qmsg(sp->mbus_engine, mbus_name_ui,  "audio.input.gain", args, TRUE);
                 assert(strlen(args) < 4);
         }
@@ -720 +720 @@
         sprintf(args, "%3d", channel_encoder_get_units_per_packet(sp->channel_coder));
         assert(strlen(args) < 4);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.rate", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.rate", args, TRUE);
 
         ui_update_output_port(sp);
@@ -738 +738 @@
 ui_show_audio_busy(session_struct *sp)
 {
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.disable.audio.ctls", "", TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.disable.audio.ctls", "", TRUE);
 }
 
@@ -744 +744 @@
 ui_hide_audio_busy(session_struct *sp)
 {
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.enable.audio.ctls", "", TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.enable.audio.ctls", "", TRUE);
 }
 
@@ -753 +753 @@
         char    args[2];
         sprintf(args, "%1d", sp->lecture);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.lecture.mode", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.lecture.mode", args, TRUE);
 }
 
@@ -787 +787 @@
         args   = (char *) xmalloc(strlen(srce_e) + strlen(dest_e) + 6);
         sprintf(args, "%s %s %3d", srce_e, dest_e, loss);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.packet.loss", args, FALSE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.packet.loss", args, FALSE);
         xfree(args);
         xfree(srce_e);
@@ -805 +805 @@
         args = (char *) xmalloc(strlen(cname_e) + 88);
         sprintf(args, "%s %6ld %6ld %6ld %6ld %6ld %6d", cname_e, recv, lost, misordered, duplicates, jitter, jit_tog);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.reception", args, FALSE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.reception", args, FALSE);
         xfree(args);
         xfree(cname_e);
@@ -821 +821 @@
 
         sprintf(args, "%s %3d", cname_e, duration);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.source.packet.duration", args, FALSE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.source.packet.duration", args, FALSE);
         xfree(args);
         xfree(cname_e);
@@ -837 +837 @@
 
         sprintf(args, "%s %12d", cname_e, playout);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_video, "source_playout", args, FALSE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_video, "source_playout", args, FALSE);
         xfree(args);
         xfree(cname_e);
@@ -846 +846 @@
 {
         if (sync) {
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.sync", "1", TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.sync", "1", TRUE);
         } else {
-                mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.sync", "0", TRUE);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.sync", "0", TRUE);
         }
 }
@@ -855 +855 @@
 ui_update_key(session_struct *sp, char *key)
 {
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "security.encryption.key", key, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "security.encryption.key", key, TRUE);
 }
 
@@ -956 +956 @@
         ui_get_codecs(pt, args, 256, TRUE);
         mbes = mbus_encode_str(args);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.codec.supported", mbes, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.codec.supported", mbes, TRUE);
         xfree(mbes);
         ui_get_codecs(pt, args, 256, FALSE);
         mbes = mbus_encode_str(args);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.redundancy.supported", mbes, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.redundancy.supported", mbes, TRUE);
         xfree(mbes);
 }
@@ -969 +969 @@
         char *mbes;
         mbes = mbus_encode_str(name);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.file.play.ready", mbes, TRUE); 
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.file.play.ready", mbes, TRUE); 
         xfree(mbes);
 }
@@ -978 +978 @@
         char *mbes;
         mbes = mbus_encode_str(name);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "audio.file.record.ready", mbes, TRUE); 
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.file.record.ready", mbes, TRUE); 
         xfree(mbes);
 }
@@ -991 +991 @@
         sprintf(cmd, "audio.file.%s.alive", mode);
         sprintf(arg, "%1d", valid); 
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, cmd, arg, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, cmd, arg, TRUE);
 }
 
@@ -1012 +1012 @@
         
         mbes = mbus_encode_str(buf);
-        mbus_qmsg(sp->mbus_engine_base, 
+        mbus_qmsg(sp->mbus_engine, 
                   mbus_name_ui, 
                   "tool.rat.converter.supported", 
@@ -1034 +1034 @@
         
         mbes = mbus_encode_str(buf);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.repair.supported", mbes, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.repair.supported", mbes, TRUE);
         xfree(mbes);
 }
@@ -1048 +1048 @@
 
         my_cname = mbus_encode_str(cname);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "rtp.cname", my_cname, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "rtp.cname", my_cname, TRUE);
         xfree(my_cname);
 }
@@ -1058 +1058 @@
 
         title = mbus_encode_str(sp->title);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "session.title", title, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "session.title", title, TRUE);
         xfree(title);
 
@@ -1064 +1064 @@
         args = (char *) xmalloc(strlen(addr) + 11);
         sprintf(args, "%s %5d %3d", addr, sp->rtp_port, sp->ttl);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "session.address", args, TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "session.address", args, TRUE);
         xfree(args);
         xfree(addr);
@@ -1072 +1072 @@
 ui_load_settings(session_struct *sp)
 {
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "tool.rat.load.settings", "", TRUE);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.load.settings", "", TRUE);
 }
 
@@ -1090 +1090 @@
 
         mbes = mbus_encode_str(args);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, 
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, 
                   "tool.rat.3d.filter.types", mbes, TRUE);
         xfree(mbes);
@@ -1103 +1103 @@
         
         mbes = mbus_encode_str(args);
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, 
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, 
                   "tool.rat.3d.filter.lengths", 
                   mbes, TRUE);
@@ -1109 +1109 @@
 
         sprintf(args, "%d", render_3D_filter_get_lower_azimuth());
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, 
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, 
                   "tool.rat.3d.azimuth.min", args, TRUE);
 
         sprintf(args, "%d", render_3D_filter_get_upper_azimuth());
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, 
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, 
                   "tool.rat.3d.azimuth.max", args, TRUE);
 }
@@ -1135 +1135 @@
 ui_quit(session_struct *sp)
 {
-        mbus_qmsg(sp->mbus_engine_base, mbus_name_ui, "mbus.quit", "", TRUE);
-}
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "mbus.quit", "", TRUE);
+}