summaryrefslogtreecommitdiff
path: root/muse2/synti/vam/vam.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-04-11 14:46:12 +0000
committerFlorian Jung <flo@windfisch.org>2011-04-11 14:46:12 +0000
commit384e0d2f6d77ab107268921511dd91464d4accb3 (patch)
treef361808b7af39d0d28188e5efb0140b3e01ab8a1 /muse2/synti/vam/vam.cpp
parent51eda45715625b6da768e670388510c91b01ff5c (diff)
parentc8a651f88b5728e246cb46599521ce981f0f4cfb (diff)
cosmetic stuff: made many functions static, improved pixmap loading
synced with current trunk
Diffstat (limited to 'muse2/synti/vam/vam.cpp')
-rw-r--r--muse2/synti/vam/vam.cpp29
1 files changed, 16 insertions, 13 deletions
diff --git a/muse2/synti/vam/vam.cpp b/muse2/synti/vam/vam.cpp
index 6d9d181c..fd71d9ea 100644
--- a/muse2/synti/vam/vam.cpp
+++ b/muse2/synti/vam/vam.cpp
@@ -193,11 +193,14 @@ class VAM : public MessMono {
public:
virtual int getControllerInfo(int, const char**, int*, int*, int*, int*) const;
virtual void getInitData(int* n, const unsigned char**p) const;
- virtual bool guiVisible() const;
- virtual void showGui(bool);
- virtual bool hasGui() const { return true; }
- virtual void getGeometry(int* x, int* y, int* w, int* h) const;
- virtual void setGeometry(int x, int y, int w, int h);
+ //virtual bool guiVisible() const;
+ //virtual void showGui(bool);
+ //virtual bool hasGui() const { return true; }
+ virtual bool nativeGuiVisible() const;
+ virtual void showNativeGui(bool);
+ virtual bool hasNativeGui() const { return true; }
+ virtual void getNativeGeometry(int* x, int* y, int* w, int* h) const;
+ virtual void setNativeGeometry(int x, int y, int w, int h);
virtual void processMessages();
virtual void process(float**, int, int);
virtual void note(int channel, int pitch, int velo);
@@ -979,28 +982,28 @@ bool VAM::sysex(int n, const unsigned char* data)
}
//---------------------------------------------------------
-// guiVisible
+// nativeGuiVisible
//---------------------------------------------------------
-bool VAM::guiVisible() const
+bool VAM::nativeGuiVisible() const
{
return gui->isVisible();
}
//---------------------------------------------------------
-// showGui
+// showNativeGui
//---------------------------------------------------------
-void VAM::showGui(bool val)
+void VAM::showNativeGui(bool val)
{
gui->setVisible(val);
}
//---------------------------------------------------------
-// getGeometry
+// getNativeGeometry
//---------------------------------------------------------
-void VAM::getGeometry(int* x, int* y, int* w, int* h) const
+void VAM::getNativeGeometry(int* x, int* y, int* w, int* h) const
{
QPoint pos(gui->pos());
QSize size(gui->size());
@@ -1011,10 +1014,10 @@ void VAM::getGeometry(int* x, int* y, int* w, int* h) const
}
//---------------------------------------------------------
-// setGeometry
+// setNativeGeometry
//---------------------------------------------------------
-void VAM::setGeometry(int x, int y, int w, int h)
+void VAM::setNativeGeometry(int x, int y, int w, int h)
{
gui->resize(QSize(w, h));
gui->move(QPoint(x, y));