Changeset 2528

Timestamp:

05/22/99 03:25:38 (14 years ago)

Author:

ucacoxh

Message:

Fixes for restoring port settings on audio device.

It's a ugly:
- After parse options late check if new audio device config ready. Use it

if so (and there always will be if saved device is not null device). Change
to it if so.

- the call ui_final_settings which sends load.setting messages to ui.
- ui now caches loaded values in global array attr which only gets updated when

values are loaded

- the recv.loadsetting then digs values out of attr and sends them to ui.

If you can check this on platform with more than one output would
appreciate it. It works fine on bsd pc and since input and output port
code is symmetric it should work on other platforms happily.

Location:

rat/trunk

Files:

• main.c (modified) (1 diff)
• ui.c (modified) (1 diff)
• ui.h (modified) (1 diff)
• ui_audiotool.tcl (modified) (7 diffs)

rat/trunk/main.c

@@ -136 +136 @@
         }
         network_process_mbus(sp[0]);
+        
+        if (sp[0]->new_config != NULL) {
+                network_process_mbus(sp[0]);
+                audio_device_reconfigure(sp[0]);
+                network_process_mbus(sp[0]);
+        }
+
+        ui_final_settings(sp[0]);
+        network_process_mbus(sp[0]);
 
         if (tx_is_sending(sp[0]->tb) && (sp[0]->mode != AUDIO_TOOL)) {

rat/trunk/ui.c

@@ -864 +864 @@
 }
 
+/* ui_final_settings: so we here we load things that get broken
+ * because we open null audio device first, and it has limited no of
+ * input and output ports.  
+ */
+
+void
+ui_final_settings(session_struct *sp)
+{
+        int i, n;
+        char *mbes;
+        const char *settings[] = {
+                "audio.input.mute",
+                "audio.input.gain",
+                "audio.input.port",
+                "audio.output.mute",
+                "audio.output.gain",
+                "audio.output.port"
+        };
+        
+        n = sizeof(settings)/sizeof(settings[0]);
+        for(i = 0; i < n; i++) {
+                mbes = mbus_encode_str(settings[i]);
+                mbus_qmsg(sp->mbus_engine, mbus_name_ui, "tool.rat.load.setting", mbes, TRUE);
+                xfree(mbes);
+        }
+}
+
 static void
 ui_3d_options(session_struct *sp)

rat/trunk/ui.h

@@ -64 +64 @@
 void    ui_controller_init(struct session_tag *s, u_int32 ssrc, char *name_engine, char *name_ui, char *name_video);
 void    ui_initial_settings(struct session_tag *s);
+void    ui_final_settings(struct session_tag *s);
 void    ui_quit(struct session_tag *s);
 

rat/trunk/ui_audiotool.tcl

@@ -170 +170 @@
                 mbus.quit                       {eval mbus_recv_mbus.quit $args}
                 tool.rat.load.settings          {eval mbus_recv_tool.rat.load.settings $args}
+                tool.rat.load.setting           {eval mbus_recv_tool.rat.load.setting $args}
                 tool.rat.sampling.supported     {eval mbus_recv_tool.rat.sampling.supported $args}
                 tool.rat.converter              {eval mbus_recv_tool.rat.converter $args}
@@ -262 +263 @@
 }
 
+proc mbus_recv_tool.rat.load.setting {sname} {
+    global attr
+# Note when settings get loaded the get set in attr and not updated.  So we
+# use this as a cache for desired values.  This is necessary as when the
+# settings first get loaded we have null audio device and can't set 
+# anything on it meaningfully - i.e. it only has 1 port for input and 1 for output.
+#
+    switch $sname {
+        audio.input.mute  { mbus_send "R" $sname $attr(audioInputMute) }
+        audio.input.gain  { mbus_send "R" $sname $attr(audioInputGain) }
+        audio.input.port  { mbus_send "R" $sname [mbus_encode_str $attr(audioInputPort)] }
+        audio.output.mute { mbus_send "R" $sname $attr(audioOutputMute) }
+        audio.output.gain { mbus_send "R" $sname $attr(audioOutputGain) }
+        audio.output.port { mbus_send "R" $sname [mbus_encode_str $attr(audioOutputPort)] }
+        default           { puts "setting requested has no handler"}
+    }
+}
+
 proc change_freq {new_freq} {
     global freq
@@ -2206 +2225 @@
         # who has the tcl manual? is the only way to pass arrays thru upvar...
         if {$win32} {
-                if {[string first "rtp" "$field"] == -1} {
-                        catch { 
-                                set tmp "[registry get HKEY_CURRENT_USER\\Software\\$V(class)\\$V(app) *$field]" 
-                                set tmp [string trim $tmp \"]
-                                set nerr 0
-                        } fail
-                } else {
-                        catch { 
-                                set tmp "[registry get HKEY_CURRENT_USER\\Software\\$V(class)\\common  *$field]" 
-                                set tmp [string trim $tmp \"]
-                                set nerr 0
-                        } fail
-                }
-                if {$fail != 0} {
-                        puts "Failed to get $field\n";
-                        set tmp ""
-                } else {
-                        puts "$field $var $tmp"
-                }
+            if {[string first "rtp" "$field"] == -1} {
+                catch { 
+                    set tmp "[registry get HKEY_CURRENT_USER\\Software\\$V(class)\\$V(app) *$field]" 
+                    set tmp [string trim $tmp \"]
+                    set nerr 0
+                } fail
+            } else {
+                    catch { 
+                        set tmp "[registry get HKEY_CURRENT_USER\\Software\\$V(class)\\common  *$field]" 
+                        set tmp [string trim $tmp \"]
+                        set nerr 0
+                    } fail
+            }
+            if {$fail != 0} {
+                puts "Failed to get $field\n";
+                set tmp ""
+            } else {
+                puts "$field $var $tmp"
+            }
         } else {
                 set tmp [option get . $field rat]
@@ -2239 +2258 @@
         }
         set $var $tmp
+        set attr($field) $tmp
 }
 
@@ -2253 +2273 @@
 
 proc load_settings {} {
-    global rtpfname win32 my_ssrc TOOL
+    global rtpfname win32 my_ssrc TOOL attr
 
     set attr(zero) ""
     if {$win32 == 0} {
-                if {[file readable $rtpfname]} {
-                        set f [open $rtpfname]
-                        while {[eof $f] == 0} {
-                                gets $f line
-                                set field [string trim [lindex $line 0] "*:"]
-                                set value [lrange $line 1 end]
-                                set attr($field) "$value"
-                        }       
-                        close $f
-                }
+        if {[file readable $rtpfname]} {
+            set f [open $rtpfname]
+            while {[eof $f] == 0} {
+                gets $f line
+                set field [string trim [lindex $line 0] "*:"]
+                set value [lrange $line 1 end]
+                set attr($field) "$value"
+            }   
+            close $f
+        }
     }
 
@@ -2274 +2294 @@
     load_setting attr rtpPhone  rtcp_phone    ""
     load_setting attr rtpLoc    rtcp_loc      ""
-    load_setting attr audioTool audio_tool         ""
+    load_setting attr audioTool audio_tool    ""
 
     # If the version of the saved settings is different 
@@ -2294 +2314 @@
     load_setting attr audioMaxPlayout   max_var       "2000"
     load_setting attr audioLecture      lecture_var   "0"
-    load_setting attr audio3dRendering  3d_audio_var   "0"
+    load_setting attr audio3dRendering  3d_audio_var  "0"
     load_setting attr audioAutoConvert  convert_var   "first"
     #security