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

Unified Diff: media/audio/pulse/audio_manager_pulse.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/pulse/audio_manager_pulse.h ('k') | media/audio/pulse/pulse.sigs » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/pulse/audio_manager_pulse.cc
diff --git a/media/audio/pulse/audio_manager_pulse.cc b/media/audio/pulse/audio_manager_pulse.cc
index 340f88f9b197795ddcd95dbb95061bce7b41660f..398826ae1c360a03dcaebfcfea59e8be8e592adb 100644
--- a/media/audio/pulse/audio_manager_pulse.cc
+++ b/media/audio/pulse/audio_manager_pulse.cc
@@ -174,29 +174,6 @@
return MakeInputStream(params, device_id);
}
-std::string AudioManagerPulse::GetDefaultOutputDeviceID() {
- return pulse::GetRealDefaultDeviceId(input_mainloop_, input_context_,
- pulse::RequestType::OUTPUT);
-}
-
-std::string AudioManagerPulse::GetAssociatedOutputDeviceID(
- const std::string& input_device_id) {
- DCHECK(AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread());
- DCHECK(input_mainloop_);
- DCHECK(input_context_);
- std::string input =
- (input_device_id == AudioDeviceDescription::kDefaultDeviceId)
- ? pulse::GetRealDefaultDeviceId(input_mainloop_, input_context_,
- pulse::RequestType::INPUT)
- : input_device_id;
-
- std::string input_bus =
- pulse::GetBusOfInput(input_mainloop_, input_context_, input);
- return input_bus.empty() ? ""
- : pulse::GetOutputCorrespondingTo(
- input_mainloop_, input_context_, input_bus);
-}
-
AudioParameters AudioManagerPulse::GetPreferredOutputStreamParameters(
const std::string& output_device_id,
const AudioParameters& input_params) {
« no previous file with comments | « media/audio/pulse/audio_manager_pulse.h ('k') | media/audio/pulse/pulse.sigs » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698