[Laszlo-checkins] r16619 - in openlaszlo/branches/4.8: . lps/components/extensions/av

[ptw@openlaszlo.org]

Author: ptw
Date: 2010-06-04 05:28:37 -0700 (Fri, 04 Jun 2010)
New Revision: 16619

Modified:
   openlaszlo/branches/4.8/
   openlaszlo/branches/4.8/lps/components/extensions/av/mediastream.lzx
Log:
Merged revisions 16610 via svnmerge from 
http://svn.openlaszlo.org/openlaszlo/trunk

.......
  r16610 | max | 2010-06-03 21:30:13 -0400 (Thu, 03 Jun 2010) | 16 lines
  
  Change 20100603-maxcarlson-D by maxcarlson at Friendly.local on 2010-06-03 18:12:10 PDT
      in /Users/maxcarlson/openlaszlo/trunk-clean
      for http://svn.openlaszlo.org/openlaszlo/trunk
  
  Summary: Fix warnings in swf10: extensions/av/mediastream.lzx#1485: TypeError: Error #1034: Type Coercion failed: cannot convert false to flash.media.Microphone.
  
  Bugs Fixed: LPP-9083 - Warnings in mediastream.lzx#_setupStreamAudio() in swf10
  
  Technical Reviewer: mdemmon
  QA Reviewer: hminsky
  
  Details: NetStream.attachAudio() requires a Microphone or null in AS3.
  
  Tests: Video chat no longer warns in swf10
.......



Property changes on: openlaszlo/branches/4.8
___________________________________________________________________
Name: svnmerge-integrated
   - /openlaszlo/trunk:1-3892,3894-3952,3954-4393,4395-4461,4463-4467,4469-4471,4473-5085,5087-5171,5173-5203,5205-5209,5211-5331,5333-5334,16597 /openlaszlo/branches/4.7:1-15424,15759-15761,16592 /openlaszlo/branches/4.2:1-12154,12181,13205,13778,14112,14287,14316,14508,14517-14590 /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/4.4:1-13936,14007 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554,13476,13629,15650,15685 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872
   + /openlaszlo/trunk:1-3892,3894-3952,3954-4393,4395-4461,4463-4467,4469-4471,4473-5085,5087-5171,5173-5203,5205-5209,5211-5331,5333-5334,16597,16610 /openlaszlo/branches/4.7:1-15424,15759-15761,16592 /openlaszlo/branches/4.2:1-12154,12181,13205,13778,14112,14287,14316,14508,14517-14590 /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/4.4:1-13936,14007 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825,10756-10920,10922-10928,10930-10935,11151,11207,11554,13476,13629,15650,15685 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872

Modified: openlaszlo/branches/4.8/lps/components/extensions/av/mediastream.lzx
===================================================================
--- openlaszlo/branches/4.8/lps/components/extensions/av/mediastream.lzx	2010-06-04 12:18:34 UTC (rev 16618)
+++ openlaszlo/branches/4.8/lps/components/extensions/av/mediastream.lzx	2010-06-04 12:28:37 UTC (rev 16619)
@@ -1482,7 +1482,14 @@
 
     <!--- @keywords private -->
     <method name="_setupStreamAudio">
-        this._flashstream.attachAudio(this.muteaudio ? false : this.mic._dev);
+        if ($as2) {
+            var noaudioobject = false;
+        } else {
+            // attachAudio() requires a Microphone object in AS3 - see 
+            // http://www.adobe.com/livedocs/flash/9.0/ActionScriptLangRefV3/flash/net/NetStream.html#attachAudio%28%29
+            var noaudioobject = null;
+        }
+        this._flashstream.attachAudio(this.muteaudio ? noaudioobject : this.mic._dev);
     </method>
 
     <!--- @keywords private -->