Skip to content

Commit

Permalink
Fixed compile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@kshoji
kshoji committed Jun 18, 2014
1 parent 2daddfc commit 82d55d5
Show file tree
Hide file tree
Showing 14 changed files with 135 additions and 16 deletions.
14 changes: 7 additions & 7 deletions MIDIDriver/snapshots/jp/kshoji/midi-driver/0.0.1-SNAPSHOT/maven-metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
<version>0.0.1-SNAPSHOT</version>
<versioning>
<snapshot>
<timestamp>20140618.093717</timestamp>
<buildNumber>17</buildNumber>
<timestamp>20140618.112341</timestamp>
<buildNumber>18</buildNumber>
</snapshot>
<lastUpdated>20140618093717</lastUpdated>
<lastUpdated>20140618112341</lastUpdated>
<snapshotVersions>
<snapshotVersion>
<extension>aar</extension>
<value>0.0.1-20140618.093717-17</value>
<updated>20140618093717</updated>
<value>0.0.1-20140618.112341-18</value>
<updated>20140618112341</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>0.0.1-20140618.093717-17</value>
<updated>20140618093717</updated>
<value>0.0.1-20140618.112341-18</value>
<updated>20140618112341</updated>
</snapshotVersion>
<snapshotVersion>
<extension>apklib</extension>
Expand Down
2 changes: 1 addition & 1 deletion MIDIDriver/snapshots/jp/kshoji/midi-driver/0.0.1-SNAPSHOT/maven-metadata.xml.md5
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4c7040aace18e647cb3d1a4f935d33bb
f753c076d19101153b547d4f6a22e6e8
2 changes: 1 addition & 1 deletion MIDIDriver/snapshots/jp/kshoji/midi-driver/0.0.1-SNAPSHOT/maven-metadata.xml.sha1
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2cf621816ce3b81551b7f5b4a0e0778df1def8a6
3ec6f9e272b120fc18e99a207b51fcde4ed398f7
Binary file added ...r/snapshots/jp/kshoji/midi-driver/0.0.1-SNAPSHOT/midi-driver-0.0.1-20140618.112341-18.aar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions ...apshots/jp/kshoji/midi-driver/0.0.1-SNAPSHOT/midi-driver-0.0.1-20140618.112341-18.aar.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e5d186914138fb7a1952e4d5f3348a15
1 change: 1 addition & 0 deletions ...pshots/jp/kshoji/midi-driver/0.0.1-SNAPSHOT/midi-driver-0.0.1-20140618.112341-18.aar.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
545a95577e5c79dbc42a4f3f8bcf44102d5017bd
115 changes: 115 additions & 0 deletions ...r/snapshots/jp/kshoji/midi-driver/0.0.1-SNAPSHOT/midi-driver-0.0.1-20140618.112341-18.pom
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>jp.kshoji</groupId>
<artifactId>midi-driver</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>aar</packaging>
<name>Android USB MIDI Driver Library</name>
<description>USB MIDI Driver for Android tablets(3.1 or higher)</description>
<url>https://github.com/kshoji/USB-MIDI-Driver</url>

<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/kshoji/USB-MIDI-Driver/issues</url>
</issueManagement>

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<url>https://github.com/kshoji/USB-MIDI-Driver/tree/master</url>
<connection>scm:git:git://github.com/kshoji/USB-MIDI-Driver.git</connection>
<developerConnection>scm:git:ssh://git@github.com/kshoji/USB-MIDI-Driver.git</developerConnection>
<tag>HEAD</tag>
</scm>

<developers>
<developer>
<email>0x0badc0de@gmail.com</email>
<name>Kaoru Shoji</name>
<url>https://github.com/kshoji</url>
<id>kshoji</id>
</developer>
</developers>

<distributionManagement>
<repository>
<id>release-repo</id>
<url>file://${project.build.directory}/release-repo</url>
</repository>
<snapshotRepository>
<id>snapshot-repo</id>
<url>file://${project.build.directory}/snapshot-repo</url>
</snapshotRepository>
</distributionManagement>

