Skip to content

Commit 1a34205

Browse files
committed
Fixed: Split-stereo files were not combined into stereo files for formats which require it (e.g. Bento).
1 parent edce7e9 commit 1a34205

5 files changed

Lines changed: 19 additions & 20 deletions

File tree

documentation/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changes
22

3+
## 15.5.1
4+
5+
* Fixed: Split-stereo files were not combined into stereo files for formats which require it (e.g. Bento).
6+
37
## 15.5.0
48

59
* Added support for 1010music Bento

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>de.mossgrabers</groupId>
77
<artifactId>convertwithmoss</artifactId>
8-
<version>15.5.0</version>
8+
<version>15.5.1</version>
99
<packaging>jar</packaging>
1010
<name>ConvertWithMoss</name>
1111
<organization>

src/main/java/de/mossgrabers/convertwithmoss/core/ZoneChannels.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public static ZoneChannels detectChannelConfiguration (final List<IGroup> groups
8181
// Check for split stereo which needs to be hard panned left or right
8282
if (!isStereo && (splitStereo == null || splitStereo.booleanValue ()))
8383
{
84-
final double panning = sampleZone.getTuning ();
84+
final double panning = sampleZone.getPanning ();
8585
splitStereo = Boolean.valueOf (panning <= -1 || panning >= 1);
8686
}
8787
}
@@ -183,7 +183,7 @@ private static void getSplitStereo (final List<IGroup> groups, final List<ISampl
183183
{
184184
for (final IGroup group: groups)
185185
for (final ISampleZone sampleZone: group.getSampleZones ())
186-
if (sampleZone.getTuning () <= -1)
186+
if (sampleZone.getPanning () <= -1)
187187
leftSampleZones.add (sampleZone);
188188
else
189189
rightSampleZones.add (sampleZone);

src/main/java/de/mossgrabers/convertwithmoss/format/music1010/bento/BentoCreator.java

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -327,22 +327,6 @@ private Optional<String> createPreset (final List<IInstrumentSource> instrumentS
327327
paramsElement.setAttribute (entry.getKey (), entry.getValue ());
328328
paramsElement.setAttribute (Music1010Tag.ATTR_INTERPOLATION_QUALITY, this.settingsConfiguration.isInterpolationQualityHigh () ? "1" : "0");
329329

330-
// TODO Ask 1010music about these 3 parameters:
331-
332-
// The following parameters (panning, gain and pitch) are only available on instrument
333-
// level
334-
// Panning: -100..100% -> -1000..1000
335-
// final Optional<Double> globalPanning = multisampleSource.getGlobalPanning ();
336-
// if (globalPanning.isPresent ())
337-
// paramsElement.setAttribute (Music1010Tag.ATTR_PANNING, Integer.toString ((int)
338-
// Math.clamp (globalPanning.get ().doubleValue () * 1000.0, -1000.0, 1000.0)));
339-
340-
// -12..12dB -> -12000..12000
341-
// gaindb="4300"
342-
// -24..24 -> -24000..24000
343-
// pitch="-19350"
344-
// panpos="-352"
345-
346330
// Add amplitude envelope
347331
if (!groups.isEmpty ())
348332
{
@@ -448,6 +432,17 @@ private void createSample (final Document document, final String presetPath, fin
448432
final String filename = this.createSampleFilename (zone, 0, ".wav");
449433
paramsElement.setAttribute (Music1010Tag.ATTR_FILENAME, presetPath + filename);
450434

435+
// IMPROVE The following parameters (panning, gain and pitch) are only available on
436+
// instrument level (1010music needs to implement it on sample level first)
437+
// Panning: -100..100% -> -1000..1000
438+
// paramsElement.setAttribute (Music1010Tag.ATTR_PANNING, Integer.toString ((int) Math.clamp
439+
// (zone.getPanning () * 1000.0, -1000.0, 1000.0)));
440+
// -12..12dB -> -12000..12000
441+
// gaindb="4300"
442+
// -24..24 -> -24000..24000
443+
// pitch="-19350"
444+
// panpos="-352"
445+
451446
/////////////////////////////////////////////////////
452447
// Key & Velocity attributes
453448

src/main/resources/Strings.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TITLE=ConvertWithMoss 15.5.0
1+
TITLE=ConvertWithMoss 15.5.1
22

33
##################################################################################
44
#

0 commit comments

Comments
 (0)