Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions PdCore/pd-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ task sourcesJar(type: Jar) {

task javadoc(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs
classpath += files("${android.sdkDirectory}/platforms/${android.compileSdk}/android.jar")
failOnError = false // TODO: fix javadoc issues
classpath += files("${android.sdkDirectory}/platforms/android-${android.compileSdk}/android.jar")
failOnError = true
}

task javadocJar(type: Jar, dependsOn: javadoc) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*/

package org.puredata.android.io;
import org.puredata.android.service.R;

import android.content.Context;
import android.app.Activity;
Expand Down Expand Up @@ -60,8 +59,10 @@ public AudioDevices(Activity context) {
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
PreferenceFragment prefFragment = (PreferenceFragment) context.getFragmentManager().findFragmentByTag("prefFragment");
Resources res = context.getResources();
mInputDevices = new AudioDeviceList(prefFragment, res.getString(R.string.pref_key_indevice));
mOutputDevices = new AudioDeviceList(prefFragment, res.getString(R.string.pref_key_outdevice));
final String inputKey = res.getString(org.puredata.android.service.R.string.pref_key_indevice);
mInputDevices = new AudioDeviceList(prefFragment, inputKey);
final String outputKey = res.getString(org.puredata.android.service.R.string.pref_key_outdevice);
mOutputDevices = new AudioDeviceList(prefFragment, outputKey);
setupAudioDeviceCallback();
}

Expand Down