<build>
<sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<compilerVersion>1.6</compilerVersion>
</configuration>
</plugin>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<version>3.8.2</version>
<configuration>
<androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile>
<resourceDirectory>${project.basedir}/res</resourceDirectory>
<sdk>
<platform>12</platform>
</sdk>
<deleteConflictingFiles>true</deleteConflictingFiles>
<undeployBeforeDeploy>true</undeployBeforeDeploy>
</configuration>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.9</version>
<configuration>
<excludes>
<exclude>android:android</exclude>
</excludes>
<classpathContainers>
<classpathContainer>com.android.ide.eclipse.adt.ANDROID_FRAMEWORK</classpathContainer>
</classpathContainers>
<additionalProjectnatures>
<projectnature>com.android.ide.eclipse.adt.AndroidNature</projectnature>
</additionalProjectnatures>
<additionalBuildcommands>
<buildcommand>com.android.ide.eclipse.adt.ResourceManagerBuilder</buildcommand>
<buildcommand>com.android.ide.eclipse.adt.PreCompilerBuilder</buildcommand>
<buildcommand>com.android.ide.eclipse.adt.ApkBuilder</buildcommand>
</additionalBuildcommands>
<useProjectReferences>false</useProjectReferences>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<!-- install dependency using https://github.com/mosabua/maven-android-sdk-deployer -->
<!-- mvn install -P 3.1 -->
<dependency>
<groupId>android</groupId>
<artifactId>android</artifactId>
<version>3.1_r3</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
1 change: 1 addition & 0 deletions ...apshots/jp/kshoji/midi-driver/0.0.1-SNAPSHOT/midi-driver-0.0.1-20140618.112341-18.pom.md5
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
abbd6cc70dbc8134034e3216e29b24be
1 change: 1 addition & 0 deletions ...pshots/jp/kshoji/midi-driver/0.0.1-SNAPSHOT/midi-driver-0.0.1-20140618.112341-18.pom.sha1
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
27a6d0fce2812f057cc62b83defa324036795336
2 changes: 1 addition & 1 deletion MIDIDriver/snapshots/jp/kshoji/midi-driver/maven-metadata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
<versions>
<version>0.0.1-SNAPSHOT</version>
</versions>
<lastUpdated>20140618093717</lastUpdated>
<lastUpdated>20140618112341</lastUpdated>
</versioning>
</metadata>
2 changes: 1 addition & 1 deletion MIDIDriver/snapshots/jp/kshoji/midi-driver/maven-metadata.xml.md5
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ebcf46f8cc53571ef60a32dec32349e3
8bb173a71395eb538d04d93445684f5f
2 changes: 1 addition & 1 deletion MIDIDriver/snapshots/jp/kshoji/midi-driver/maven-metadata.xml.sha1
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e5b02a1489a1a05962edbe511b14262710e4ea71
cd600ab39f608093089fe10471886a2c4f765a91
6 changes: 3 additions & 3 deletions MIDIDriver/src/jp/kshoji/javax/sound/midi/MidiSystem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ public static boolean isFileTypeSupported(int fileType) {
* @param sequence
* @return
*/
static boolean isFileTypeSupported(int fileType, Sequence sequence) {
public static boolean isFileTypeSupported(int fileType, Sequence sequence) {
StandardMidiFileWriter standardMidiFileWriter = new StandardMidiFileWriter();
return standardMidiFileWriter.isFileTypeSupported(fileType, sequence);
}
Expand All @@ -572,7 +572,7 @@ static boolean isFileTypeSupported(int fileType, Sequence sequence) {
* @return
* @throws IOException
*/
static int write(Sequence sequence, int fileType, File file) throws IOException {
public static int write(Sequence sequence, int fileType, File file) throws IOException {
StandardMidiFileWriter standardMidiFileWriter = new StandardMidiFileWriter();
return standardMidiFileWriter.write(sequence, fileType, file);
}
Expand All @@ -586,7 +586,7 @@ static int write(Sequence sequence, int fileType, File file) throws IOException
* @return
* @throws IOException
*/
static int write(Sequence sequence, int fileType, OutputStream outputStream) throws IOException {
public static int write(Sequence sequence, int fileType, OutputStream outputStream) throws IOException {
StandardMidiFileWriter standardMidiFileWriter = new StandardMidiFileWriter();
return standardMidiFileWriter.write(sequence, fileType, outputStream);
}
Expand Down
2 changes: 1 addition & 1 deletion MIDIDriver/src/jp/kshoji/javax/sound/midi/Synthesizer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public interface Synthesizer extends MidiDevice {
Instrument[] getAvailableInstruments();

MidiChannel getChannels();
MidiChannel[] getChannels();

Soundbank getDefaultSoundbank();

Expand Down

0 comments on commit 82d55d5

Please sign in to comment.