Merge branch 'develop'

common/common.cpp

@@ -33,6 +33,7 @@
  
  */
 
+#include <algorithm>
 #include <iostream>
 
 #include "common.hpp"

liblsdj/instrument.c

@@ -367,11 +367,36 @@ void read_wave_instrument(lsdj_vio_t* vio, unsigned char version, lsdj_instrumen
     vio->read(&byte, 1, vio->user_data);
     instrument->wave.playback = parsePlaybackMode(byte);
 
-    vio->seek(4, SEEK_CUR, vio->user_data); // Bytes 10-13 are empty
+    // WAVE length and speed changed in version 6
+    if (version >= 7)
+    {
+        vio->read(&byte, 1, vio->user_data); // Byte 10
+        instrument->wave.length = 0xF - (byte & 0xF);
+
+        vio->read(&byte, 1, vio->user_data); // Byte 11
+        instrument->wave.speed = byte + 4;
+    }
+    else if (version == 6)
+    {
+        vio->read(&byte, 1, vio->user_data); // Byte 10
+        instrument->wave.length = (byte & 0xF);
+
+        vio->read(&byte, 1, vio->user_data); // Byte 11
+        instrument->wave.speed = byte + 1;
+    } else {
+        vio->seek(2, SEEK_CUR, vio->user_data); // Bytes 12-13 are empty
+    }
+
+    vio->seek(2, SEEK_CUR, vio->user_data); // Bytes 10-13 are empty
 
     vio->read(&byte, 1, vio->user_data);
-    instrument->wave.length = ((byte >> 4) & 0xF);
-    instrument->wave.speed = (byte & 0xF);
+
+    // WAVE length and speed changed in version 6
+    if (version < 6)
+    {
+        instrument->wave.length = ((byte >> 4) & 0xF);
+        instrument->wave.speed = (byte & 0xF) + 1;
+    }
 
     vio->seek(1, SEEK_CUR, vio->user_data); // Byte 15 is empty
 }
@@ -695,16 +720,39 @@ void write_wave_instrument(const lsdj_instrument_t* instrument, unsigned char ve
     byte = createPlaybackModeByte(instrument->wave.playback);
     vio->write(&byte, 1, vio->user_data);
 
-    byte = 0xD0;
-    vio->write(&byte, 1, vio->user_data); // Byte 10 is empty
+    if (version >= 7)
+    {
+        byte = 0xF - (instrument->wave.length & 0xF);
+        vio->write(&byte, 1, vio->user_data);
+
+        byte = instrument->wave.speed - 4;
+        vio->write(&byte, 1, vio->user_data);
+    }
+    else if (version == 6)
+    {
+        byte = (instrument->wave.length & 0xF);
+        vio->write(&byte, 1, vio->user_data);
+
+        byte = instrument->wave.speed - 1;
+        vio->write(&byte, 1, vio->user_data);
+    } else {
+        byte = 0;
+        vio->write(&byte, 1, vio->user_data); // Byte 10 is empty
+        vio->write(&byte, 1, vio->user_data); // Byte 11 is empty
+    }
 
     byte = 0;
-    vio->write(&byte, 1, vio->user_data); // Byte 11 is empty
     vio->write(&byte, 1, vio->user_data); // Byte 12 is empty
     vio->write(&byte, 1, vio->user_data); // Byte 13 is empty
 
-    byte = (unsigned char)(((instrument->wave.length & 0xF) << 4) | (instrument->wave.speed & 0xF));
-    vio->write(&byte, 1, vio->user_data);
+    if (version < 6)
+    {
+        byte = (unsigned char)(((instrument->wave.length & 0xF) << 4) | ((instrument->wave.speed - 1) & 0xF));
+        vio->write(&byte, 1, vio->user_data);
+    } else {
+        byte = 0;
+        vio->write(&byte, 1, vio->user_data); // Byte 14 is empty
+    }
 
     byte = 0;
     vio->write(&byte, 1, vio->user_data); // Byte 15 is empty

liblsdj/instrument.h

@@ -62,9 +62,9 @@ typedef enum
     LSDJ_INSTR_NOISE
 } instrument_type;
 
-static const unsigned char LSDJ_NO_TABLE = 0x20;
-static const unsigned char LSDJ_INSTRUMENT_UNLIMITED_LENGTH = 0x40;
-static const unsigned char LSDJ_KIT_LENGTH_AUTO = 0x0;
+#define LSDJ_NO_TABLE (0x20)
+#define LSDJ_INSTRUMENT_UNLIMITED_LENGTH (0x40)
+#define LSDJ_KIT_LENGTH_AUTO (0x0)
 
 typedef struct lsdj_instrument_t lsdj_instrument_t;
 

liblsdj/instrument_constants.h

