MediaStream API: Removing LocalMediaStream

Source/modules/webaudio/AudioContext.cpp

 /*
  * Copyright (C) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 367 matching lines @@
         ec = INVALID_STATE_ERR;
         return 0;
     }
 
     ASSERT(isMainThread());
     lazyInitialize();
 
     AudioSourceProvider* provider = 0;
 
     MediaStreamTrackVector audioTracks = mediaStream->getAudioTracks();
-    if (mediaStream->isLocal() && audioTracks.size()) {
-        // Enable input for the specific local audio device specified in the MediaStreamSource.
-        RefPtr<MediaStreamTrack> localAudio = audioTracks[0];
+
+    // FIXME: get a provider for non-local MediaStreams (like from a remote peer).
+    for (size_t i = 0; i < audioTracks.size(); ++i) {
+        RefPtr<MediaStreamTrack> localAudio = audioTracks[i];
         MediaStreamSource* source = localAudio->component()->source();
-        destination()->enableInput(source->deviceId());
-        provider = destination()->localAudioInputProvider();
-    } else {
-        // FIXME: get a provider for non-local MediaStreams (like from a remote peer).
-        provider = 0;
+        if (!source->deviceId().isEmpty()) {
+            destination()->enableInput(source->deviceId());
+            provider = destination()->localAudioInputProvider();
+            break;
+        }
     }
 
     RefPtr<MediaStreamAudioSourceNode> node = MediaStreamAudioSourceNode::create(this, mediaStream, provider);
 
     // FIXME: Only stereo streams are supported right now. We should be able to accept multi-channel streams.
     node->setFormat(2, sampleRate());
 
     refNode(node.get()); // context keeps reference until node is disconnected
     return node;
 }
@@ skipping 578 matching lines @@
     info.addMember(m_deferredFinishDerefList, "deferredFinishDerefList");
     info.addMember(m_hrtfDatabaseLoader, "hrtfDatabaseLoader");
     info.addMember(m_eventTargetData, "eventTargetData");
     info.addMember(m_renderTarget, "renderTarget");
     info.addMember(m_audioDecoder, "audioDecoder");
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WEB_AUDIO)