Skip to content

Commit

Permalink
Merge branch 'helge17:master' into Workflow-android
Browse files Browse the repository at this point in the history
  • Loading branch information
G-eos authored Nov 7, 2024
2 parents 46bfea5 + 8d37154 commit 5f3d717
Show file tree
Hide file tree
Showing 947 changed files with 10,439 additions and 5,247 deletions.
34 changes: 34 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,44 @@ Hernan Andres Casadesus

Guiv42
* Developer
* French translation
* Contact: https://github.com/guiv42

Helge17
* Binary builds
* Breeze Theme
* German and Italian translation
* Contact: https://github.com/helge17

BeFrankly
* Developer
* Documentation
* Contact: https://github.com/BeFrankly

Makoha
* Developer
* Contact: https://github.com/Makoha

harborsiem
* Developer
* Contact: https://github.com/harborsiem

Lukramancer
* Developer
* Contact: https://github.com/Lukramancer

Trung An (An Đức Trung)
* Developer
* Contact: https://github.com/tdan

Vendelisk
* Documentation
* https://github.com/Vendelisk

Olivier Humbert
* French translation
* Contact: https://github.com/trebmuh

Dennis Deutschmann
* Magic Sound Font v2.0 Contribution
* Contact: <[email protected]>
Expand Down Expand Up @@ -69,6 +95,10 @@ Tomasz Bojczuk
* Polish translation
* Contact: <[email protected]>

Grzegorz Pruchniakowski
* Polish translation
* Contact: https://github.com/Gootector

Jose Gato
* Mac version
* Contact: <[email protected]>
Expand Down Expand Up @@ -136,6 +166,10 @@ Gabe Hargrave
* Documentation
* Contact: <[email protected]>

Olesya Gerasimenko
* Russian translation
* Contact: https://github.com/OlesyaGerasimenko

Vadim Ipatov
* Russian translation
* Contact: <[email protected]> http://www.kmtn.ru/~euphoria
Expand Down
38 changes: 36 additions & 2 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,6 +1,40 @@
TuxGuitar 9.99-SNAPSHOT changes:
TuxGuitar 1.6.4 (2024-08-23) changes:

* ...
* Fixed performance issue on newer Linux versions
* Updated Polish and Russian translation
* Reworked duration and division menus
* Reworked file open/save/import/export behaviour
* Show dead note correctly in score
* The chord editor now considers the current key signature when opening
* Fixed bug when switching between page and linear layout
* Added a text filter in plugin list
* Improved notes names display on fretboard
* Configurable fretboard size
* More small improvements and cleanups

TuxGuitar 1.6.3 (2024-06-06) changes:

* Fixed stuck splash screen on Linux/Wayland
* Fixed "Save As" file type on Windows
* Fixed audio export of percussion tracks
* Fixed several batch converter issues
* Updated dependencies for compatibility with Ubuntu 24.04 LTS
* Improved button in toolbar for tuplets
* "Currently played beat" highlight improved
* Made caret more visible
* Adapted copy-paste function to better handle different tuning presets
* Enabled files to be opened with double-click in Finder on MacOS
* Display menu accelerators correctly on MacOS
* Removed confirmation "Do you want to apply changes now?"
* Made marker font configurable
* Simplified "Change Tuning" dialog
* Improved MusicXML, MIDI and PDF export
* Added menu entries for advanced selection features
* Changed Ctrl+A shortcut to "Select Entire Track"
* Improved note spacing
* Improved editing and display of percussion tracks
* Removed broken "Export to Gervill Audio File" Plugin
* Many small improvements and cleanups

TuxGuitar 1.6.2 (2024-04-01) changes:

