Changeset 2873

Timestamp:

11/01/99 12:53:51 (14 years ago)

Author:

ucacoxh

Message:

- More ui consistency updates. agc, playout limits, etc

Location:

rat/trunk

Files:

• ui.c (modified) (5 diffs)
• ui_audiotool.tcl (modified) (2 diffs)

rat/trunk/ui.c

@@ -663 +663 @@
 }
 
+static void
+ui_update_powermeter(session_t *sp)
+{
+        if (sp->meter) {
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.powermeter", "1", TRUE);
+        } else {
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.powermeter", "0", TRUE);
+        }
+}
+
+static void
+ui_update_lipsync(session_t *sp) 
+{
+        if (sp->sync_on) {
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.sync", "1", TRUE);
+        } else {
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.sync", "0", TRUE);
+        }
+}
+
+static void
+ui_update_silence(session_t *sp)
+{
+        if (sp->detect_silence) {
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.suppress.silence", "1", TRUE);
+        } else {
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "audio.suppress.silence", "0", TRUE);
+        }
+}
+
+static void
+ui_update_playout_bounds(session_t *sp)
+{
+        char tmp[6];
+        if (sp->limit_playout) {
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.playout.limit", "1", TRUE);
+        } else {
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.playout.limit", "0", TRUE);
+        }
+        sprintf(tmp, "%4d", (int)sp->min_playout);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.playout.min", tmp, TRUE);
+        sprintf(tmp, "%4d", (int)sp->max_playout);
+        mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.playout.max", tmp, TRUE);
+}
+
+static void
+ui_update_agc(session_t *sp)
+{
+        if (sp->agc_on) {
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.agc", "1", TRUE);
+        } else {
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.agc", "0", TRUE);
+        }
+}
+
 void
 ui_update(session_t *sp)
@@ -682 +737 @@
         ui_update_channel(sp);
         ui_repair(sp);
+        ui_update_converter(sp);
+        ui_update_lecture_mode(sp);
+        ui_update_powermeter(sp);
+        ui_update_lipsync(sp);
+        ui_update_silence(sp);
+        ui_update_agc(sp);
+        ui_update_playout_bounds(sp);
 }
 
@@ -739 +801 @@
         mbus_qmsgf(sp->mbus_engine, mbus_name_ui, FALSE, "rtp.source.packet.duration", "\"%08lx\" %3d", ssrc, duration);
 }
+
 
 void 
@@ -1030 +1093 @@
 }
 
-static void
-ui_update_options(session_t *sp)
-{
-        if (sp->meter) {
-                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.powermeter", "1", TRUE);
-        } else {
-                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.powermeter", "0", TRUE);
-        }
-        if (sp->sync_on) {
-                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.sync", "1", TRUE);
-        } else {
-                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.sync", "0", TRUE);
-        }
-}
-
 void
 ui_initial_settings(session_t *sp)
@@ -1062 +1110 @@
         ui_info_update_tool(sp,  my_ssrc);      network_process_mbus(sp);
         ui_title(sp);                           network_process_mbus(sp);
-        ui_update_options(sp);                  network_process_mbus(sp);
 #ifdef NDEF /* This is done by load_settings() now... */
         ui_load_settings(sp);                   network_process_mbus(sp);
 #endif
-        ui_update_converter(sp);
-        ui_update_repair(sp);
 }
 

rat/trunk/ui_audiotool.tcl

@@ -199 +199 @@
                 tool.rat.3d.filter.lengths      {eval mbus_recv_tool.rat.3d.filter.lengths $args}
                 tool.rat.3d.user.settings       {eval mbus_recv_tool.rat.3d.user.settings  $args}
+                tool.rat.playout.limit          {eval mbus_recv_tool.rat.playout.limit $args}
+                tool.rat.playout.min            {eval mbus_recv_tool.rat.playout.min   $args}
+                tool.rat.playout.max            {eval mbus_recv_tool.rat.playout.max   $args}
                 audio.suppress.silence          {eval mbus_recv_audio.suppress.silence $args}
                 audio.channel.coding            {eval mbus_recv_audio.channel.coding $args}
@@ -1009 +1012 @@
 }
 
+proc mbus_recv_tool.rat.playout.limit {do_limit} {
+    global limit_var
+    set limit_var $do_limit
+}
+
+proc mbus_recv_tool.rat.playout.min {lower_bound} {
+    global min_var
+    set min_var $lower_bound
+}
+
+proc mbus_recv_tool.rat.playout.max {upper_bound} {
+    global max_var
+    set max_var $upper_bound
+}
+
 proc mbus_recv_mbus.quit {} {
         destroy .