| Index: webrtc/api/remoteaudiosource.cc
|
| diff --git a/talk/app/webrtc/remoteaudiosource.cc b/webrtc/api/remoteaudiosource.cc
|
| similarity index 73%
|
| rename from talk/app/webrtc/remoteaudiosource.cc
|
| rename to webrtc/api/remoteaudiosource.cc
|
| index e904dd91925e48654832a5bb769f2e971c8b513e..2fedc9d0f943c22fb2320bb82652e874ce55da2d 100644
|
| --- a/talk/app/webrtc/remoteaudiosource.cc
|
| +++ b/webrtc/api/remoteaudiosource.cc
|
| @@ -1,37 +1,20 @@
|
| /*
|
| - * libjingle
|
| - * Copyright 2014 Google Inc.
|
| + * Copyright 2014 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/app/webrtc/remoteaudiosource.h"
|
| +#include "webrtc/api/remoteaudiosource.h"
|
|
|
| #include <algorithm>
|
| #include <functional>
|
| #include <utility>
|
|
|
| -#include "talk/app/webrtc/mediastreamprovider.h"
|
| +#include "webrtc/api/mediastreamprovider.h"
|
| #include "webrtc/base/checks.h"
|
| #include "webrtc/base/logging.h"
|
| #include "webrtc/base/thread.h"
|
|
|