cosmetic stuff: made many functions static, improved pixmap loading

synced with current trunk

2 files changed, 14 insertions, 11 deletions

diff --git a/muse2/synti/deicsonze/deicsonze.cpp b/muse2/synti/deicsonze/deicsonze.cpp
index 78869cf6..62abed5d 100644
--- a/muse2/synti/deicsonze/deicsonze.cpp
+++ b/muse2/synti/deicsonze/deicsonze.cpp
@@ -263,7 +263,7 @@ float* DeicsOnze::getSinusWaveTable() {
 //---------------------------------------------------------
 //   guiVisible
 //---------------------------------------------------------
-bool DeicsOnze::guiVisible() const
+bool DeicsOnze::nativeGuiVisible() const
 {
     return _gui->isVisible();
 }
@@ -271,16 +271,16 @@ bool DeicsOnze::guiVisible() const
 //---------------------------------------------------------
 // showGui
 //---------------------------------------------------------
-void DeicsOnze::showGui(bool val)
+void DeicsOnze::showNativeGui(bool val)
 {
     _gui->setVisible(val);
 }
 
 //---------------------------------------------------------
-//   getGeometry
+//   getNativeGeometry
 //---------------------------------------------------------
 
-void DeicsOnze::getGeometry(int* x, int* y, int* w, int* h) const {
+void DeicsOnze::getNativeGeometry(int* x, int* y, int* w, int* h) const {
   QPoint pos(_gui->pos());
   QSize size(_gui->size());
   *x = pos.x();
@@ -299,10 +299,10 @@ void DeicsOnze::setSampleRate(int sr) {
 }
 
 //---------------------------------------------------------
-//   setGeometry
+//   setNativeGeometry
 //---------------------------------------------------------
 
-void DeicsOnze::setGeometry(int x, int y, int w, int h) {
+void DeicsOnze::setNativeGeometry(int x, int y, int w, int h) {
     _gui->resize(QSize(w, h));
     _gui->move(QPoint(x, y));
 }
diff --git a/muse2/synti/deicsonze/deicsonze.h b/muse2/synti/deicsonze/deicsonze.h
index 94da0865..dc7c533d 100644
--- a/muse2/synti/deicsonze/deicsonze.h
+++ b/muse2/synti/deicsonze/deicsonze.h
@@ -590,11 +590,14 @@ class DeicsOnze : public Mess {
   virtual void process(float** buffer, int offset, int n);
   
   // GUI interface routines
-  virtual bool hasGui() const { return true; }
-  virtual bool guiVisible() const;
-  virtual void showGui(bool);
-  virtual void getGeometry(int* x, int* y, int* w, int* h) const;
-  virtual void setGeometry(int, int, int, int);
+  //virtual bool hasGui() const { return true; }
+  //virtual bool guiVisible() const;
+  //virtual void showGui(bool);
+  virtual bool hasNativeGui() const { return true; }
+  virtual bool nativeGuiVisible() const;
+  virtual void showNativeGui(bool);
+  virtual void getNativeGeometry(int* x, int* y, int* w, int* h) const;
+  virtual void setNativeGeometry(int, int, int, int);
   
   DeicsOnze();
   ~DeicsOnze();