Skip to content

Commit c81b2a7

Browse files
committed
Merge branch 'master' of github:bmeike/ProgrammingAndroidExamples
2 parents 5e5d150 + 8680e95 commit c81b2a7

File tree

6 files changed

+14
-5
lines changed

6 files changed

+14
-5
lines changed

‎14/AudioPlayer/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<uses-permission android:name="android.permission.RECORD_VIDEO"/>
2727
<uses-permission android:name="android.permission.INTERNET"/>
2828
<uses-permission android:name="android.permission.CAMERA"/>
29+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
2930
<uses-sdk android:targetSdkVersion="9"></uses-sdk>
3031

31-
</manifest>
32+
</manifest>

‎14/AudioPlayer/README.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
This example must be run on actual hardware (not an emulator)
2-
as this contains hardware specific code.
2+
as this contains hardware specific code.
3+
4+
5+
(This was tested on a Nexus One and Nexus S phones)

‎14/AudioPlayer/src/com/oreilly/demo/pa/ch14/AudioPlayerWAudioTrack.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ private void initializeAudioTrack() {
134134
audiotrack = new AudioTrack(
135135
AudioManager.STREAM_MUSIC, // stream type
136136
44100, // frequency
137-
AudioFormat.CHANNEL_IN_MONO, // channel config.. mono, stereo, etc
137+
AudioFormat.CHANNEL_CONFIGURATION_MONO, // channel config.. mono, stereo, etc
138138
AudioFormat.ENCODING_PCM_16BIT, // audio encoding
139139
audio.length, // length
140140
AudioTrack.MODE_STREAM // mode

‎14/AudioPlayer/src/com/oreilly/demo/pa/ch14/AudioRecorderWAudioRecord.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private void recordOrStop() {
8787

8888
recorder = new AudioRecord(MediaRecorder.AudioSource.MIC, // source to record from
8989
44100,// frequency
90-
AudioFormat.CHANNEL_IN_MONO,// channel config.. mono, stereo, etc
90+
AudioFormat.CHANNEL_CONFIGURATION_MONO,// channel config.. mono, stereo, etc
9191
AudioFormat.ENCODING_PCM_16BIT,// audio encoding
9292
buffer.length// buffer size
9393
);

‎16/SensorDemos/README.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
This example must be run on actual hardware (not an emulator)
2-
as this contains hardware specific code.
2+
as this contains hardware specific code.
3+
4+
(This was tested on a Nexus S phone)

‎18/NDKDemo/README.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
This example must be run on actual hardware (not an emulator)
22
as this contains hardware specific code.
3+
4+
5+
(This was tested on a Nexus One and Nexus S phones)

0 commit comments

Comments
 (0)