Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(284)

Side by Side Diff: webrtc/media/devices/devicemanager.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Disable sign-compare warning on Win Clang Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * Copyright 2004 Google Inc.
4 * 3 *
5 * Redistribution and use in source and binary forms, with or without 4 * Use of this source code is governed by a BSD-style license
6 * modification, are permitted provided that the following conditions are met: 5 * that can be found in the LICENSE file in the root of the source
7 * 6 * tree. An additional intellectual property rights grant can be found
8 * 1. Redistributions of source code must retain the above copyright notice, 7 * in the file PATENTS. All contributing project authors may
9 * this list of conditions and the following disclaimer. 8 * be found in the AUTHORS file in the root of the source tree.
10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 9 */
27 10
28 #ifndef TALK_MEDIA_DEVICES_DEVICEMANAGER_H_ 11 #ifndef WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_
29 #define TALK_MEDIA_DEVICES_DEVICEMANAGER_H_ 12 #define WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_
30 13
31 #include <map> 14 #include <map>
32 #include <string> 15 #include <string>
33 #include <vector> 16 #include <vector>
34 17
35 #include "talk/media/base/device.h"
36 #include "talk/media/base/screencastid.h"
37 #include "talk/media/base/videocapturerfactory.h"
38 #include "talk/media/base/videocommon.h"
39 #include "webrtc/base/scoped_ptr.h" 18 #include "webrtc/base/scoped_ptr.h"
40 #include "webrtc/base/sigslot.h" 19 #include "webrtc/base/sigslot.h"
41 #include "webrtc/base/stringencode.h" 20 #include "webrtc/base/stringencode.h"
42 #include "webrtc/base/window.h" 21 #include "webrtc/base/window.h"
22 #include "webrtc/media/base/device.h"
23 #include "webrtc/media/base/screencastid.h"
24 #include "webrtc/media/base/videocapturerfactory.h"
25 #include "webrtc/media/base/videocommon.h"
43 26
44 namespace rtc { 27 namespace rtc {
45 28
46 class DesktopDescription; 29 class DesktopDescription;
47 class WindowDescription; 30 class WindowDescription;
48 class WindowPicker; 31 class WindowPicker;
49 32
50 } 33 }
51 namespace cricket { 34 namespace cricket {
52 35
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 VideoDeviceCapturerFactory> video_device_capturer_factory_; 184 VideoDeviceCapturerFactory> video_device_capturer_factory_;
202 rtc::scoped_ptr< 185 rtc::scoped_ptr<
203 ScreenCapturerFactory> screen_capturer_factory_; 186 ScreenCapturerFactory> screen_capturer_factory_;
204 std::map<std::string, VideoFormat> max_formats_; 187 std::map<std::string, VideoFormat> max_formats_;
205 rtc::scoped_ptr<DeviceWatcher> watcher_; 188 rtc::scoped_ptr<DeviceWatcher> watcher_;
206 rtc::scoped_ptr<rtc::WindowPicker> window_picker_; 189 rtc::scoped_ptr<rtc::WindowPicker> window_picker_;
207 }; 190 };
208 191
209 } // namespace cricket 192 } // namespace cricket
210 193
211 #endif // TALK_MEDIA_DEVICES_DEVICEMANAGER_H_ 194 #endif // WEBRTC_MEDIA_DEVICES_DEVICEMANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698