--- gigedit/trunk/src/gigedit/dimregionedit.h	2019/10/02 16:30:29	3623
+++ gigedit/trunk/src/gigedit/dimregionedit.h	2019/10/02 17:11:30	3624
@@ -99,7 +99,9 @@
     bool on_draw(const Cairo::RefPtr<Cairo::Context>& cr);
 #endif
 
+    virtual LinuxSampler::LFO::wave_t waveType() const = 0;
     virtual float frequency() const = 0;
+    virtual float phase() const = 0;
     virtual uint internalDepth() const = 0;
     virtual uint controllerDepth() const = 0;
     virtual bool flipPolarity() const = 0;
@@ -113,7 +115,12 @@
 
 class LFO1Graph : public LFOGraph {
 public:
+    LinuxSampler::LFO::wave_t waveType() const OVERRIDE {
+        // simply assuming here libgig's and LS's enums are equally value mapped
+        return (LinuxSampler::LFO::wave_t) dimreg->LFO1WaveForm;
+    }
     float frequency() const OVERRIDE { return dimreg->LFO1Frequency; }
+    float phase() const OVERRIDE { return dimreg->LFO1Phase; }
     uint internalDepth() const OVERRIDE {
         const gig::lfo1_ctrl_t ctrl = dimreg->LFO1Controller;
         const bool hasInternalDepth = (
@@ -130,7 +137,12 @@
 
 class LFO2Graph : public LFOGraph {
 public:
+    LinuxSampler::LFO::wave_t waveType() const OVERRIDE {
+        // simply assuming here libgig's and LS's enums are equally value mapped
+        return (LinuxSampler::LFO::wave_t) dimreg->LFO2WaveForm;
+    }
     float frequency() const OVERRIDE { return dimreg->LFO2Frequency; }
+    float phase() const OVERRIDE { return dimreg->LFO2Phase; }
     uint internalDepth() const OVERRIDE {
         const gig::lfo2_ctrl_t ctrl = dimreg->LFO2Controller;
         const bool hasInternalDepth = (
@@ -147,7 +159,12 @@
 
 class LFO3Graph : public LFOGraph {
 public:
+    LinuxSampler::LFO::wave_t waveType() const OVERRIDE {
+        // simply assuming here libgig's and LS's enums are equally value mapped
+        return (LinuxSampler::LFO::wave_t) dimreg->LFO3WaveForm;
+    }
     float frequency() const OVERRIDE { return dimreg->LFO3Frequency; }
+    float phase() const OVERRIDE { return dimreg->LFO3Phase; }
     uint internalDepth() const OVERRIDE {
         const gig::lfo3_ctrl_t ctrl = dimreg->LFO3Controller;
         const bool hasInternalDepth = (
@@ -156,7 +173,7 @@
         return (hasInternalDepth) ? dimreg->LFO3InternalDepth : 0;
     }
     uint controllerDepth() const OVERRIDE { return dimreg->LFO3ControlDepth; }
-    bool flipPolarity() const OVERRIDE { return false; }
+    bool flipPolarity() const OVERRIDE { return dimreg->LFO3FlipPhase; }
     bool signedRange() const OVERRIDE { return true; }
     virtual LinuxSampler::LFO::start_level_t startLevel() const OVERRIDE { return LinuxSampler::LFO::start_level_max; } // see https://sourceforge.net/p/linuxsampler/mailman/linuxsampler-devel/thread/2189307.cNP0Xbctxq%40silver/#msg36774029
     bool hasControllerAssigned() const OVERRIDE { return dimreg->LFO3Controller; }
@@ -248,7 +265,9 @@
     NumEntryTemp<uint8_t> eEG1ControllerDecayInfluence;
     NumEntryTemp<uint8_t> eEG1ControllerReleaseInfluence;
     EGStateOptions eEG1StateOptions;
+    ChoiceEntryLfoWave eLFO1Wave;
     NumEntryTemp<double> eLFO1Frequency;
+    NumEntryTemp<double> eLFO1Phase;
     NumEntryTemp<uint16_t> eLFO1InternalDepth;
     NumEntryTemp<uint16_t> eLFO1ControlDepth;
     ChoiceEntry<gig::lfo1_ctrl_t> eLFO1Controller;
@@ -267,7 +286,9 @@
     NumEntryTemp<uint8_t> eEG2ControllerDecayInfluence;
     NumEntryTemp<uint8_t> eEG2ControllerReleaseInfluence;
     EGStateOptions eEG2StateOptions;
+    ChoiceEntryLfoWave eLFO2Wave;
     NumEntryTemp<double> eLFO2Frequency;
+    NumEntryTemp<double> eLFO2Phase;
     NumEntryTemp<uint16_t> eLFO2InternalDepth;
     NumEntryTemp<uint16_t> eLFO2ControlDepth;
     ChoiceEntry<gig::lfo2_ctrl_t> eLFO2Controller;
@@ -275,10 +296,13 @@
     BoolEntry eLFO2Sync;
     NumEntryTemp<double> eEG3Attack;
     NumEntryTemp<int16_t> eEG3Depth;
+    ChoiceEntryLfoWave eLFO3Wave;
     NumEntryTemp<double> eLFO3Frequency;
+    NumEntryTemp<double> eLFO3Phase;
     NumEntryTemp<int16_t> eLFO3InternalDepth;
     NumEntryTemp<int16_t> eLFO3ControlDepth;
     ChoiceEntry<gig::lfo3_ctrl_t> eLFO3Controller;
+    BoolEntry eLFO3FlipPhase;
     BoolEntry eLFO3Sync;
     BoolEntry eVCFEnabled;
     ChoiceEntry<gig::vcf_type_t> eVCFType;