summaryrefslogtreecommitdiff
path: root/muse2/synti
diff options
context:
space:
mode:
Diffstat (limited to 'muse2/synti')
-rw-r--r--muse2/synti/deicsonze/deicsonze.cpp12
-rw-r--r--muse2/synti/deicsonze/deicsonze.h13
-rw-r--r--muse2/synti/fluid/fluid.cpp4
-rw-r--r--muse2/synti/fluid/fluid.h9
-rw-r--r--muse2/synti/fluidsynth/fluidsynti.cpp8
-rw-r--r--muse2/synti/fluidsynth/fluidsynti.h9
-rw-r--r--muse2/synti/libsynti/mess.cpp21
-rw-r--r--muse2/synti/libsynti/mess.h5
-rw-r--r--muse2/synti/organ/organ.cpp16
-rw-r--r--muse2/synti/organ/organ.h13
-rw-r--r--muse2/synti/s1/s1.cpp13
-rw-r--r--muse2/synti/simpledrums/simpledrums.cpp18
-rw-r--r--muse2/synti/simpledrums/simpledrums.h9
-rw-r--r--muse2/synti/simpledrums2/simpledrums.cpp18
-rw-r--r--muse2/synti/simpledrums2/simpledrums.h9
-rw-r--r--muse2/synti/vam/vam.cpp29
16 files changed, 124 insertions, 82 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();
diff --git a/muse2/synti/fluid/fluid.cpp b/muse2/synti/fluid/fluid.cpp
index d1802354..ad3d06a6 100644
--- a/muse2/synti/fluid/fluid.cpp
+++ b/muse2/synti/fluid/fluid.cpp
@@ -272,7 +272,7 @@ void ISynth::allNotesOff()
// guiVisible
//---------------------------------------------------------
-bool ISynth::guiVisible() const
+bool ISynth::nativeGuiVisible() const
{
return gui->isVisible();
}
@@ -281,7 +281,7 @@ bool ISynth::guiVisible() const
// showGui
//---------------------------------------------------------
-void ISynth::showGui(bool flag)
+void ISynth::showNativeGui(bool flag)
{
gui->setVisible(flag);
}
diff --git a/muse2/synti/fluid/fluid.h b/muse2/synti/fluid/fluid.h
index c1669846..e80f1463 100644
--- a/muse2/synti/fluid/fluid.h
+++ b/muse2/synti/fluid/fluid.h
@@ -64,9 +64,12 @@ class ISynth : public Mess {
virtual const MidiPatch* getPatchInfo(int, const MidiPatch *) const;
virtual void getInitData(int*, const unsigned char**);
- virtual bool guiVisible() const;
- virtual void showGui(bool);
- virtual bool hasGui() const { return true; }
+ //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; }
public:
ISynth();
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();
diff --git a/muse2/synti/libsynti/mess.cpp b/muse2/synti/libsynti/mess.cpp
index 8c23d8ea..aa771056 100644
--- a/muse2/synti/libsynti/mess.cpp
+++ b/muse2/synti/libsynti/mess.cpp
@@ -53,10 +53,23 @@ Mess::~Mess()
void Mess::getGeometry(int* x, int* y, int* w, int* h) const
{
- x = 0;
- y = 0;
- w = 0;
- h = 0;
+ *x = 0;
+ *y = 0;
+ *w = 0;
+ *h = 0;
+ }
+
+//---------------------------------------------------------
+// getNativeGeometry
+// dummy
+//---------------------------------------------------------
+
+void Mess::getNativeGeometry(int* x, int* y, int* w, int* h) const
+ {
+ *x = 0;
+ *y = 0;
+ *w = 0;
+ *h = 0;
}
//---------------------------------------------------------
diff --git a/muse2/synti/libsynti/mess.h b/muse2/synti/libsynti/mess.h
index ea4f425f..bf9ad0de 100644
--- a/muse2/synti/libsynti/mess.h
+++ b/muse2/synti/libsynti/mess.h
@@ -78,8 +78,13 @@ class Mess {
virtual bool hasGui() const { return false; }
virtual bool guiVisible() const { return false; }
virtual void showGui(bool) {}
+ virtual bool hasNativeGui() const { return false; }
+ virtual bool nativeGuiVisible() const { return false; }
+ virtual void showNativeGui(bool) {}
virtual void getGeometry(int* x, int* y, int* w, int* h) const;
virtual void setGeometry(int, int, int, int) {}
+ virtual void getNativeGeometry(int* x, int* y, int* w, int* h) const;
+ virtual void setNativeGeometry(int, int, int, int) {}
};
//---------------------------------------------------------
diff --git a/muse2/synti/organ/organ.cpp b/muse2/synti/organ/organ.cpp
index 1aa87742..56fb4db1 100644
--- a/muse2/synti/organ/organ.cpp
+++ b/muse2/synti/organ/organ.cpp
@@ -636,28 +636,28 @@ int Organ::getControllerInfo(int id, const char** name, int* controller,
}
//---------------------------------------------------------
-// guiVisible
+// nativeGuiVisible
//---------------------------------------------------------
-bool Organ::guiVisible() const
+bool Organ::nativeGuiVisible() const
{
return gui->isVisible();
}
//---------------------------------------------------------
-// showGui
+// showNativeGui
//---------------------------------------------------------
-void Organ::showGui(bool val)
+void Organ::showNativeGui(bool val)
{
gui->setVisible(val);
}
//---------------------------------------------------------
-// getGeometry
+// getNativeGeometry
//---------------------------------------------------------
-void Organ::getGeometry(int* x, int* y, int* w, int* h) const
+void Organ::getNativeGeometry(int* x, int* y, int* w, int* h) const
{
QPoint pos(gui->pos());
QSize size(gui->size());
@@ -668,10 +668,10 @@ void Organ::getGeometry(int* x, int* y, int* w, int* h) const
}
//---------------------------------------------------------
-// setGeometry
+// setNativeGeometry
//---------------------------------------------------------
-void Organ::setGeometry(int x, int y, int w, int h)
+void Organ::setNativeGeometry(int x, int y, int w, int h)
{
gui->resize(QSize(w, h));
gui->move(QPoint(x, y));
diff --git a/muse2/synti/organ/organ.h b/muse2/synti/organ/organ.h
index 308646e1..60fee98a 100644
--- a/muse2/synti/organ/organ.h
+++ b/muse2/synti/organ/organ.h
@@ -182,11 +182,14 @@ class Organ : public Mess {
virtual int getControllerInfo(int, const char**, int*, int*, int*, int*) const;
virtual void getInitData(int*, const unsigned char**) 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 bool sysex(int, const unsigned char*);
static SynthCtrl synthCtrl[];
Organ(int sampleRate);
diff --git a/muse2/synti/s1/s1.cpp b/muse2/synti/s1/s1.cpp
index 0dca2656..c44676ce 100644
--- a/muse2/synti/s1/s1.cpp
+++ b/muse2/synti/s1/s1.cpp
@@ -42,9 +42,12 @@ class S1 : public MessMono {
virtual void note(int channel, int pitch, int velo);
//virtual void processMessages();
virtual void process(float** buffer, int offset, int n);
- virtual bool hasGui() const { return true; }
- virtual bool guiVisible() const { return _showGui; }
- virtual void showGui(bool);
+ //virtual bool hasGui() const { return true; }
+ //virtual bool guiVisible() const { return _showGui; }
+ //virtual void showGui(bool);
+ virtual bool hasNativeGui() const { return true; }
+ virtual bool nativeGuiVisible() const { return _showGui; }
+ virtual void showNativeGui(bool);
virtual bool setController(int channel, int ctrl, int val);
virtual int getControllerInfo(int id, const char** name, int* ctrl, int* min, int* max, int* initval) const;
@@ -76,7 +79,7 @@ S1::S1() : MessMono()
param = 0;
_showGui=false;
- showGui(true);
+ showNativeGui(true);
}
//---------------------------------------------------------
@@ -165,7 +168,7 @@ void S1::process(float** buffer, int offset, int n)
//---------------------------------------------------------
-void S1::showGui(bool show)
+void S1::showNativeGui(bool show)
{
if (show)
QMessageBox::information( NULL, "S1",
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);
diff --git a/muse2/synti/simpledrums2/simpledrums.cpp b/muse2/synti/simpledrums2/simpledrums.cpp
index ecd03d35..f14a0627 100644
--- a/muse2/synti/simpledrums2/simpledrums.cpp
+++ b/muse2/synti/simpledrums2/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
@@ -808,14 +808,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/simpledrums2/simpledrums.h b/muse2/synti/simpledrums2/simpledrums.h
index 7aab4ed3..58a5945e 100644
--- a/muse2/synti/simpledrums2/simpledrums.h
+++ b/muse2/synti/simpledrums2/simpledrums.h
@@ -114,8 +114,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);
@@ -124,7 +126,8 @@ class SimpleSynth : public Mess
virtual const MidiPatch* getPatchInfo(int arg1, const MidiPatch* arg2) const;
virtual int getControllerInfo(int arg1, const char** arg2, int* arg3, int* arg4, int* arg5);
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**);
bool init(const char* name);
void guiSendSampleLoaded(bool success, int ch, const char* filename);
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));
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 06:35:04 +0000