Blob Blame History Raw
diff -rupN mscore-0.9.4.old/mscore/mscore/fluid.cpp mscore-0.9.4/mscore/mscore/fluid.cpp
--- mscore-0.9.4.old/mscore/mscore/fluid.cpp	2009-02-06 05:33:28.000000000 -0500
+++ mscore-0.9.4/mscore/mscore/fluid.cpp	2009-02-20 22:39:16.000000000 -0500
@@ -58,9 +58,9 @@ bool ISynth::init(int sampleRate)
             p = QString(getenv("DEFAULT_SOUNDFONT"));
       if (p.isEmpty()) {
             //
-            // fallback to integrated soundfont
+            // fallback to default soundfont
             //
-            p = ":/data/piano1.sf2";
+            p = INSTPREFIX "/share/soundfonts/PCLite.sf2";
             }
       bool rv = loadSoundFont(p);
       if (!rv) {
diff -rupN mscore-0.9.4.old/mscore/mscore/mscore.qrc mscore-0.9.4/mscore/mscore/mscore.qrc
--- mscore-0.9.4.old/mscore/mscore/mscore.qrc	2009-02-06 05:33:28.000000000 -0500
+++ mscore-0.9.4/mscore/mscore/mscore.qrc	2009-02-20 22:41:59.000000000 -0500
@@ -34,7 +34,7 @@
       <file alias="data/instruments.xml">../share/templates/instruments.xml</file>
       <file>data/splash.jpg</file>
       <file alias="data/demo.msc">../demos/promenade.msc</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.4.old/mscore/mscore/preferences.cpp mscore-0.9.4/mscore/mscore/preferences.cpp
--- mscore-0.9.4.old/mscore/mscore/preferences.cpp	2009-02-06 05:33:28.000000000 -0500
+++ mscore-0.9.4/mscore/mscore/preferences.cpp	2009-02-20 22:40:42.000000000 -0500
@@ -136,11 +136,7 @@ void Preferences::init()
       enableMidiInput    = true;
       playNotes          = true;
 
-#ifdef USE_GLOBAL_FLUID
-      soundFont          = INSTPREFIX "/piano1.sf2";
-#else
-      soundFont          = ":/data/piano1.sf2";
-#endif
+      soundFont          = INSTPREFIX "/share/soundfonts/PCLite.sf2";
 
       lPort              = "";
       rPort              = "";
@@ -342,11 +338,8 @@ void Preferences::read()
       lPort           = s.value("lPort").toString();
       rPort           = s.value("rPort").toString();
 
-#ifdef USE_GLOBAL_FLUID
-      soundFont       = s.value("soundFont", INSTPREFIX "/piano1.sf2").toString();
-#else
-      soundFont       = s.value("soundFont", ":/data/piano1.sf2").toString();
-#endif
+      soundFont       = s.value("soundFont", INSTPREFIX "/share/soundfonts/PCLite.sf2").toString();
+
       showNavigator   = s.value("showNavigator", true).toBool();
       showStatusBar   = s.value("showStatusBar", true).toBool();
       showPlayPanel   = s.value("showPlayPanel", false).toBool();