diff options
| author | Florian Jung <flo@windfisch.org> | 2011-05-13 12:56:25 +0000 | 
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-05-13 12:56:25 +0000 | 
| commit | 8aed0b79c9b28af69ef67e858992385ea074df63 (patch) | |
| tree | a31cbe67dcac93b4f67836ebfabcc27561ed5f9a /muse2/synti | |
| parent | 1c431bd67567104ba9e026ae75ba479f56d387a2 (diff) | |
| parent | 2b2776be8c1f6c90b5887ef5453321e06c6aea26 (diff) | |
merged with trunk
midi files default to type=GM now
changed wildcards for opening file. midi is now selectable
Diffstat (limited to 'muse2/synti')
| -rw-r--r-- | muse2/synti/fluid/fluidgui.cpp | 3 | ||||
| -rw-r--r-- | muse2/synti/fluidsynth/fluidsynthgui.cpp | 3 | 
2 files changed, 4 insertions, 2 deletions
| diff --git a/muse2/synti/fluid/fluidgui.cpp b/muse2/synti/fluid/fluidgui.cpp index 3ba70aff..af8d937c 100644 --- a/muse2/synti/fluid/fluidgui.cpp +++ b/muse2/synti/fluid/fluidgui.cpp @@ -73,7 +73,8 @@ void FLUIDGui::loadFont()  void FLUIDGui::soundFontFileDialog()        { -      QString s = QFileDialog::getOpenFileName(this, QString(), QString(), QString("*.[Ss][Ff]2")); +      //QString s = QFileDialog::getOpenFileName(this, QString(), QString(), QString("Soundfonts (*.[Ss][Ff]2);;All files (*)")); +      QString s = QFileDialog::getOpenFileName(this, QString(), QString(), QString("Soundfonts (*.sf2);;All files (*)"));        if (!s.isEmpty()) {              pathEntry->setText(s);              } diff --git a/muse2/synti/fluidsynth/fluidsynthgui.cpp b/muse2/synti/fluidsynth/fluidsynthgui.cpp index 8c7bbf12..2e91515f 100644 --- a/muse2/synti/fluidsynth/fluidsynthgui.cpp +++ b/muse2/synti/fluidsynth/fluidsynthgui.cpp @@ -164,7 +164,8 @@ void FluidSynthGui::loadClicked()  	QString filename = QFileDialog::getOpenFileName(this,                                                         tr("Choose soundfont"),                                                         lastdir,  -                                                      QString("*.[Ss][Ff]2")); +                                                      //QString("Soundfonts (*.[Ss][Ff]2);;All files (*)")); +                                                      QString("Soundfonts (*.sf2);;All files (*)"));        if (filename != QString::null) {              int lastslash = filename.lastIndexOf('/'); | 
