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

Side by Side Diff: media/audio/audio_device_name.h

Issue 8361031: Reland the CL 8162015. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: adding MEDIA_EXPORT to AudioDeviceName Created 9 years, 2 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 MEDIA_AUDIO_AUDIO_DEVICE_NAME_H_ 5 #ifndef MEDIA_AUDIO_AUDIO_DEVICE_NAME_H_
6 #define MEDIA_AUDIO_AUDIO_DEVICE_NAME_H_ 6 #define MEDIA_AUDIO_AUDIO_DEVICE_NAME_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 #include "media/base/media_export.h"
10 11
11 namespace media { 12 namespace media {
12 13
13 struct AudioDeviceName { 14 struct MEDIA_EXPORT AudioDeviceName {
14 std::string device_name; // Name and also display name of the device. 15 AudioDeviceName();
16 AudioDeviceName(const std::string& device_name,
17 const std::string& unique_id);
tommi (sloooow) - chröme 2011/10/24 07:05:01 single spacing
no longer working on chromium 2011/10/25 20:35:53 Done.
18
19 std::string device_name; // Friendly name of the device.
15 std::string unique_id; // Unique identifier for the device. 20 std::string unique_id; // Unique identifier for the device.
16 }; 21 };
17 22
18 typedef std::list<AudioDeviceName> AudioDeviceNames; 23 typedef std::list<AudioDeviceName> AudioDeviceNames;
19 24
20 } // namespace media 25 } // namespace media
21 26
22 #endif // MEDIA_AUDIO_AUDIO_DEVICE_NAME_H_ 27 #endif // MEDIA_AUDIO_AUDIO_DEVICE_NAME_H_
OLDNEW
« no previous file with comments | « no previous file | media/audio/audio_device_name.cc » ('j') | media/audio/linux/audio_manager_linux.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698