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

Side by Side Diff: media/base/output_device_info.h

Issue 2043883005: Implementing AudioOutputDevice authorization timeout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Dale's comments addressed: code simplified, comments fixed. Created 4 years, 6 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
« no previous file with comments | « media/audio/audio_output_device_unittest.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_BASE_OUTPUT_DEVICE_INFO_H_ 5 #ifndef MEDIA_BASE_OUTPUT_DEVICE_INFO_H_
6 #define MEDIA_BASE_OUTPUT_DEVICE_INFO_H_ 6 #define MEDIA_BASE_OUTPUT_DEVICE_INFO_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "media/base/audio_parameters.h" 11 #include "media/base/audio_parameters.h"
12 #include "media/base/media_export.h" 12 #include "media/base/media_export.h"
13 13
14 namespace media { 14 namespace media {
15 15
16 // Result of an audio output device switch operation 16 // Result of an audio output device switch operation
17 enum OutputDeviceStatus { 17 enum OutputDeviceStatus {
18 OUTPUT_DEVICE_STATUS_OK = 0, 18 OUTPUT_DEVICE_STATUS_OK = 0,
19 OUTPUT_DEVICE_STATUS_ERROR_NOT_FOUND, 19 OUTPUT_DEVICE_STATUS_ERROR_NOT_FOUND,
20 OUTPUT_DEVICE_STATUS_ERROR_NOT_AUTHORIZED, 20 OUTPUT_DEVICE_STATUS_ERROR_NOT_AUTHORIZED,
21 OUTPUT_DEVICE_STATUS_ERROR_TIMED_OUT,
21 OUTPUT_DEVICE_STATUS_ERROR_INTERNAL, 22 OUTPUT_DEVICE_STATUS_ERROR_INTERNAL,
22 OUTPUT_DEVICE_STATUS_LAST = OUTPUT_DEVICE_STATUS_ERROR_INTERNAL, 23 OUTPUT_DEVICE_STATUS_LAST = OUTPUT_DEVICE_STATUS_ERROR_INTERNAL,
23 }; 24 };
24 25
25 using OutputDeviceStatusCB = base::Callback<void(OutputDeviceStatus)>; 26 using OutputDeviceStatusCB = base::Callback<void(OutputDeviceStatus)>;
26 27
27 // Output device information returned by 28 // Output device information returned by
28 // AudioRendererSink::GetOutputDeviceInfo() 29 // AudioRendererSink::GetOutputDeviceInfo()
29 class MEDIA_EXPORT OutputDeviceInfo { 30 class MEDIA_EXPORT OutputDeviceInfo {
30 public: 31 public:
(...skipping 30 matching lines...) Expand all
61 62
62 private: 63 private:
63 std::string device_id_; 64 std::string device_id_;
64 OutputDeviceStatus device_status_; 65 OutputDeviceStatus device_status_;
65 AudioParameters output_params_; 66 AudioParameters output_params_;
66 }; 67 };
67 68
68 } // namespace media 69 } // namespace media
69 70
70 #endif // MEDIA_BASE_OUTPUT_DEVICE_INFO_H_ 71 #endif // MEDIA_BASE_OUTPUT_DEVICE_INFO_H_
OLDNEW
« no previous file with comments | « media/audio/audio_output_device_unittest.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698