Changeset 3111

Timestamp:

02/02/00 18:14:33 (13 years ago)

Author:

ucaccsp

Message:

Update tcl/tk initialization sequence. The UI should now be ready before
we initialize our mbus interface, which should mean that rtp.ssrc cannot
fail.

Location:

rat/trunk

Files:

• tcltk.c (modified) (3 diffs)
• ui.c (modified) (1 diff)
• ui_audiotool.tcl (modified) (2 diffs)

rat/trunk/tcltk.c

@@ -275 +275 @@
 {
         char            *cmd_line_args, buffer[10];
+        Tcl_Obj         *audiotool_obj;
 
         Tcl_FindExecutable(argv[0]);
@@ -317 +318 @@
         Tk_DefineBitmap(interp, Tk_GetUid("left"),  left_bits,  left_width, left_height);
         Tk_DefineBitmap(interp, Tk_GetUid("right"), right_bits, right_width,  right_height);
-        Tcl_Eval(interp, "wm withdraw .");
-        while (Tcl_DoOneEvent(TCL_DONT_WAIT | TCL_ALL_EVENTS)) {
-                /* Process Tcl/Tk events */
-        }
-        return TRUE;
-}
-
-int 
-tcl_init2(struct mbus *mbus_ui, char *mbus_engine_addr)
-{
-        struct timeval   timeout;
-        Tcl_Obj         *audiotool_obj;
-        engine_addr   = xstrdup(mbus_engine_addr);
-
-        Tcl_CreateCommand(interp, "mbus_send",       mbus_send_cmd,   (ClientData) mbus_ui, NULL);
-        Tcl_CreateCommand(interp, "mbus_encode_str", mbus_encode_cmd, NULL, NULL);
 
         audiotool_obj = Tcl_NewStringObj(ui_audiotool, strlen(ui_audiotool));
@@ -338 +323 @@
                 fprintf(stderr, "ui_audiotool error: %s\n", Tcl_GetStringResult(interp));
         }
+        while (Tcl_DoOneEvent(TCL_DONT_WAIT | TCL_ALL_EVENTS)) {
+                /* Process Tcl/Tk events */
+        }
+
+        return TRUE;
+}
+
+int 
+tcl_init2(struct mbus *mbus_ui, char *mbus_engine_addr)
+{
+        struct timeval   timeout;
+        engine_addr   = xstrdup(mbus_engine_addr);
+
+        Tcl_CreateCommand(interp, "mbus_send",       mbus_send_cmd,   (ClientData) mbus_ui, NULL);
+        Tcl_CreateCommand(interp, "mbus_encode_str", mbus_encode_cmd, NULL, NULL);
+        Tcl_Eval(interp, "wm deiconify .");
 
         /* Process Tcl/Tk events */

rat/trunk/ui.c

@@ -1074 +1074 @@
         /* One off setting transfers / initialization */
         uint32_t my_ssrc = rtp_my_ssrc(sp->rtp_session[0]);
-        int16_t i;
-
-        /*
-         * This loop is the wrong fix for the engine sending commands to the
-         * ui before the ui is ready.  When this happens the ui acks, but ignores
-         * the messages (ugh!).  Since the ui depends on having got out ssrc in
-         * lots of messages we have to make sure it gets through.  
-         * The ui and engine should wait until they've got
-         * some kind of heartbeat or go message from the other before exchanging
-         * data messages.
-         */
-        for(i = 0; i < 10; i++) {
-                mbus_qmsgf(sp->mbus_engine, sp->mbus_ui_addr, TRUE, "rtp.ssrc", "%08lx", my_ssrc);
-                network_process_mbus(sp);
-        }
+
+        mbus_qmsgf(sp->mbus_engine, sp->mbus_ui_addr, TRUE, "rtp.ssrc", "%08lx", my_ssrc); network_process_mbus(sp);
         ui_sampling_modes(sp);                  network_process_mbus(sp);
         ui_converters(sp);                      network_process_mbus(sp);

rat/trunk/ui_audiotool.tcl

@@ -9 +9 @@
 #
 
-#wm withdraw .
+wm withdraw .
 
 if {[string compare [info commands registry] "registry"] == 0} {
@@ -2893 +2893 @@
 }
 
-wm deiconify .
-
+