Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.0.8 #20

Merged
merged 14 commits into from
Apr 26, 2024
Merged
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
8 changes: 6 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -18,6 +18,10 @@ jobs:
analyze:
name: Analyze
runs-on: macos-14
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
@@ -34,7 +38,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,4 +63,4 @@ jobs:
GITHUB_TOKEN: ${{ github.token }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
98 changes: 59 additions & 39 deletions README.md

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion local.properties.sample
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
opl3.test=/foo/bar/opl3.mid
mocha.test=/foo/bar/mocha.mid
jsyn.test=/foo/bar/jsyn.mid
clip.test=/foo/bar/jsyn.m4a
clip.test=/foo/bar/jsyn.m4a

vavi.test.volume=0.02
vavi.test.volume.midi=0.2
178 changes: 157 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@

<groupId>vavi</groupId>
<artifactId>vavi-sound-sandbox</artifactId>
<version>1.0.7</version>
<version>1.0.8</version>

<name>Vavi Sound API (Sandbox)</name>
<url>https://github.com/umjammer/vavi-sound-sandbox</url>
@@ -23,11 +23,77 @@
<properties>
<tritonus.groupId>com.github.umjammer.tritonus</tritonus.groupId> <!-- org.tritonus / com.github.umjammer.tritonus -->
<tritonus.version>0.3.13</tritonus.version>
<rococoa.groupId>com.github.umjammer.rococoa</rococoa.groupId> <!-- org.rococoa / com.github.umjammer.rococoa -->
<rococoa.version>0.8.7</rococoa.version>
<maven.plugin.validation>VERBOSE</maven.plugin.validation>
<vavi.test.volume>0.02</vavi.test.volume>
<vavi.test.volume.midi>0.2</vavi.test.volume.midi>
<maven.test.skip>false</maven.test.skip>
</properties>

<profiles>
<profile>
<id>local</id>
<activation>
<file>
<exists>${basedir}/local.properties</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.1.0</version>
<executions>
<execution>
<id>read-properties</id>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>${basedir}/local.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>uml</id>
<build>
<plugins>
<plugin>
<artifactId>plantuml-generator-maven-plugin</artifactId>
<groupId>de.elnarion.maven</groupId>
<version>1.1.2</version>
<executions>
<execution>
<id>generate-simple-diagram</id>
<goals>
<goal>generate</goal>
</goals>
<!--
<phase>generate-test-sources</phase>
-->
<configuration>
<outputFilename>javax-sound-diagram.txt</outputFilename>
<scanPackages>
<scanPackage>
</scanPackage>
</scanPackages>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<plugins>
<plugin>
@@ -44,6 +110,9 @@
<!-- https://stackoverflow.com/a/30472473 -->
<fork>true</fork>
<showWarnings>true</showWarnings>
<excludes>
<exclude>vavi/sound/twinvq/*.java</exclude>
</excludes>
</configuration>
</plugin>

@@ -54,14 +123,74 @@
<configuration>
<argLine>
-Xmx4G
-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties
-Dvavi.test.volume=0.02
--add-exports java.desktop/com.sun.media.sound=ALL-UNNAMED
-javaagent:${project.build.directory}/vavi-instrumentation.jar
-Dvavix.lang.instrumentation.VaviInstrumentation.1=vavix.lang.instrumentation.PropertiesClassFileTransformer
-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties
-Dvavi.test.volume=${vavi.test.volume}
-Dvavi.test.volume.midi=${vavi.test.volume.midi}
-Dvavi.test.version=${project.version}
</argLine>
<trimStackTrace>false</trimStackTrace>
<reuseForks>false</reuseForks>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>IntegrationTest</id>
<goals>
<goal>run</goal>
</goals>
<phase>integration-test</phase>
<configuration>
<skip>${maven.test.skip}</skip>
<target>
<java classname="IntegrationTest" fork="true">
<classpath>
<path location="${project.build.directory}/${project.artifactId}-${project.version}.${project.packaging}"/>
<path refid="maven.compile.classpath"/>
<path refid="maven.test.classpath"/>
</classpath>
<jvmarg value="-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties" />
</java>
</target>
<failOnError>true</failOnError>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<executions>
<execution>
<id>copy</id>
<phase>generate-test-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.github.umjammer.vavi-commons</groupId>
<artifactId>vavi-instrumentation</artifactId>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
<destFileName>vavi-instrumentation.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

@@ -70,14 +199,19 @@
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>maven_central</id>
<name>Maven Central</name>
<url>https://repo.maven.apache.org/maven2/</url>
</repository>
</repositories>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.10.1</version>
<version>5.10.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -88,12 +222,12 @@
<dependency>
<groupId>com.github.umjammer</groupId>
<artifactId>vavi-commons</artifactId>
<version>1.1.10</version>
<version>1.1.12</version>
</dependency>
<dependency>
<groupId>com.github.umjammer</groupId> <!-- vavi / com.github.umjammer -->
<artifactId>vavi-sound</artifactId>
<version>1.0.16</version>
<version>1.0.18</version>
<exclusions>
<exclusion>
<groupId>com.github.umjammer</groupId>
@@ -103,14 +237,9 @@
</dependency>

<dependency>
<groupId>${rococoa.groupId}</groupId>
<groupId>com.github.umjammer.rococoa</groupId> <!-- org.rococoa / com.github.umjammer.rococoa -->
<artifactId>rococoa-cocoa</artifactId>
<version>${rococoa.version}</version>
</dependency>
<dependency>
<groupId>${rococoa.groupId}</groupId>
<artifactId>rococoa-core</artifactId>
<version>${rococoa.version}</version>
<version>0.8.13</version>
</dependency>
<dependency>
<groupId>${tritonus.groupId}</groupId>
@@ -120,7 +249,7 @@
<dependency>
<groupId>com.github.lostromb</groupId>
<artifactId>concentus</artifactId>
<version>fdf276e</version>
<version>acaadf2075</version>
<type>pom</type>
</dependency>

@@ -215,21 +344,21 @@
<dependency>
<groupId>com.github.umjammer</groupId> <!-- drogatkin / com.github.umjammer -->
<artifactId>vavi-sound-flac</artifactId>
<version>0.0.5</version>
<version>0.0.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.umjammer</groupId> <!-- net.sourceforge.jaadec / com.github.umjammer -->
<artifactId>vavi-sound-aac</artifactId>
<version>0.8.10</version>
<version>0.8.12</version>
<scope>test</scope>
</dependency>
<!--
-->
<dependency>
<groupId>com.github.umjammer</groupId> <!-- net.javazoom / com.github.umjammer -->
<artifactId>mp3spi</artifactId>
<version>1.9.15</version>
<version>1.9.16</version>
<scope>test</scope>
</dependency>

@@ -243,7 +372,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>2.0.5</version>
<version>2.0.13</version>
<scope>test</scope>
</dependency>
<!--
@@ -300,7 +429,14 @@
<dependency>
<groupId>com.github.umjammer</groupId>
<artifactId>vavi-sound-alac</artifactId>
<version>0.3.4</version>
<version>0.3.5</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.github.umjammer.vavi-commons</groupId>
<artifactId>vavi-instrumentation</artifactId>
<version>1.1.12</version>
<scope>test</scope>
</dependency>
</dependencies>
10 changes: 5 additions & 5 deletions src/main/java/jp/or/rim/kt/kemusiro/sound/ChangeInstrument.java
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
package jp.or.rim.kt.kemusiro.sound;

/**
* 音色を変えるイベントを表すクラス。
* A class that represents an event that changes the tone.
*
* @author Kenichi Miyata (kemusiro&#x40;kt.rim.or.jp)
* @version $Revision: 1.2 $
@@ -15,11 +15,11 @@ public class ChangeInstrument extends MusicEvent {
private final Instrument instrument;

/**
* 音色を変更するイベントを作成する。
* Creates an event to change the tone.
*
* @param newTick ティック
* @param newChannel チャネル番号
* @param newInstrument 新しい音色
* @param newTick tick
* @param newChannel channel number
* @param newInstrument new tone
*/
public ChangeInstrument(int newTick, int newChannel, Instrument newInstrument) {
tick = newTick;
2 changes: 1 addition & 1 deletion src/main/java/jp/or/rim/kt/kemusiro/sound/ChangeTempo.java
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
package jp.or.rim.kt.kemusiro.sound;

/**
* テンポを変えるイベントを表すクラス。
* A class that represents an event that changes the tempo.
*
* @author Kenichi Miyata (kemusiro&#x40;kt.rim.or.jp)
* @version $Revision: 1.2 $
Loading