cosmetic stuff: made many functions static, improved pixmap loading

synced with current trunk

2 files changed, 10 insertions, 7 deletions

diff --git a/muse2/synti/fluidsynth/fluidsynti.cpp b/muse2/synti/fluidsynth/fluidsynti.cpp
index 327cde39..aadc92ef 100644
--- a/muse2/synti/fluidsynth/fluidsynti.cpp
+++ b/muse2/synti/fluidsynth/fluidsynti.cpp
@@ -723,20 +723,20 @@ void FluidSynth::dumpInfo()
       }
 
 //---------------------------------------------------------
-//   guiVisible
+//   nativeGuiVisible
 //---------------------------------------------------------
 
-bool FluidSynth::guiVisible() const
+bool FluidSynth::nativeGuiVisible() const
       {
       return gui->isVisible();
       }
 
 
 //---------------------------------------------------------
-//   showGui
+//   showNativeGui
 //---------------------------------------------------------
 
-void FluidSynth::showGui(bool val)
+void FluidSynth::showNativeGui(bool val)
       {
       gui->setVisible(val);
       }
diff --git a/muse2/synti/fluidsynth/fluidsynti.h b/muse2/synti/fluidsynth/fluidsynti.h
index 0816475c..a371de9e 100644
--- a/muse2/synti/fluidsynth/fluidsynti.h
+++ b/muse2/synti/fluidsynth/fluidsynti.h
@@ -115,9 +115,12 @@ public:
       virtual int getControllerInfo(int, const char**, int*, int*, int*, int*) const;
       virtual bool processEvent(const MidiPlayEvent&);
 
-      virtual bool hasGui() const { return true; }
-      virtual bool guiVisible() const;
-      virtual void showGui(bool val);
+      //virtual bool hasGui() const { return true; }
+      //virtual bool guiVisible() const;
+      //virtual void showGui(bool val);
+      virtual bool hasNativeGui() const { return true; }
+      virtual bool nativeGuiVisible() const;
+      virtual void showNativeGui(bool val);
 
       void sendError(const char*);
       void sendSoundFontData();