cosmetic stuff: made many functions static, improved pixmap loading

synced with current trunk

1 files changed, 6 insertions, 3 deletions

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();