diff -rupN mscore-0.9.5.old/mscore/mscore/exportaudio.cpp mscore-0.9.5/mscore/mscore/exportaudio.cpp
--- mscore-0.9.5.old/mscore/mscore/exportaudio.cpp 2009-08-12 09:28:22.000000000 -0400
+++ mscore-0.9.5/mscore/mscore/exportaudio.cpp 2009-12-22 08:17:53.000000000 -0500
@@ -49,9 +49,9 @@ bool Score::saveAudio(const QString& nam
p = QString(getenv("DEFAULT_SOUNDFONT"));
if (p.isEmpty()) {
//
- // fallback to integrated soundfont
+ // fallback to default soundfont
//
- p = ":/data/piano1.sf2";
+ p = INSTPREFIX "/share/soundfonts/default.sf2";
}
bool rv = synth->loadSoundFont(p);
if (!rv) {
diff -rupN mscore-0.9.5.old/mscore/mscore/mscore.qrc mscore-0.9.5/mscore/mscore/mscore.qrc
--- mscore-0.9.5.old/mscore/mscore/mscore.qrc 2009-08-12 09:28:22.000000000 -0400
+++ mscore-0.9.5/mscore/mscore/mscore.qrc 2009-12-22 08:15:49.000000000 -0500
@@ -35,7 +35,7 @@
<file alias="data/instruments.xml">../share/templates/instruments.xml</file>
<file>data/splash.jpg</file>
<file alias="data/demo.mscx">../demos/promenade.mscx</file>
- <file>data/piano1.sf2</file>
+
<file>data/speaker.svg</file>
<file>data/midiin.svg</file>
<file>data/undo.svg</file>
diff -rupN mscore-0.9.5.old/mscore/mscore/preferences.cpp mscore-0.9.5/mscore/mscore/preferences.cpp
--- mscore-0.9.5.old/mscore/mscore/preferences.cpp 2009-08-12 09:28:22.000000000 -0400
+++ mscore-0.9.5/mscore/mscore/preferences.cpp 2009-12-22 08:15:49.000000000 -0500
@@ -142,7 +142,7 @@ void Preferences::init()
enableMidiInput = true;
playNotes = true;
- soundFont = ":/data/piano1.sf2";
+ soundFont = INSTPREFIX "/share/soundfonts/default.sf2";
lPort = "";
rPort = "";
@@ -344,7 +344,7 @@ void Preferences::read()
lPort = s.value("lPort").toString();
rPort = s.value("rPort").toString();
- soundFont = s.value("soundFont", ":/data/piano1.sf2").toString();
+ soundFont = s.value("soundFont", INSTPREFIX "/share/soundfonts/default.sf2").toString();
showNavigator = s.value("showNavigator", true).toBool();
showStatusBar = s.value("showStatusBar", true).toBool();
showPlayPanel = s.value("showPlayPanel", false).toBool();
diff -rupN mscore-0.9.5.old/mscore/mscore/seq.cpp mscore-0.9.5/mscore/mscore/seq.cpp
--- mscore-0.9.5.old/mscore/mscore/seq.cpp 2009-08-12 09:28:22.000000000 -0400
+++ mscore-0.9.5/mscore/mscore/seq.cpp 2009-12-22 08:15:49.000000000 -0500
@@ -221,9 +221,9 @@ bool Seq::init()
p = QString(getenv("DEFAULT_SOUNDFONT"));
if (p.isEmpty()) {
//
- // fallback to integrated soundfont
+ // fallback to default soundfont
//
- p = ":/data/piano1.sf2";
+ p = INSTPREFIX "/share/soundfonts/default.sf2";
}
if (debugMode)
printf("load soundfont <%s>\n", qPrintable(p));