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

Side by Side Diff: media/audio/pulse/audio_manager_pulse.h

Issue 2322083003: Revert of Add GetAssociatedOutputDeviceID support to pulse. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | media/audio/pulse/audio_manager_pulse.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_PULSE_AUDIO_MANAGER_PULSE_H_ 5 #ifndef MEDIA_AUDIO_PULSE_AUDIO_MANAGER_PULSE_H_
6 #define MEDIA_AUDIO_PULSE_AUDIO_MANAGER_PULSE_H_ 6 #define MEDIA_AUDIO_PULSE_AUDIO_MANAGER_PULSE_H_
7 7
8 #include <pulse/pulseaudio.h> 8 #include <pulse/pulseaudio.h>
9 #include <string> 9 #include <string>
10 10
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 const std::string& device_id, 42 const std::string& device_id,
43 const LogCallback& log_callback) override; 43 const LogCallback& log_callback) override;
44 AudioInputStream* MakeLinearInputStream( 44 AudioInputStream* MakeLinearInputStream(
45 const AudioParameters& params, 45 const AudioParameters& params,
46 const std::string& device_id, 46 const std::string& device_id,
47 const LogCallback& log_callback) override; 47 const LogCallback& log_callback) override;
48 AudioInputStream* MakeLowLatencyInputStream( 48 AudioInputStream* MakeLowLatencyInputStream(
49 const AudioParameters& params, 49 const AudioParameters& params,
50 const std::string& device_id, 50 const std::string& device_id,
51 const LogCallback& log_callback) override; 51 const LogCallback& log_callback) override;
52 std::string GetAssociatedOutputDeviceID(
53 const std::string& input_device_id) override;
54 std::string GetDefaultOutputDeviceID() override;
55 52
56 protected: 53 protected:
57 ~AudioManagerPulse() override; 54 ~AudioManagerPulse() override;
58 55
59 AudioParameters GetPreferredOutputStreamParameters( 56 AudioParameters GetPreferredOutputStreamParameters(
60 const std::string& output_device_id, 57 const std::string& output_device_id,
61 const AudioParameters& input_params) override; 58 const AudioParameters& input_params) override;
62 59
63 private: 60 private:
64 bool InitPulse(); 61 bool InitPulse();
(...skipping 30 matching lines...) Expand all
95 pa_context* input_context_; 92 pa_context* input_context_;
96 AudioDeviceNames* devices_; 93 AudioDeviceNames* devices_;
97 int native_input_sample_rate_; 94 int native_input_sample_rate_;
98 95
99 DISALLOW_COPY_AND_ASSIGN(AudioManagerPulse); 96 DISALLOW_COPY_AND_ASSIGN(AudioManagerPulse);
100 }; 97 };
101 98
102 } // namespace media 99 } // namespace media
103 100
104 #endif // MEDIA_AUDIO_PULSE_AUDIO_MANAGER_PULSE_H_ 101 #endif // MEDIA_AUDIO_PULSE_AUDIO_MANAGER_PULSE_H_
OLDNEW
« no previous file with comments | « no previous file | media/audio/pulse/audio_manager_pulse.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698