Expand Down
14 changes: 8 additions & 6 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ For hints and workarounds needed to build TuxGuitar, see the script
misc/build_tuxguitar_from_source.sh
```

You can also try to build TuxGuitar using the [GitHub Actions](https://docs.github.com/en/actions) defined in the `.github` folder.

## Prerequisites

- JDK 9 or higher
Expand All @@ -29,7 +31,7 @@ misc/build_tuxguitar_from_source.sh
### Install Prerequisites

```sh
$ sudo apt install wget unzip git build-essential default-jdk maven libwebkit2gtk-4.0-37 libfluidsynth-dev libjack-jackd2-dev libasound2-dev liblilv-dev libsuil-dev qtbase5-dev
$ sudo apt install wget unzip git build-essential default-jdk maven libwebkit2gtk-4.1-0 libfluidsynth-dev libjack-jackd2-dev libasound2-dev liblilv-dev libsuil-dev qtbase5-dev
```

In order for Asian characters to be displayed correctly, you may also need to install the `fonts-wqy-zenhei` font package.
Expand Down Expand Up @@ -97,11 +99,11 @@ $ sudo apt install wget unzip git default-jdk maven gcc-mingw-w64-x86-64 g++-min
### Download and install SWT for Windows

```sh
$ wget https://archive.eclipse.org/eclipse/downloads/drops4/R-4.21-202109060500/swt-4.21-win32-win32-x86_64.zip
$ mkdir swt-4.21-win32-win32-x86_64
$ cd swt-4.21-win32-win32-x86_64
$ unzip ../swt-4.21-win32-win32-x86_64.zip
$ mvn install:install-file -Dfile=swt.jar -DgroupId=org.eclipse.swt -DartifactId=org.eclipse.swt.win32.win32 -Dpackaging=jar -Dversion=4.21
$ wget https://archive.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/swt-4.26-win32-win32-x86_64.zip
$ mkdir swt-4.26-win32-win32-x86_64
$ cd swt-4.26-win32-win32-x86_64
$ unzip ../swt-4.26-win32-win32-x86_64.zip
$ mvn install:install-file -Dfile=swt.jar -DgroupId=org.eclipse.swt -DartifactId=org.eclipse.swt.win32.win32 -Dpackaging=jar -Dversion=4.26
$ cd ..
```

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ TuxGuitar includes the following third party products:

* SWT version: SWT (Standard Widget Toolkit): https://www.eclipse.org/swt/
* JFX version: JavaFX (Java client application platform): https://openjfx.io/
* Gervill (Software Synthesizer): https://gervill.dev.java.net/
* Gervill (Java Software Synthesizer)
* iText (Free Java-PDF library): https://itextpdf.com/
* Magic Sound Font v2.0 - Contributed by Dennis Deutschmann

## Installation

You can find ready to use installation packages for Linux, Windows, MacOS, FreeBSD and Android here: [releases](https://github.com/helge17/tuxguitar/releases/)
You can find ready to use installation packages for Linux, Windows, MacOS, FreeBSD and Android here: [releases](https://github.com/helge17/tuxguitar/releases/).

To build TuxGuitar from source code, refer to the [INSTALL.md](INSTALL.md) file.

## Contribute

If you want to contribute to TuxGuitar, you will find a helpful description in the file [contribute.md](doc/contribute.md).
If you want to contribute to TuxGuitar, you will find a helpful description in the [contribute.md](doc/contribute.md) file.
1 change: 0 additions & 1 deletion android/TuxGuitar-android-browser-saf/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.herac.tuxguitar.android.browser.saf"
android:installLocation="auto" >
</manifest>
11 changes: 7 additions & 4 deletions android/TuxGuitar-android-browser-saf/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 30
buildToolsVersion "30.0.3"

namespace = 'org.herac.tuxguitar.android.browser.saf'

compileSdkVersion 31

defaultConfig {
minSdkVersion 19
targetSdkVersion 30
minSdkVersion 24
targetSdkVersion 31
versionCode 1
versionName "1.0"
}
Expand All @@ -30,4 +32,5 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':tuxguitar-android')
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.documentfile:documentfile:1.0.1'
}
1 change: 0 additions & 1 deletion android/TuxGuitar-android-gervill/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.herac.tuxguitar.android.gervill"
android:installLocation="auto" >
</manifest>
14 changes: 6 additions & 8 deletions android/TuxGuitar-android-gervill/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 30
buildToolsVersion "30.0.3"

namespace = 'org.herac.tuxguitar.android.gervill'

compileSdkVersion 31

defaultConfig {
minSdkVersion 19
targetSdkVersion 30
minSdkVersion 24
targetSdkVersion 31
versionCode 1
versionName "1.0"
}
Expand All @@ -17,10 +19,6 @@ android {
}
}

dexOptions {
additionalParameters=['--core-library']
}

sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

/**
* This class is used to convert between 8,16,24,32,32+ bit signed/unsigned
* big/litle endian fixed/floating point byte buffers and float buffers.
* big/little endian fixed/floating point byte buffers and float buffers.
*
* @author Karl Helgason
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

/**
* This class is used to convert between 8,16,24,32 bit signed/unsigned
* big/litle endian fixed/floating stereo/mono/multi-channel audio streams and
* big/little endian fixed/floating stereo/mono/multi-channel audio streams and
* perform sample-rate conversion if needed.
*
* @author Karl Helgason
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class AudioSynthesizerPropertyInfo {
/**
* Constructs a <code>AudioSynthesizerPropertyInfo</code> object with a given
* name and value. The <code>description</code> and <code>choices</code>
* are intialized by <code>null</code> values.
* are initialized by <code>null</code> values.
*
* @param name the name of the property
* @param value the current value or class used for values.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public class DLSInfo {
*/
public String artist = null;
/**
* (ICMS) Names of persons or orginizations who commissioned the file.
* (ICMS) Names of persons or organizations who commissioned the file.
*/
public String commissioned = null;
/**
Expand All @@ -93,8 +93,8 @@ public class DLSInfo {
*/
public String subject = null;
/**
* (ISRC) Name of person or orginization who supplied
* orginal material for the file.
* (ISRC) Name of person or organization who supplied
* original material for the file.
*/
public String source = null;
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

/**
* This exception is used when a reader is used to read file of a format
* it doesn't unterstand or support.
* it doesn't understand or support.
*
* @author Karl Helgason
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

/**
* This exception is used when a reader is used to read RIFF file of a format it
* doesn't unterstand or support.
* doesn't understand or support.
*
* @author Karl Helgason
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,7 @@ public void resetAllControllers(boolean allControls) {
for (int controller : co_midi_nrpn_nrpn.keySet())
nrpnChange(controller, 0);
rpnChange(0, 2 << 7); // Bitch Bend sensitivity
rpnChange(1, 64 << 7); // Channel fine tunning
rpnChange(1, 64 << 7); // Channel fine tuning
rpnChange(2, 64 << 7); // Channel Coarse Tuning
rpnChange(5, 64); // Modulation Depth, +/- 50 cent

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ private static class JitterStream extends InputStream {
byte[][] buffers;
Object buffers_mutex = new Object();

// Adapative Drift Statistics
// Adaptive Drift Statistics
int w_count = 1000;
int w_min_tol = 2;
int w_max_tol = 10;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void interpolate(float[] in, float[] in_offset, float in_end,
if (!(ix < ix_end && ox < ox_end))
return;

// 15 bit shift was choosed because
// 15 bit shift was chosen because
// it resulted in no drift between p_ix and ix.
int p_ix = (int) (ix * (1 << 15));
int p_ix_end = (int) (ix_end * (1 << 15));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ public double transform(double value) {
// Add connection blocks from modelperformer
for (ModelConnectionBlock connection : performer_connections)
connmap.put(extractKeys(connection), connection);
// seperate connection blocks : Init time, Midi Time, Midi/Control Time,
// separate connection blocks : Init time, Midi Time, Midi/Control Time,
// Control Time
List<ModelConnectionBlock> connections = new ArrayList<ModelConnectionBlock>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static List<?> getProviders(Class<?> providerClass) {
providers.add(it.next());
}
if( providers.isEmpty() ) {
throw new RuntimeException("Invaid provider class: " + providerClass);
throw new RuntimeException("Invalid provider class: " + providerClass);
}

return providers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
* <p>
* If you simply need to pass a known MIDI byte value as a method parameter,
* it can be expressed directly as an integer, using (for example) decimal or
* hexidecimal notation. For instance, to pass the "active sensing" status byte
* hexadecimal notation. For instance, to pass the "active sensing" status byte
* as the first argument to ShortMessage's
* {@link ShortMessage#setMessage(int) setMessage(int)}
* method, you can express it as 254 or 0xFE.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
* is optional.
*
* <p>If the provider class is specified, and it can be
* successully retrieved from the installed providers,
* successfully retrieved from the installed providers,
* the list of
* <code>MidiDevice.Info</code> objects is retrieved
* from the provider. Otherwise, or when these devices
Expand Down Expand Up @@ -1082,7 +1082,7 @@ private static List getSoundbankReaders() {
// * This method wraps {@link #getDefaultDevice}. It catches the
// * <code>IllegalArgumentException</code> thrown by
// * <code>getDefaultDevice</code> and instead throws a
// * <code>MidiUnavailableException</code>, with the catched
// * <code>MidiUnavailableException</code>, with the caught
// * exception chained.
// *
// * @param deviceClass The requested device type, one of Synthesizer.class,
Expand Down Expand Up @@ -1439,7 +1439,7 @@ private static List getSoundbankReaders() {
// ! (device instanceof Synthesizer) ) ||
// ((device instanceof Sequencer) && allowSequencer) ||
// ((device instanceof Synthesizer) && allowSynthesizer)) {
// // And of cource, the device has to be able to provide
// // And of course, the device has to be able to provide
// // Receivers or Transmitters.
// if ((deviceClass == Receiver.class &&
// device.getMaxReceivers() != 0) ||
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ public interface Synthesizer extends MidiDevice {
* @param from the <code>Instrument</code> object to be replaced
* @param to the <code>Instrument</code> object to be used in place
* of the old instrument, it should be loaded into the synthesizer
* @return <code>true</code> if the instrument succeessfully remapped,
* @return <code>true</code> if the instrument successfully remapped,
* <code>false</code> if feature is not implemented by synthesizer
* @throws <code>IllegalArgumentException</code> if instrument
* <code>from</code> or instrument <code>to</code> aren't supported by
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

/**
* <code>AudioFormat</code> is the class that specifies a particular arrangement of data in a sound stream.
* By examing the information stored in the audio format, you can discover how to interpret the bits in the
* By examining the information stored in the audio format, you can discover how to interpret the bits in the
* binary sound data.
* <p>
* Every data line has an audio format associated with its data stream. The audio format of a source (playback) data line indicates
Expand Down
Loading

0 comments on commit 5f3d717

Please sign in to comment.