Index: webrtc/media/devices/macdevicemanager.cc |
diff --git a/talk/media/devices/macdevicemanager.cc b/webrtc/media/devices/macdevicemanager.cc |
similarity index 76% |
rename from talk/media/devices/macdevicemanager.cc |
rename to webrtc/media/devices/macdevicemanager.cc |
index 8f777b42da1a575978730b228470330f33d1aa96..46bc02eb769d449afa8a189d438b972e442088a1 100644 |
--- a/talk/media/devices/macdevicemanager.cc |
+++ b/webrtc/media/devices/macdevicemanager.cc |
@@ -1,39 +1,22 @@ |
/* |
- * libjingle |
- * Copyright 2004 Google Inc. |
+ * Copyright 2004 The WebRTC Project Authors. 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 documentation |
- * and/or other materials provided with the distribution. |
- * 3. The name of the author may not be used to endorse or promote products |
- * derived from this software without specific prior written permission. |
- * |
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
+ * Use of this source code is governed by a BSD-style license |
+ * that can be found in the LICENSE file in the root of the source |
+ * tree. An additional intellectual property rights grant can be found |
+ * in the file PATENTS. All contributing project authors may |
+ * be found in the AUTHORS file in the root of the source tree. |
*/ |
-#include "talk/media/devices/macdevicemanager.h" |
+#include "webrtc/media/devices/macdevicemanager.h" |
#include <CoreAudio/CoreAudio.h> |
#include <QuickTime/QuickTime.h> |
-#include "talk/media/base/mediacommon.h" |
#include "webrtc/base/logging.h" |
#include "webrtc/base/stringutils.h" |
#include "webrtc/base/thread.h" |
+#include "webrtc/media/base/mediacommon.h" |
class DeviceWatcherImpl; |