hdspmixer: Add a 9th pseudo preset

When switching cards, all current settings are lost. To have a place
where to store them, let's add a virtual 9th preset which can be used as
a temporary scratch pad.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/hdspmixer/src/HDSPMixerIOMixer.cxx b/hdspmixer/src/HDSPMixerIOMixer.cxx
index 7e3934e4bbd9b343087ed08ecb5c86fa4f626a46..119ffd7caa759b54aa289d862ab24b5298d14416 100644 (file)
--- a/hdspmixer/src/HDSPMixerIOMixer.cxx
+++ b/hdspmixer/src/HDSPMixerIOMixer.cxx
@@ -38,7 +38,7 @@ HDSPMixerIOMixer::HDSPMixerIOMixer(int x, int y, int w, int h, int ch, int type)
        p_iomixer_xpm = iomixer_r_xpm;
     }
     for (int j = 0; j < MAX_CARDS; ++j) {
-       for (int i = 0; i < 8; ++i) {
+       for (int i = 0; i < NUM_PRESETS; ++i) {
            data[j][0][i] = new HDSPMixerStripData();
            data[j][1][i] = new HDSPMixerStripData();
            data[j][2][i] = new HDSPMixerStripData();

diff --git a/hdspmixer/src/HDSPMixerIOMixer.h b/hdspmixer/src/HDSPMixerIOMixer.h
index 2ec7f0585e572083a1d84a059bf86991416c5982..aa1248741eaae1f673b6f84ebf089402524fa12f 100644 (file)
--- a/hdspmixer/src/HDSPMixerIOMixer.h
+++ b/hdspmixer/src/HDSPMixerIOMixer.h
@@ -56,7 +56,7 @@ private:
        std::stringstream channel_name;
     void update_child(Fl_Widget &widget);
 public:
-    HDSPMixerStripData *data[MAX_CARDS][3][8]; /* data[card][mode(ss/ds/qs)][preset number] */
+    HDSPMixerStripData *data[MAX_CARDS][3][NUM_PRESETS]; /* data[card][mode(ss/ds/qs)][preset number] */
     HDSPMixerPan *pan;
     HDSPMixerFader *fader;
     HDSPMixerPeak *peak;

diff --git a/hdspmixer/src/HDSPMixerOutput.cxx b/hdspmixer/src/HDSPMixerOutput.cxx
index 2c7fe293d32c83aa4eb2473e8556ca7b9133c583..17ab25d7c2c22a980484d3fee6dcb75c893bda6a 100644 (file)
--- a/hdspmixer/src/HDSPMixerOutput.cxx
+++ b/hdspmixer/src/HDSPMixerOutput.cxx
@@ -170,8 +170,8 @@ static char const *labels_9632_qs[8] = {
 HDSPMixerOutput::HDSPMixerOutput(int x, int y, int w, int h, int num):Fl_Group(x, y, w, h)
 {
 
-    for (int j = 0; j < 3; ++j) {
-       for (int i = 0; i < 8; ++i) {
+    for (int j = 0; j < MAX_CARDS; ++j) {
+       for (int i = 0; i < NUM_PRESETS; ++i) {
            data[j][0][i] = new HDSPMixerOutputData();
            data[j][1][i] = new HDSPMixerOutputData();
            data[j][2][i] = new HDSPMixerOutputData();

diff --git a/hdspmixer/src/HDSPMixerOutput.h b/hdspmixer/src/HDSPMixerOutput.h
index 2bc3d5cc1ff94098342aa82a0169b167975add60..6278cfda08b58fefb40364296eaa729bded1a527 100644 (file)
--- a/hdspmixer/src/HDSPMixerOutput.h
+++ b/hdspmixer/src/HDSPMixerOutput.h
@@ -52,7 +52,7 @@ private:
     HDSPMixerWindow *basew;    
     void update_child(Fl_Widget& widget);
 public:
-    HDSPMixerOutputData *data[MAX_CARDS][3][8]; /* data[card][mode(ss/ds/qs)][preset number] */
+    HDSPMixerOutputData *data[MAX_CARDS][3][NUM_PRESETS]; /* data[card][mode(ss/ds/qs)][preset number] */
     HDSPMixerFader *fader;
     HDSPMixerGain *gain;
     HDSPMixerMeter *meter;

diff --git a/hdspmixer/src/HDSPMixerWindow.cxx b/hdspmixer/src/HDSPMixerWindow.cxx
index 960ec0f29ba318a817007c4c37133d17cc36c19b..a3279047957144fda85a94abd08badec385823f5 100644 (file)
--- a/hdspmixer/src/HDSPMixerWindow.cxx
+++ b/hdspmixer/src/HDSPMixerWindow.cxx
@@ -791,7 +791,7 @@ HDSPMixerWindow::HDSPMixerWindow(int x, int y, int w, int h, const char *label,
        }       
     }
     for (int j = 0; j < MAX_CARDS; j++) {
-       for (int i = 0; i < 8; ++i) {
+       for (int i = 0; i < NUM_PRESETS; ++i) {
            data[j][0][i] = new HDSPMixerPresetData();
            data[j][1][i] = new HDSPMixerPresetData();
            data[j][2][i] = new HDSPMixerPresetData();

diff --git a/hdspmixer/src/HDSPMixerWindow.h b/hdspmixer/src/HDSPMixerWindow.h
index dfc7d593996da3d81e0a0486dc5cc36140c468d9..0c2674f19bfc58845cf17036b89b5a1644891d26 100644 (file)
--- a/hdspmixer/src/HDSPMixerWindow.h
+++ b/hdspmixer/src/HDSPMixerWindow.h
@@ -73,7 +73,7 @@ public:
     Fl_Scroll *scroll;
     HDSPMixerSetup *setup;
     HDSPMixerAbout *about;
-    HDSPMixerPresetData *data[MAX_CARDS][3][8]; /* data[card number][mode(ss/ds/qs)][preset number] */
+    HDSPMixerPresetData *data[MAX_CARDS][3][NUM_PRESETS]; /* data[card number][mode(ss/ds/qs)][preset number] */
     HDSPMixerCard *cards[MAX_CARDS];
     HDSPMixerInputs *inputs;
     HDSPMixerPlaybacks *playbacks;

diff --git a/hdspmixer/src/defines.h b/hdspmixer/src/defines.h
index d29c37c2769a28d8de50bd20a85b753078c044a7..af5c382bcb0a8911048ece8694c83da12a2f0a1a 100644 (file)
--- a/hdspmixer/src/defines.h
+++ b/hdspmixer/src/defines.h
@@ -49,6 +49,12 @@
 
 #define MAX_CARDS      3
 
+/* Number of presets. 8 presets visible to the user, the 9th is used for
+ * holding temporary mixer data when switching cards, so it's not a real
+ * preset but more like a scratch pad.
+ */
+#define NUM_PRESETS    9
+
 typedef unsigned long long int int64;
 
 #endif