Skip to content

Commit

Permalink
Merge branch 'release/v0.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@kshoji
kshoji committed Mar 2, 2015
2 parents 04f4011 + cef1eb2 commit 4ab0acc
Show file tree
Hide file tree
Showing 70 changed files with 1,708 additions and 844 deletions.
3 changes: 2 additions & 1 deletion javax.sound.midi/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ apply plugin: 'com.android.library'

dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
compile 'com.android.support:support-annotations:21.0.3'
}

android {
Expand Down Expand Up @@ -38,7 +39,7 @@ group = 'jp.kshoji'
uploadArchives {
repositories.mavenDeployer {
repository url: 'file://' + file('repository').absolutePath
pom.version = '0.0.1'
pom.version = '0.0.2'
pom.artifactId = 'javax-sound-midi'
}
}
Expand Down
Binary file added ...ry/jp/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150219.034059-1.aar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions ...p/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150219.034059-1.aar.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6ea76306311f7e4db7d59cc45abff8c0
1 change: 1 addition & 0 deletions .../kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150219.034059-1.aar.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
858ac0950bb4c110511d58dea98a75ffa805e3d0
9 changes: 9 additions & 0 deletions ...ry/jp/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150219.034059-1.pom
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>jp.kshoji</groupId>
<artifactId>javax-sound-midi</artifactId>
<version>0.0.2-SNAPSHOT</version>
<packaging>aar</packaging>
</project>
1 change: 1 addition & 0 deletions ...p/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150219.034059-1.pom.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dd9049fe3558aa4bb2da2546c187fb1f
1 change: 1 addition & 0 deletions .../kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150219.034059-1.pom.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ae0d674d7afcf769e59ead6003c2b516c6840380
Binary file added ...ry/jp/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150220.040714-2.aar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions ...p/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150220.040714-2.aar.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c6f0c03b1a18198171030af032223a62
1 change: 1 addition & 0 deletions .../kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150220.040714-2.aar.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8ef3d63a5ae73c1ea838fd269dc13623fa28a30a
9 changes: 9 additions & 0 deletions ...ry/jp/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150220.040714-2.pom
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>jp.kshoji</groupId>
<artifactId>javax-sound-midi</artifactId>
<version>0.0.2-SNAPSHOT</version>
<packaging>aar</packaging>
</project>
1 change: 1 addition & 0 deletions ...p/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150220.040714-2.pom.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dd9049fe3558aa4bb2da2546c187fb1f
1 change: 1 addition & 0 deletions .../kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150220.040714-2.pom.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ae0d674d7afcf769e59ead6003c2b516c6840380
Binary file added ...ry/jp/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150223.090205-3.aar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions ...p/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150223.090205-3.aar.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1b3157b2c1566b4d638605b60810464f
1 change: 1 addition & 0 deletions .../kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150223.090205-3.aar.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
107951dd84d0f17b57d6ab0a0613c223e17bbbba
17 changes: 17 additions & 0 deletions ...ry/jp/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150223.090205-3.pom
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>jp.kshoji</groupId>
<artifactId>javax-sound-midi</artifactId>
<version>0.0.2-SNAPSHOT</version>
<packaging>aar</packaging>
<dependencies>
<dependency>
<groupId>com.android.support</groupId>
<artifactId>support-annotations</artifactId>
<version>21.0.3</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
1 change: 1 addition & 0 deletions ...p/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150223.090205-3.pom.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5c1cf9945f3813553979c7ecbfef6999
1 change: 1 addition & 0 deletions .../kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150223.090205-3.pom.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1a99448257f2ea6bb35fa113863da26cac311d08
Binary file added ...ry/jp/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150226.082441-4.aar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions ...p/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150226.082441-4.aar.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f13f922f1596195fd8393cb2cef4e718
1 change: 1 addition & 0 deletions .../kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150226.082441-4.aar.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ec604baeca1c0ba1d7b2b85acd801329b8b9a6fb
17 changes: 17 additions & 0 deletions ...ry/jp/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150226.082441-4.pom
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>jp.kshoji</groupId>
<artifactId>javax-sound-midi</artifactId>
<version>0.0.2-SNAPSHOT</version>
<packaging>aar</packaging>
<dependencies>
<dependency>
<groupId>com.android.support</groupId>
<artifactId>support-annotations</artifactId>
<version>21.0.3</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
1 change: 1 addition & 0 deletions ...p/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150226.082441-4.pom.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5c1cf9945f3813553979c7ecbfef6999
1 change: 1 addition & 0 deletions .../kshoji/javax-sound-midi/0.0.2-SNAPSHOT/javax-sound-midi-0.0.2-20150226.082441-4.pom.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1a99448257f2ea6bb35fa113863da26cac311d08
13 changes: 13 additions & 0 deletions javax.sound.midi/repository/jp/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/maven-metadata.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>jp.kshoji</groupId>
<artifactId>javax-sound-midi</artifactId>
<version>0.0.2-SNAPSHOT</version>
<versioning>
<snapshot>
<timestamp>20150226.082441</timestamp>
<buildNumber>4</buildNumber>
</snapshot>
<lastUpdated>20150226082441</lastUpdated>
</versioning>
</metadata>
1 change: 1 addition & 0 deletions javax.sound.midi/repository/jp/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/maven-metadata.xml.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
46b33a7370c17a88009e4704be0ecd49
1 change: 1 addition & 0 deletions ...x.sound.midi/repository/jp/kshoji/javax-sound-midi/0.0.2-SNAPSHOT/maven-metadata.xml.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a8aa4f7a244b601f46c111895df54fa20aa3fbe5
Binary file added javax.sound.midi/repository/jp/kshoji/javax-sound-midi/0.0.2/javax-sound-midi-0.0.2.aar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions javax.sound.midi/repository/jp/kshoji/javax-sound-midi/0.0.2/javax-sound-midi-0.0.2.aar.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f13f922f1596195fd8393cb2cef4e718
1 change: 1 addition & 0 deletions javax.sound.midi/repository/jp/kshoji/javax-sound-midi/0.0.2/javax-sound-midi-0.0.2.aar.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ec604baeca1c0ba1d7b2b85acd801329b8b9a6fb
17 changes: 17 additions & 0 deletions javax.sound.midi/repository/jp/kshoji/javax-sound-midi/0.0.2/javax-sound-midi-0.0.2.pom
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>jp.kshoji</groupId>
<artifactId>javax-sound-midi</artifactId>
<version>0.0.2</version>
<packaging>aar</packaging>
<dependencies>
<dependency>
<groupId>com.android.support</groupId>
<artifactId>support-annotations</artifactId>
<version>21.0.3</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
1 change: 1 addition & 0 deletions javax.sound.midi/repository/jp/kshoji/javax-sound-midi/0.0.2/javax-sound-midi-0.0.2.pom.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d99a2c4239c8f3cdb5a02e077541bfbc
1 change: 1 addition & 0 deletions javax.sound.midi/repository/jp/kshoji/javax-sound-midi/0.0.2/javax-sound-midi-0.0.2.pom.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c0e0958400b282507a06eb8e4e75955d47f85d87
4 changes: 3 additions & 1 deletion javax.sound.midi/repository/jp/kshoji/javax-sound-midi/maven-metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
<versions>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.1</version>
<version>0.0.2-SNAPSHOT</version>
<version>0.0.2</version>
</versions>
<lastUpdated>20150202031557</lastUpdated>
<lastUpdated>20150302025518</lastUpdated>
</versioning>
</metadata>
2 changes: 1 addition & 1 deletion javax.sound.midi/repository/jp/kshoji/javax-sound-midi/maven-metadata.xml.md5
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d9d1252ca7fa156fddc02ad222a1469d
e2901a7e259e73b0cc363f356e93c60d
2 changes: 1 addition & 1 deletion javax.sound.midi/repository/jp/kshoji/javax-sound-midi/maven-metadata.xml.sha1
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
aec0d2ce6f0e42b25dc486717e485b0407a2552e
a850dca74462a9040533d7e61b3ae5cc6c92f774
7 changes: 5 additions & 2 deletions javax.sound.midi/src/jp/kshoji/javax/sound/midi/ControllerEventListener.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package jp.kshoji.javax.sound.midi;

import android.support.annotation.NonNull;

import java.util.EventListener;

/**
Expand All @@ -8,10 +10,11 @@
* @author K.Shoji
*/
public interface ControllerEventListener extends EventListener {

/**
* Called at {@link ShortMessage} event has fired
*
* @param event
* @param event the source message
*/
void controlChange(ShortMessage event);
void controlChange(@NonNull ShortMessage event);
}
23 changes: 22 additions & 1 deletion javax.sound.midi/src/jp/kshoji/javax/sound/midi/Instrument.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,34 @@
package jp.kshoji.javax.sound.midi;

import android.support.annotation.NonNull;

/**
* Abstract Class for MIDI Instrument
*
* @author K.Shoji
*/
public abstract class Instrument extends SoundbankResource {
private final Patch patch;

protected Instrument(Soundbank soundbank, Patch patch, String name, Class<?> dataClass) {
/**
* Constructor
*
* @param soundbank the soundbank
* @param patch the patch
* @param name the name
* @param dataClass the dataClass
*/
protected Instrument(@NonNull Soundbank soundbank, @NonNull Patch patch, @NonNull String name, @NonNull Class<?> dataClass) {
super(soundbank, name, dataClass);
this.patch = patch;
}

/**
* Get the patch of the {@link Instrument}
*
* @return the patch
*/
@NonNull
public Patch getPatch() {
return patch;
}
Expand Down
12 changes: 11 additions & 1 deletion javax.sound.midi/src/jp/kshoji/javax/sound/midi/InvalidMidiDataException.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package jp.kshoji.javax.sound.midi;

import android.support.annotation.NonNull;

/**
* {@link Exception} for invalid MIDI data.
*
Expand All @@ -8,11 +10,19 @@
public class InvalidMidiDataException extends Exception {
private static final long serialVersionUID = 2780771756789932067L;

/**
* Constructor
*/
public InvalidMidiDataException() {
super();
}

public InvalidMidiDataException(String message) {
/**
* Constructor with the message
*
* @param message the message
*/
public InvalidMidiDataException(@NonNull String message) {
super(message);
}
}
7 changes: 5 additions & 2 deletions javax.sound.midi/src/jp/kshoji/javax/sound/midi/MetaEventListener.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package jp.kshoji.javax.sound.midi;

import android.support.annotation.NonNull;

import java.util.EventListener;

/**
Expand All @@ -8,10 +10,11 @@
* @author K.Shoji
*/
public interface MetaEventListener extends EventListener {

/**
* Called at {@link MetaMessage} event has fired
*
* @param meta
* @param meta the source event
*/
void meta(MetaMessage meta);
void meta(@NonNull MetaMessage meta);
}
Loading

0 comments on commit 4ab0acc

Please sign in to comment.