diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-21 12:01:09 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-21 12:01:09 +0000 |
commit | ac2d334936e34beabf43282d8c96a71886a2c459 (patch) | |
tree | d3c981060f6e658988741765055177bfe882db80 /muse2/muse/conf.cpp | |
parent | 90cfa63b4fb1b52ed15027441c6a979a830d8ca3 (diff) |
Commit of the beast. User instruments path is made user configurable. Removed env. variables usage.
Diffstat (limited to 'muse2/muse/conf.cpp')
-rw-r--r-- | muse2/muse/conf.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/muse2/muse/conf.cpp b/muse2/muse/conf.cpp index 3ea829b0..44b9715c 100644 --- a/muse2/muse/conf.cpp +++ b/muse2/muse/conf.cpp @@ -836,6 +836,8 @@ void readConfiguration(Xml& xml, bool readOnlySequencer) config.dummyAudioBufSize = xml.parseInt(); else if (tag == "guiRefresh") config.guiRefresh = xml.parseInt(); + else if (tag == "userInstrumentsDir") + config.userInstrumentsDir = xml.parse1(); else if (tag == "midiTransform") readMidiTransform(xml); else if (tag == "midiInputTransform") @@ -882,6 +884,8 @@ bool readConfiguration() if (debugMsg || debugMode) fprintf(stderr, "NO Config File <%s> found\n", configName.toLatin1().constData()); + if (config.userInstrumentsDir.isEmpty()) + config.userInstrumentsDir = configPath + "/instruments"; return true; } Xml xml(f); @@ -1077,6 +1081,7 @@ void MusE::writeGlobalConfiguration(int level, Xml& xml) const xml.intTag(level, "dummyAudioSampleRate", config.dummyAudioSampleRate); xml.intTag(level, "guiRefresh", config.guiRefresh); + xml.strTag(level, "userInstrumentsDir", config.userInstrumentsDir); // Removed by Orcan. 20101220 //xml.strTag(level, "helpBrowser", config.helpBrowser); xml.intTag(level, "extendedMidi", config.extendedMidi); |