@@ -41,18 +41,18 @@ extern "C" {
 #endif
 
 typedef unsigned char lsdj_plvib_speed;
-static const lsdj_plvib_speed LSDJ_PLVIB_FAST = 0;
-static const lsdj_plvib_speed LSDJ_PLVIB_TICK = 1;
-static const lsdj_plvib_speed LSDJ_PLVIB_STEP = 2;
+#define LSDJ_PLVIB_FAST (0)
+#define LSDJ_PLVIB_TICK (1)
+#define LSDJ_PLVIB_STEP (2)
 
 typedef unsigned char lsdj_vib_shape;
-#define LSDJ_VIB_TRIANGLE 0
-#define LSDJ_VIB_SAWTOOTH 1
-#define LSDJ_VIB_SQUARE 2
+#define LSDJ_VIB_TRIANGLE (0)
+#define LSDJ_VIB_SAWTOOTH (1)
+#define LSDJ_VIB_SQUARE (2)
 
 typedef unsigned char lsdj_vib_direction;
-static const lsdj_vib_direction LSDJ_VIB_UP = 0;
-static const lsdj_vib_direction LSDJ_VIB_DOWN = 1;
+#define LSDJ_VIB_UP (0)
+#define LSDJ_VIB_DOWN (1)
 
 #ifdef __cplusplus
 }

liblsdj/instrument_kit.h

