Merge branch 'hotfix/fix_for_pull_request_11'

kshoji · Dec 24, 2013 · 5c4deed · 5c4deed
2 parents cdcf1ac + 2218cda
commit 5c4deed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/MIDIDriver/.classpath b/MIDIDriver/.classpath
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/MIDIDriverSample/.classpath b/MIDIDriverSample/.classpath
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/MIDIDriverSample/src/jp/kshoji/driver/midi/sample/MIDIDriverSingleSampleActivity.java b/MIDIDriverSample/src/jp/kshoji/driver/midi/sample/MIDIDriverSingleSampleActivity.java
@@ -322,7 +322,7 @@ public void onMidiPolyphonicAftertouch(final MidiInputDevice sender, int cable,
 	 */
 	@Override
 	public void onMidiControlChange(final MidiInputDevice sender, int cable, int channel, int function, int value) {
-		midiInputEventAdapter.add("ControlChange cable: " + cable + ", channel: " + channel + ", function: " + function + ", value: " + value);
+		midiInputEventHandler.sendMessage(Message.obtain(midiInputEventHandler, 0, "ControlChange cable: " + cable + ", channel: " + channel + ", function: " + function + ", value: " + value));
 
 		if (thruToggleButton != null && thruToggleButton.isChecked() && getMidiOutputDevice() != null) {
 			getMidiOutputDevice().sendMidiControlChange(cable, channel, function, value);