cosmetic stuff: made many functions static, improved pixmap loading

synced with current trunk

2 files changed, 15 insertions, 12 deletions

diff --git a/muse2/synti/simpledrums/simpledrums.cpp b/muse2/synti/simpledrums/simpledrums.cpp
index 43f9ccee..22f83bd4 100644
--- a/muse2/synti/simpledrums/simpledrums.cpp
+++ b/muse2/synti/simpledrums/simpledrums.cpp
@@ -237,14 +237,14 @@ SimpleSynth::~SimpleSynth()
       }
 
 //---------------------------------------------------------
-//   guiVisible
+//   nativeGuiVisible
 /*!
-    \fn SimpleSynth::guiVisible
+    \fn SimpleSynth::nativeGuiVisible
     \brief Tells if the gui is hidden or shown
     \return true/false if gui is shown/hidden
  */
 //---------------------------------------------------------
-bool SimpleSynth::guiVisible() const
+bool SimpleSynth::nativeGuiVisible() const
       {
       SS_TRACE_IN
       bool v = gui->isVisible();
@@ -253,14 +253,14 @@ bool SimpleSynth::guiVisible() const
       }
 
 //---------------------------------------------------------
-//   hasGui
+//   hasNativeGui
 /*!
-    \fn SimpleSynth::hasGui
+    \fn SimpleSynth::hasNativeGui
     \brief Tells if the synth has a gui or not
     \return true if synth has gui, false it synth has no gui
  */
 //---------------------------------------------------------
-bool SimpleSynth::hasGui() const
+bool SimpleSynth::hasNativeGui() const
       {
       SS_TRACE_IN
       SS_TRACE_OUT
@@ -844,14 +844,14 @@ void SimpleSynth::process(float** out, int offset, int len)
       }
 
 //---------------------------------------------------------
-//   showGui
+//   showNativeGui
 /*!
-    \fn SimpleSynth::showGui
+    \fn SimpleSynth::showNativeGui
     \brief Displays or hides the gui window
     \param val true or false = gui shown or hidden
  */
 //---------------------------------------------------------
-void SimpleSynth::showGui(bool val)
+void SimpleSynth::showNativeGui(bool val)
       {
       SS_TRACE_IN
       gui->setVisible(val);
diff --git a/muse2/synti/simpledrums/simpledrums.h b/muse2/synti/simpledrums/simpledrums.h
index 47a71ca6..7f006d73 100644
--- a/muse2/synti/simpledrums/simpledrums.h
+++ b/muse2/synti/simpledrums/simpledrums.h
@@ -117,8 +117,10 @@ class SimpleSynth : public Mess
 
       virtual ~SimpleSynth();
 
-      virtual bool guiVisible() const;
-      virtual bool hasGui() const;
+      //virtual bool guiVisible() const;
+      //virtual bool hasGui() const;
+      virtual bool nativeGuiVisible() const;
+      virtual bool hasNativeGui() const;
       virtual bool playNote(int arg1, int arg2, int arg3);
       virtual bool processEvent(const MidiPlayEvent& arg1);
       virtual bool setController(int arg1, int arg2, int arg3);
@@ -128,7 +130,8 @@ class SimpleSynth : public Mess
       virtual int getControllerInfo(int arg1, const char** arg2, int* arg3, int* arg4, int* arg5, int* arg6) const;
       virtual void processMessages();
       virtual void process(float** data, int offset, int len);
-      virtual void showGui(bool arg1);
+      //virtual void showGui(bool arg1);
+      virtual void showNativeGui(bool arg1);
       virtual void getInitData(int*, const unsigned char**) const;
       bool init(const char* name);
       void guiSendSampleLoaded(bool success, int ch, const char* filename);