@@ -43,20 +43,20 @@ extern "C" {
 #include "instrument_constants.h"
 
 typedef unsigned char lsdj_kit_loop_mode;
-static const lsdj_kit_loop_mode LSDJ_KIT_LOOP_OFF = 0;
-static const lsdj_kit_loop_mode LSDJ_KIT_LOOP_ON = 1;
-static const lsdj_kit_loop_mode LSDJ_KIT_LOOP_ATTACK = 2;
+#define LSDJ_KIT_LOOP_OFF (0)
+#define LSDJ_KIT_LOOP_ON  (1)
+#define LSDJ_KIT_LOOP_ATTACK (2)
 
 typedef unsigned char lsdj_kit_distortion;
-static const lsdj_kit_distortion LSDJ_KIT_DIST_CLIP = 0xD0;
-static const lsdj_kit_distortion LSDJ_KIT_DIST_SHAPE = 0xD1;
-static const lsdj_kit_distortion LSDJ_KIT_DIST_SHAPE2 = 0xD2;
-static const lsdj_kit_distortion LSDJ_KIT_DIST_WRAP = 0xD3;
+#define LSDJ_KIT_DIST_CLIP (0xD0)
+#define LSDJ_KIT_DIST_SHAPE (0xD1)
+#define LSDJ_KIT_DIST_SHAPE2 (0xD2)
+#define LSDJ_KIT_DIST_WRAP (0xD3)
 
 typedef unsigned char lsdj_kit_pspeed;
-static const lsdj_kit_pspeed LSDJ_KIT_PSPEED_FAST = 0;
-static const lsdj_kit_pspeed LSDJ_KIT_PSPEED_SLOW = 1;
-static const lsdj_kit_pspeed LSDJ_KIT_PSPEED_STEP = 2;
+#define LSDJ_KIT_PSPEED_FAST (0)
+#define LSDJ_KIT_PSPEED_SLOW (1)
+#define LSDJ_KIT_PSPEED_STEP (2)
 
 typedef struct
 {

liblsdj/instrument_noise.h

@@ -41,8 +41,8 @@ extern "C" {
 #endif
 
 typedef unsigned char lsdj_scommand_type;
-static const lsdj_scommand_type LSDJ_SCOMMAND_FREE = 0;
-static const lsdj_scommand_type LSDJ_SCOMMAND_STABLE = 1;
+#define LSDJ_SCOMMAND_FREE (0)
+#define LSDJ_SCOMMAND_STABLE (1)
 
 typedef struct
 {

liblsdj/instrument_pulse.h

@@ -43,10 +43,10 @@ extern "C" {
 #include "instrument_constants.h"
 
 typedef unsigned char lsdj_pulse_wave;
-static const lsdj_pulse_wave LSDJ_PULSE_WAVE_PW_125 = 0;
-static const lsdj_pulse_wave LSDJ_PULSE_WAVE_PW_25 = 1;
-static const lsdj_pulse_wave LSDJ_PULSE_WAVE_PW_50 = 2;
-static const lsdj_pulse_wave LSDJ_PULSE_WAVE_PW_75 = 3;
+#define LSDJ_PULSE_WAVE_PW_125 (0)
+#define LSDJ_PULSE_WAVE_PW_25 (1)
+#define LSDJ_PULSE_WAVE_PW_50 (2)
+#define LSDJ_PULSE_WAVE_PW_75 (3)
 
 typedef struct
 {

liblsdj/instrument_wave.h

@@ -43,10 +43,10 @@ extern "C" {
 #include "instrument_constants.h"
 
 typedef unsigned char lsdj_playback_mode;
-static const lsdj_playback_mode LSDJ_PLAY_ONCE = 0;
-static const lsdj_playback_mode LSDJ_PLAY_LOOP = 1;
-static const lsdj_playback_mode LSDJ_PLAY_PING_PONG = 2;
-static const lsdj_playback_mode LSDJ_PLAY_MANUAL = 3;
+#define LSDJ_PLAY_ONCE (0)
+#define LSDJ_PLAY_LOOP (1)
+#define LSDJ_PLAY_PING_PONG (2)
+#define LSDJ_PLAY_MANUAL (3)
 
 typedef struct
 {

liblsdj/panning.h

@@ -41,10 +41,10 @@ extern "C" {
 #endif
 
 typedef unsigned char lsdj_panning;
-static const lsdj_panning LSDJ_PAN_NONE = 0;
-static const lsdj_panning LSDJ_PAN_RIGHT = 1;
-static const lsdj_panning LSDJ_PAN_LEFT = 2;
-static const lsdj_panning LSDJ_PAN_LEFT_RIGHT = 3;
+#define LSDJ_PAN_NONE (0)
+#define LSDJ_PAN_RIGHT (1)
+#define LSDJ_PAN_LEFT (2)
+#define LSDJ_PAN_LEFT_RIGHT (3)
 
 #ifdef __cplusplus
 }

liblsdj/song.h

@@ -64,8 +64,8 @@ extern "C" {
 #define LSDJ_BOOKMARK_POSITION_COUNT (16)
 #define LSDJ_NO_BOOKMARK (0xFF)
 
-static const unsigned char LSDJ_CLONE_DEEP = 0;
-static const unsigned char LSDJ_CLONE_SLIM = 1;
+#define LSDJ_CLONE_DEEP (0)
+#define LSDJ_CLONE_SLIM (1)
 
 // An LSDJ song
 typedef struct lsdj_song_t lsdj_song_t;

liblsdj/synth.h

@@ -40,22 +40,22 @@
 extern "C" {
 #endif
 
-static const unsigned char LSDJ_SYNTH_WAVEFORM_SAWTOOTH = 0;
-static const unsigned char LSDJ_SYNTH_WAVEFORM_SQUARE = 1;
-static const unsigned char LSDJ_SYNTH_WAVEFORM_TRIANGLE = 2;
+#define LSDJ_SYNTH_WAVEFORM_SAWTOOTH (0)
+#define LSDJ_SYNTH_WAVEFORM_SQUARE (1)
+#define LSDJ_SYNTH_WAVEFORM_TRIANGLE (2)
 
-static const unsigned char LSDJ_SYNTH_FILTER_LOW_PASS = 0;
-static const unsigned char LSDJ_SYNTH_FILTER_HIGH_PASS = 1;
-static const unsigned char LSDJ_SYNTH_FILTER_BAND_PASS = 2;
-static const unsigned char LSDJ_SYNTH_FILTER_ALL_PASS = 3;
+#define LSDJ_SYNTH_FILTER_LOW_PASS (0)
+#define LSDJ_SYNTH_FILTER_HIGH_PASS (1)
+#define LSDJ_SYNTH_FILTER_BAND_PASS (2)
+#define LSDJ_SYNTH_FILTER_ALL_PASS (3)
 
-static const unsigned char LSDJ_SYNTH_DISTORTION_CLIP = 0;
-static const unsigned char LSDJ_SYNTH_DISTORTION_WRAP = 1;
-static const unsigned char LSDJ_SYNTH_DISTORTION_FOLD = 2;
+#define LSDJ_SYNTH_DISTORTION_CLIP (0)
+#define LSDJ_SYNTH_DISTORTION_WRAP (1)
+#define LSDJ_SYNTH_DISTORTION_FOLD (2)
 
-static const unsigned char LSDJ_SYNTH_PHASE_NORMAL = 0;
-static const unsigned char LSDJ_SYNTH_PHASE_RESYNC = 1;
-static const unsigned char LSDJ_SYNTH_PHASE_RESYNC2 = 2;
+#define LSDJ_SYNTH_PHASE_NORMAL (0)
+#define LSDJ_SYNTH_PHASE_RESYNC (1)
+#define LSDJ_SYNTH_PHASE_RESYNC2 (2)
 
 // Structure representing soft synth data
 typedef struct

lsdsng_export/exporter.cpp

@@ -235,14 +235,18 @@ namespace lsdj
         {
             switch (versionStyle)
             {
-                case VersionStyle::NONE: break;
+                case VersionStyle::NONE:
+                    std::cout << "\t\t";
+                    break;
                 case VersionStyle::HEX:
                     std::cout << (lsdj_song_get_file_changed_flag(song) ? "*" : " ") << "  \t";
                     break;
                 case VersionStyle::DECIMAL:
                     std::cout << (lsdj_song_get_file_changed_flag(song) ? "*" : " ") << "  \t";
                     break;
             }
+        } else {
+            std::cout << "\t\t";
         }
 
         // Display the format version of the song