summaryrefslogtreecommitdiff
path: root/muse2/synti/simpledrums2
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2012-12-18 16:19:29 +0000
committerRobert Jonsson <spamatica@gmail.com>2012-12-18 16:19:29 +0000
commita227872303382ecb2020e4408525f0b25f41e88d (patch)
tree99b9971aeec5ea71427829f24f83f9aacbeeb3db /muse2/synti/simpledrums2
parenta2ae7e06099f1ceb38d752909e3c17055fbc59ca (diff)
fluidsynth and simpledrums search project folder for missing sounds
Diffstat (limited to 'muse2/synti/simpledrums2')
-rw-r--r--muse2/synti/simpledrums2/simpledrums.cpp28
-rw-r--r--muse2/synti/simpledrums2/simpledrumsgui.cpp4
2 files changed, 20 insertions, 12 deletions
diff --git a/muse2/synti/simpledrums2/simpledrums.cpp b/muse2/synti/simpledrums2/simpledrums.cpp
index d62c5374..a723c133 100644
--- a/muse2/synti/simpledrums2/simpledrums.cpp
+++ b/muse2/synti/simpledrums2/simpledrums.cpp
@@ -29,6 +29,7 @@
#include "muse/mpevent.h"
//#include "common_defs.h"
#include "simpledrums.h"
+#include "globals.h"
#include <samplerate.h>
#include <QFileDialog>
@@ -1345,16 +1346,23 @@ bool SimpleSynth::loadSample(int chno, const char* filename)
}
else
{
-
- // TODO: Strings should be translated, this does
- // however require the class to be derived from qobject
- // tried in vain to make the call in the gui object
- // could'nt get it to work due to symbol missing in .so ...
- QString newName = QFileDialog::getOpenFileName(0,
- QString("Can't find sample: %1 - Choose sample").arg(filename),
- filename,
- QString("Samples *.wav *.ogg *.flac (*.wav *.WAV *.ogg *.flac);;All files (*)"));
- loader->filename = newName.toStdString();
+ //printf("current path: %s \nmuseProject %s\nfilename %s\n",QDir::currentPath().toLatin1().data(), MusEGlobal::museProject.toLatin1().data(), filename);
+ //MusEGlobal::museProject
+ QFileInfo fi(filename);
+ if (QFile::exists(fi.fileName()))
+ loader->filename = QDir::currentPath().toStdString() + "/" + fi.fileName().toStdString();
+ else {
+
+ // TODO: Strings should be translated, this does
+ // however require the class to be derived from qobject
+ // tried in vain to make the call in the gui object
+ // could'nt get it to work due to symbol missing in .so ...
+ QString newName = QFileDialog::getOpenFileName(0,
+ QString("Can't find sample: %1 - Choose sample").arg(filename),
+ filename,
+ QString("Samples *.wav *.ogg *.flac (*.wav *.WAV *.ogg *.flac);;All files (*)"));
+ loader->filename = newName.toStdString();
+ }
}
diff --git a/muse2/synti/simpledrums2/simpledrumsgui.cpp b/muse2/synti/simpledrums2/simpledrumsgui.cpp
index b68a441e..640ea3b6 100644
--- a/muse2/synti/simpledrums2/simpledrumsgui.cpp
+++ b/muse2/synti/simpledrums2/simpledrumsgui.cpp
@@ -805,9 +805,9 @@ void SimpleSynthGui::loadSampleDialogue(int channel)
{
QString filename =
QFileDialog::getOpenFileName(
- this,
+ this,
tr("Load sample dialog"),
- lastDir,
+ lastDir,
QString("Samples *.wav *.ogg *.flac (*.wav *.WAV *.ogg *.flac);;All files (*)"));
if (filename != QString::null) {