opcode "default_path" now taken into account during the sfz import

Fix #4
davy7125 · Nov 7, 2018 · 43c2f0d · 43c2f0d
1 parent df6222f
commit 43c2f0d
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 11 deletions.
diff --git a/sources/core/input/sfz/inputsfz.cpp b/sources/core/input/sfz/inputsfz.cpp
@@ -309,7 +309,9 @@ QString InputSfz::getNomInstrument(QString filePath, int &numBank, int &numPrese
 
 void InputSfz::changeBloc(QString bloc)
 {
-    if (bloc == "group")
+    if (bloc == "control")
+        _currentBloc = BLOC_CONTROL;
+    else if (bloc == "group")
     {
         _currentBloc = BLOC_GROUP;
         _listeEnsembles << SfzParameterGroupAssembly();
@@ -329,4 +331,16 @@ void InputSfz::addOpcode(QString opcode, QString value)
 {
     if (_currentBloc == BLOC_GROUP || _currentBloc == BLOC_REGION)
         _listeEnsembles.last().addParam(opcode, value);
+    else if (_currentBloc == BLOC_CONTROL)
+    {
+        if (opcode == "default_path")
+        {
+            QString defaultPath = value.replace("\\", "/");
+            if (!defaultPath.isEmpty() && defaultPath[0] == '/')
+                defaultPath = defaultPath.right(defaultPath.size() - 1);
+            if (!defaultPath.isEmpty() && defaultPath.endsWith('/'))
+                defaultPath = defaultPath.left(defaultPath.size() - 1);
+            SfzParameter::DEFAULT_PATH = defaultPath;
+        }
+    }
 }
diff --git a/sources/core/input/sfz/inputsfz.h b/sources/core/input/sfz/inputsfz.h
@@ -17,6 +17,7 @@ protected slots:
     enum Bloc
     {
         BLOC_UNKNOWN,
+        BLOC_CONTROL,
         BLOC_GROUP,
         BLOC_REGION
     };

diff --git a/sources/core/input/sfz/sfzparameter.cpp b/sources/core/input/sfz/sfzparameter.cpp
@@ -2,6 +2,8 @@
 #include "contextmanager.h"
 #include <QDebug>
 
+QString SfzParameter::DEFAULT_PATH = "";
+
 SfzParameter::SfzParameter(QString opcode, QString valeur) :
     _opcode(op_unknown),
     _intValue(0),
@@ -12,7 +14,11 @@ SfzParameter::SfzParameter(QString opcode, QString valeur) :
     if (opcode == "sample")
     {
         _opcode = op_sample;
-        _strValue = valeur;
+        _strValue = valeur.replace("\\", "/");
+        if (!_strValue.isEmpty() && _strValue[0] == '/')
+            _strValue = _strValue.right(_strValue.size() - 1);
+        if (!DEFAULT_PATH.isEmpty())
+            _strValue = DEFAULT_PATH + "/" + _strValue;
     }
     else if (opcode == "key")
     {
@@ -344,5 +350,5 @@ SfzParameter::SfzParameter(QString opcode, QString valeur) :
         // Nothing to do, no warning
     }
     else
-        qDebug() << "non pris en charge: " + opcode + " (" + valeur + ")";
+        qDebug() << "opcode not supported: " + opcode + " (" + valeur + ")";
 }
diff --git a/sources/core/input/sfz/sfzparameter.h b/sources/core/input/sfz/sfzparameter.h
@@ -41,7 +41,7 @@ class SfzParameter
         op_amp_velcurve_1,
         op_amp_velcurve_127,
 
-        // Enveloppe volume
+        // Envelop volume
         op_ampeg_delay,
         op_ampeg_attack,
         op_ampeg_hold,
@@ -56,7 +56,7 @@ class SfzParameter
         op_modLFOfreq,
         op_modLFOtoVolume,
 
-        // Enveloppe pitch
+        // Envelop pitch
         op_pitcheg_delay,
         op_pitcheg_attack,
         op_pitcheg_hold,
@@ -113,6 +113,7 @@ class SfzParameter
     void    setIntValue(int value)       { _intValue = value; }
     void    setDoubleValue(double value) { _dblValue = value; }
 
+    static QString DEFAULT_PATH;
 private:
     OpCode  _opcode;
     int     _intValue;

diff --git a/sources/core/input/sfz/sfzparametergroup.cpp b/sources/core/input/sfz/sfzparametergroup.cpp
@@ -15,7 +15,7 @@ QList<int> SfzParameterGroup::getSampleIndex(SoundfontManager *sf2, EltID idElt,
 
     // Reconstitution adresse du fichier
     QString filePath =  _listeParam.at(indexOpSample).getStringValue();
-    QString fileName = pathSfz + "/" + filePath.replace("\\", "/");
+    QString fileName = pathSfz + "/" + filePath;
     if (!QFile(fileName).exists())
     {
         QStringList list = getFullPath(pathSfz, filePath.split("/", QString::SkipEmptyParts));
@@ -142,7 +142,7 @@ void SfzParameterGroup::adaptOffsets(int startLoop, int endLoop, int length)
 
 void SfzParameterGroup::adjustStereoVolumeAndCorrection(QString path, int defaultCorrection)
 {
-    QString sample = getStrValue(SfzParameter::op_sample).replace("\\", "/");
+    QString sample = getStrValue(SfzParameter::op_sample);
     if (!sample.isEmpty())
     {
         Sound son(path + "/" + sample);
@@ -154,12 +154,12 @@ void SfzParameterGroup::adjustStereoVolumeAndCorrection(QString path, int defaul
     }
 }
 
-bool SfzParameterGroup::sampleValid(QString path) const
+bool SfzParameterGroup::sampleValid(QString path)
 {
     bool bRet = false;
     if (this->isDefined(SfzParameter::op_sample))
     {
-        QString sample = getStrValue(SfzParameter::op_sample).replace("\\", "/");
+        QString sample = getStrValue(SfzParameter::op_sample);
         bRet = QFile(path + "/" + sample).exists();
     }
     return bRet;

diff --git a/sources/core/input/sfz/sfzparametergroup.h b/sources/core/input/sfz/sfzparametergroup.h
@@ -17,7 +17,7 @@ class SfzParameterGroup
     QList<int> getSampleIndex(SoundfontManager * sf2, EltID idElt, QString pathSfz) const;
     void adaptOffsets(int startLoop, int endLoop, int length);
     void adjustStereoVolumeAndCorrection(QString path, int defaultCorrection);
-    bool sampleValid(QString path) const;
+    bool sampleValid(QString path);
     void checkFilter();
     void adjustVolume(double offset);
     void adjustCorrection(int offset, int defaultCorrection);

diff --git a/sources/core/input/sfz/sfzparametergroupassembly.cpp b/sources/core/input/sfz/sfzparametergroupassembly.cpp
@@ -157,7 +157,7 @@ void SfzParameterGroupAssembly::checkSampleValid(QString path)
 {
     int size = _listeDivisions.size();
     for (int i = size - 1; i >= 0; i--)
-        if (!_listeDivisions.at(i).sampleValid(path))
+        if (!_listeDivisions[i].sampleValid(path))
             _listeDivisions.removeAt(i);
 }