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

Side by Side Diff: content/common/media/media_stream_options.h

Issue 7605019: Reduce number of unnamed-type-template-args violations. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ 5 #ifndef CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
6 #define CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ 6 #define CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 24 matching lines...) Expand all
35 // Type of media stream. 35 // Type of media stream.
36 enum MediaStreamType { 36 enum MediaStreamType {
37 kNoService = 0, 37 kNoService = 0,
38 kAudioCapture, 38 kAudioCapture,
39 kVideoCapture, 39 kVideoCapture,
40 kNumMediaStreamTypes 40 kNumMediaStreamTypes
41 }; 41 };
42 42
43 // StreamDeviceInfo describes information about a device. 43 // StreamDeviceInfo describes information about a device.
44 struct StreamDeviceInfo { 44 struct StreamDeviceInfo {
45 static const int kNoId;
46
45 StreamDeviceInfo(); 47 StreamDeviceInfo();
46 StreamDeviceInfo(MediaStreamType service_param, 48 StreamDeviceInfo(MediaStreamType service_param,
47 const std::string& name_param, 49 const std::string& name_param,
48 const std::string& device_param, 50 const std::string& device_param,
49 bool opened); 51 bool opened);
50 52
51 enum { kNoId = -1 };
52
53 // Describes the capture type. 53 // Describes the capture type.
54 MediaStreamType stream_type; 54 MediaStreamType stream_type;
55 // Friendly name of the device. 55 // Friendly name of the device.
56 std::string name; 56 std::string name;
57 // Unique name of a device. Even if there are multiple devices with the same 57 // Unique name of a device. Even if there are multiple devices with the same
58 // friendly name connected to the computer, this will be unique. 58 // friendly name connected to the computer, this will be unique.
59 std::string device_id; 59 std::string device_id;
60 // Set to true if the device has been opened, false otherwise. 60 // Set to true if the device has been opened, false otherwise.
61 bool in_use; 61 bool in_use;
62 // Id for this capture session. Unique for all sessions of the same type. 62 // Id for this capture session. Unique for all sessions of the same type.
63 int session_id; 63 int session_id;
64 }; 64 };
65 65
66 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray; 66 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray;
67 67
68 } // namespace media_stream 68 } // namespace media_stream
69 69
70 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ 70 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
OLDNEW
« no previous file with comments | « content/common/content_notification_types.h ('k') | content/common/media/media_stream_options.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698