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

Unified Diff: chromeos/audio/audio_device.h

Issue 515573003: app_shell: Do simple audio initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wrap line Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chromeos/audio/audio_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/audio/audio_device.h
diff --git a/chromeos/audio/audio_device.h b/chromeos/audio/audio_device.h
index 31e45fdcbbe062e4deddce7cc4399e8d34ca9a9a..75ac0898510d7a6fcd85bf4d733e903ff9416672 100644
--- a/chromeos/audio/audio_device.h
+++ b/chromeos/audio/audio_device.h
@@ -29,6 +29,15 @@ enum AudioDeviceType {
};
struct CHROMEOS_EXPORT AudioDevice {
+ AudioDevice();
+ explicit AudioDevice(const AudioNode& node);
+ std::string ToString() const;
+
+ // Converts between the string type sent via D-Bus and AudioDeviceType.
+ // Static so they can be used by tests.
+ static std::string GetTypeString(chromeos::AudioDeviceType type);
+ static chromeos::AudioDeviceType GetAudioType(const std::string& node_type);
+
bool is_input;
uint64 id;
std::string display_name;
@@ -37,10 +46,6 @@ struct CHROMEOS_EXPORT AudioDevice {
uint8 priority;
bool active;
uint64 plugged_time;
-
- AudioDevice();
- explicit AudioDevice(const AudioNode& node);
- std::string ToString() const;
};
typedef std::vector<AudioDevice> AudioDeviceList;
« no previous file with comments | « no previous file | chromeos/audio/audio_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698