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

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

Issue 8499029: make pulseaudio available for all posix platforms because it's not linux only (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: re-sync with the linux code Created 9 years, 1 month 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
Index: media/audio/pulse/pulse_output.cc
diff --git a/media/audio/linux/pulse_output.cc b/media/audio/pulse/pulse_output.cc
similarity index 98%
rename from media/audio/linux/pulse_output.cc
rename to media/audio/pulse/pulse_output.cc
index ddd23ca7a8cc3818d43f4776fe23f459011f3a42..5010a9ecf5a540211f8052a3c8f2e8a324dda3b4 100644
--- a/media/audio/linux/pulse_output.cc
+++ b/media/audio/pulse/pulse_output.cc
@@ -2,13 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "media/audio/linux/pulse_output.h"
+#include "media/audio/pulse/pulse_output.h"
#include "base/bind.h"
#include "base/message_loop.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/audio_util.h"
+#if defined(OS_LINUX)
#include "media/audio/linux/audio_manager_linux.h"
+#elif defined(OS_OPENBSD)
+#include "media/audio/openbsd/audio_manager_openbsd.h"
+#endif
#include "media/base/data_buffer.h"
#include "media/base/seekable_buffer.h"
@@ -128,7 +132,7 @@ void PulseAudioOutputStream::WriteRequestCallback(
}
PulseAudioOutputStream::PulseAudioOutputStream(const AudioParameters& params,
- AudioManagerLinux* manager,
+ AudioManagerPulse* manager,
MessageLoop* message_loop)
: channel_layout_(params.channel_layout),
channel_count_(ChannelLayoutToChannelCount(channel_layout_)),
@@ -156,7 +160,7 @@ PulseAudioOutputStream::PulseAudioOutputStream(const AudioParameters& params,
PulseAudioOutputStream::~PulseAudioOutputStream() {
// All internal structures should already have been freed in Close(),
- // which calls AudioManagerLinux::Release which deletes this object.
+ // which calls AudioManagerPulse::Release which deletes this object.
DCHECK(!playback_handle_);
DCHECK(!pa_context_);
DCHECK(!pa_mainloop_);

Powered by Google App Engine
This is Rietveld 408576698