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

Unified Diff: media/audio/audio_manager_base.h

Issue 14302003: Revert 194371 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | « media/audio/android/audio_manager_android.cc ('k') | media/audio/audio_manager_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_manager_base.h
===================================================================
--- media/audio/audio_manager_base.h (revision 194406)
+++ media/audio/audio_manager_base.h (working copy)
@@ -20,6 +20,10 @@
#include "base/win/scoped_com_initializer.h"
#endif
+#if defined(OS_ANDROID)
+#include "base/android/jni_android.h"
+#endif
+
namespace base {
class Thread;
}
@@ -93,6 +97,10 @@
virtual AudioParameters GetInputStreamParameters(
const std::string& device_id) OVERRIDE;
+#if defined(OS_ANDROID)
+ static bool RegisterAudioManager(JNIEnv* env);
+#endif
+
protected:
AudioManagerBase();
@@ -128,14 +136,16 @@
// from the audio thread (no locking).
AudioOutputDispatchersMap output_dispatchers_;
- // Get number of input or output streams.
- int input_stream_count() { return num_input_streams_; }
- int output_stream_count() { return num_output_streams_; }
-
private:
// Called by Shutdown().
void ShutdownOnAudioThread();
+#if defined(OS_ANDROID)
+ void SetAudioMode(int mode);
+ void RegisterHeadsetReceiver();
+ void UnregisterHeadsetReceiver();
+#endif
+
// Counts the number of active input streams to find out if something else
// is currently recording in Chrome.
base::AtomicRefCount num_active_input_streams_;
@@ -165,6 +175,11 @@
// and GetMessageLoop() starts returning NULL.
scoped_refptr<base::MessageLoopProxy> message_loop_;
+#if defined(OS_ANDROID)
+ // Java AudioManager instance.
+ base::android::ScopedJavaGlobalRef<jobject> j_audio_manager_;
+#endif
+
DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
};
« no previous file with comments | « media/audio/android/audio_manager_android.cc ('k') | media/audio/audio_manager_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698