media/audio/android/opensles_output.h - Issue 12571006: Add MODIFY_AUDIO_SETTINGS permission in Android manifest and implementation in audio manager.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12571006: Add MODIFY_AUDIO_SETTINGS permission in Android manifest and implementation in audio manager. (Closed) Base URL: https://src.chromium.org/svn/trunk/src/

Patch Set: rebase Created 7 years, 9 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

« media/audio/android/audio_manager_android.cc ('K') | « media/audio/android/audio_manager_android.cc ('k') | media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java » ('j') | media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/audio/android/opensles_output.h

===================================================================

--- media/audio/android/opensles_output.h (revision 187380)

+++ media/audio/android/opensles_output.h (working copy)

@@ -5,13 +5,15 @@

#ifndef MEDIA_AUDIO_ANDROID_OPENSLES_OUTPUT_H_

#define MEDIA_AUDIO_ANDROID_OPENSLES_OUTPUT_H_

-#include <vector>

+#include <SLES/OpenSLES.h>

+#include <SLES/OpenSLES_Android.h>

+#include <SLES/OpenSLES_AndroidConfiguration.h>

+#include "base/android/jni_android.h"

Yaron 2013/03/11 21:56:50 This include isn't needed anymore, right?

leozwang1 2013/03/12 22:23:00 Done.

#include "base/compiler_specific.h"

#include "media/audio/android/opensles_util.h"

#include "media/audio/audio_io.h"

#include "media/audio/audio_parameters.h"

-#include <SLES/OpenSLES_Android.h>

namespace media {