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

Unified Diff: media/audio/android/audio_manager_android.h

Issue 14265014: Refactor android specific code in AudioManagerBase class. (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: remove OVERRIDE for mac Created 7 years, 8 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 | media/audio/android/audio_manager_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/android/audio_manager_android.h
===================================================================
--- media/audio/android/audio_manager_android.h (revision 194203)
+++ media/audio/android/audio_manager_android.h (working copy)
@@ -5,6 +5,7 @@
#ifndef MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
#define MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
+#include "base/android/jni_android.h"
#include "media/audio/audio_manager_base.h"
namespace media {
@@ -22,6 +23,13 @@
virtual AudioParameters GetInputStreamParameters(
const std::string& device_id) OVERRIDE;
+ virtual AudioOutputStream* MakeAudioOutputStream(
+ const AudioParameters& params) OVERRIDE;
+ virtual AudioInputStream* MakeAudioInputStream(
+ const AudioParameters& params, const std::string& device_id) OVERRIDE;
+ virtual void ReleaseOutputStream(AudioOutputStream* stream) OVERRIDE;
+ virtual void ReleaseInputStream(AudioInputStream* stream) OVERRIDE;
+
// Implementation of AudioManagerBase.
virtual AudioOutputStream* MakeLinearOutputStream(
const AudioParameters& params) OVERRIDE;
@@ -32,6 +40,8 @@
virtual AudioInputStream* MakeLowLatencyInputStream(
const AudioParameters& params, const std::string& device_id) OVERRIDE;
+ static bool RegisterAudioManager(JNIEnv* env);
+
protected:
virtual ~AudioManagerAndroid();
@@ -39,6 +49,13 @@
const AudioParameters& input_params) OVERRIDE;
private:
+ void SetAudioMode(int mode);
+ void RegisterHeadsetReceiver();
+ void UnregisterHeadsetReceiver();
+
+ // Java AudioManager instance.
+ base::android::ScopedJavaGlobalRef<jobject> j_audio_manager_;
+
DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid);
};
« no previous file with comments | « no previous file | media/audio/android/audio_manager_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698