hdspmixer: Fix compiler warnings.

All compiler warnings were caused by a conversion from "foo" to a
char pointer. Given that the string itself really is constant, simply
add the keyword to make g++ happy.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Adrian Knoth 2011-02-28 14:56:07 +01:00 committed by Takashi Iwai
parent 646eacb626
commit c3349a84ea
55 changed files with 130 additions and 130 deletions

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * Slider1_xpm[] = { char const * Slider1_xpm[] = {
"13 12 257 2", "13 12 257 2",
" c None", " c None",
". c #000000", ". c #000000",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * Slider2_xpm[] = { char const * Slider2_xpm[] = {
"2 13 257 2", "2 13 257 2",
" c None", " c None",
". c #7DF846", ". c #7DF846",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * Zlmloop2_xpm[] = { char const * Zlmloop2_xpm[] = {
"76 253 257 2", "76 253 257 2",
" c None", " c None",
". c #D1E0E5", ". c #D1E0E5",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * Zlmloopm2_xpm[] = { char const * Zlmloopm2_xpm[] = {
"76 253 257 2", "76 253 257 2",
" c None", " c None",
". c #D1E0E5", ". c #D1E0E5",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_blank_xpm[] = { char const * b_blank_xpm[] = {
"13 13 13 1", "13 13 13 1",
" c None", " c None",
". c #1AA00D", ". c #1AA00D",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_card1_xpm[] = { char const * b_card1_xpm[] = {
"13 13 14 1", "13 13 14 1",
" c None", " c None",
". c #8D8F0F", ". c #8D8F0F",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_card2_xpm[] = { char const * b_card2_xpm[] = {
"13 13 14 1", "13 13 14 1",
" c None", " c None",
". c #8D8F0F", ". c #8D8F0F",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_card3_xpm[] = { char const * b_card3_xpm[] = {
"13 13 14 1", "13 13 14 1",
" c None", " c None",
". c #8D8F0F", ". c #8D8F0F",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_mute_xpm[] = { char const * b_mute_xpm[] = {
"30 22 52 1", "30 22 52 1",
" c None", " c None",
". c #DE8C00", ". c #DE8C00",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_pre1_xpm[] = { char const * b_pre1_xpm[] = {
"13 13 14 1", "13 13 14 1",
" c None", " c None",
". c #1AA00D", ". c #1AA00D",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_pre2_xpm[] = { char const * b_pre2_xpm[] = {
"13 13 14 1", "13 13 14 1",
" c None", " c None",
". c #1AA00D", ". c #1AA00D",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_pre3_xpm[] = { char const * b_pre3_xpm[] = {
"13 13 14 1", "13 13 14 1",
" c None", " c None",
". c #1AA00D", ". c #1AA00D",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_pre4_xpm[] = { char const * b_pre4_xpm[] = {
"13 13 14 1", "13 13 14 1",
" c None", " c None",
". c #1AA00D", ". c #1AA00D",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_pre5_xpm[] = { char const * b_pre5_xpm[] = {
"13 13 14 1", "13 13 14 1",
" c None", " c None",
". c #1AA00D", ". c #1AA00D",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_pre6_xpm[] = { char const * b_pre6_xpm[] = {
"13 13 14 1", "13 13 14 1",
" c None", " c None",
". c #1AA00D", ". c #1AA00D",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_pre7_xpm[] = { char const * b_pre7_xpm[] = {
"13 13 14 1", "13 13 14 1",
" c None", " c None",
". c #1AA00D", ". c #1AA00D",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_pre8_xpm[] = { char const * b_pre8_xpm[] = {
"13 13 14 1", "13 13 14 1",
" c None", " c None",
". c #1AA00D", ". c #1AA00D",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_save_xpm[] = { char const * b_save_xpm[] = {
"13 13 14 1", "13 13 14 1",
" c None", " c None",
". c #5C7B1B", ". c #5C7B1B",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_solo_xpm[] = { char const * b_solo_xpm[] = {
"30 22 53 1", "30 22 53 1",
" c None", " c None",
". c #7C2000", ". c #7C2000",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * b_zlm_xpm[] = { char const * b_zlm_xpm[] = {
"13 13 11 1", "13 13 11 1",
" c None", " c None",
". c #000D00", ". c #000D00",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * buttons_xpm[] = { char const * buttons_xpm[] = {
"76 253 257 2", "76 253 257 2",
" c None", " c None",
". c #C08480", ". c #C08480",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * empty_xpm[] = { char const * empty_xpm[] = {
"76 253 402 2", "76 253 402 2",
" c None", " c None",
". c #404840", ". c #404840",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * empty_2_xpm[] = { char const * empty_2_xpm[] = {
"76 253 257 2", "76 253 257 2",
" c None", " c None",
". c #D1E0E5", ". c #D1E0E5",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * empty_linux_xpm[] = { char const * empty_linux_xpm[] = {
"76 253 1535 2", "76 253 1535 2",
" c None", " c None",
". c #404840", ". c #404840",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * iomixer_xpm[] = { char const * iomixer_xpm[] = {
"36 253 257 2", "36 253 257 2",
" c None", " c None",
". c #000000", ". c #000000",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * iomixer_r_xpm[] = { char const * iomixer_r_xpm[] = {
"36 253 257 2", "36 253 257 2",
" c None", " c None",
". c #000000", ". c #000000",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * level_xpm[] = { char const * level_xpm[] = {
"8 139 257 2", "8 139 257 2",
" c None", " c None",
". c #149003", ". c #149003",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * matrix_black_xpm[] = { char const * matrix_black_xpm[] = {
"32 12 257 2", "32 12 257 2",
" c None", " c None",
". c #000000", ". c #000000",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * matrix_grey_xpm[] = { char const * matrix_grey_xpm[] = {
"32 12 22 1", "32 12 22 1",
" c None", " c None",
". c #A0A0A0", ". c #A0A0A0",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * matrix_grey_l_xpm[] = { char const * matrix_grey_l_xpm[] = {
"32 12 22 1", "32 12 22 1",
" c None", " c None",
". c #6F776F", ". c #6F776F",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * matrix_grey_o_xpm[] = { char const * matrix_grey_o_xpm[] = {
"32 12 22 1", "32 12 22 1",
" c None", " c None",
". c #6F776F", ". c #6F776F",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * matrix_grey_ol_xpm[] = { char const * matrix_grey_ol_xpm[] = {
"32 12 22 1", "32 12 22 1",
" c None", " c None",
". c #6F776F", ". c #6F776F",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * matrix_mute_xpm[] = { char const * matrix_mute_xpm[] = {
"32 12 25 1", "32 12 25 1",
" c None", " c None",
". c #C5C5BD", ". c #C5C5BD",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * matrix_white_xpm[] = { char const * matrix_white_xpm[] = {
"32 12 257 2", "32 12 257 2",
" c None", " c None",
". c #000000", ". c #000000",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * matrix_yellow_xpm[] = { char const * matrix_yellow_xpm[] = {
"32 12 257 2", "32 12 257 2",
" c None", " c None",
". c #000000", ". c #000000",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * monitor_xpm[] = { char const * monitor_xpm[] = {
"76 253 257 2", "76 253 257 2",
" c None", " c None",
". c #D1E0E5", ". c #D1E0E5",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * mute_xpm[] = { char const * mute_xpm[] = {
"13 26 30 1", "13 26 30 1",
" c None", " c None",
". c #1B7B1B", ". c #1B7B1B",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * output_xpm[] = { char const * output_xpm[] = {
"36 208 257 2", "36 208 257 2",
" c None", " c None",
". c #000000", ". c #000000",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * output_r_xpm[] = { char const * output_r_xpm[] = {
"36 208 257 2", "36 208 257 2",
" c None", " c None",
". c #000000", ". c #000000",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * over_xpm[] = { char const * over_xpm[] = {
"30 13 257 2", "30 13 257 2",
" c None", " c None",
". c #000000", ". c #000000",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * peak_xpm[] = { char const * peak_xpm[] = {
"8 5 257 2", "8 5 257 2",
" c None", " c None",
". c #61FF48", ". c #61FF48",

View file

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
char * solo_xpm[] = { char const * solo_xpm[] = {
"13 26 28 1", "13 26 28 1",
" c None", " c None",
". c #3C3E2D", ". c #3C3E2D",

View file

@ -22,7 +22,7 @@
#include "HDSPMixerAbout.h" #include "HDSPMixerAbout.h"
HDSPMixerAbout::HDSPMixerAbout(int w, int h, char *label, HDSPMixerWindow *win):Fl_Double_Window(w, h, label) HDSPMixerAbout::HDSPMixerAbout(int w, int h, char const *label, HDSPMixerWindow *win):Fl_Double_Window(w, h, label)
{ {
basew = win; basew = win;
text = new HDSPMixerAboutText(10,10,w-20,h-20); text = new HDSPMixerAboutText(10,10,w-20,h-20);

View file

@ -36,7 +36,7 @@ private:
HDSPMixerAboutText *text; HDSPMixerAboutText *text;
HDSPMixerWindow *basew; HDSPMixerWindow *basew;
public: public:
HDSPMixerAbout(int w, int h, char *label, HDSPMixerWindow *win); HDSPMixerAbout(int w, int h, char const *label, HDSPMixerWindow *win);
int handle(int e); int handle(int e);
}; };

View file

@ -32,7 +32,7 @@ public:
HDSPMixerAboutText(int x, int y, int w, int h); HDSPMixerAboutText(int x, int y, int w, int h);
void draw(); void draw();
private: private:
char *text; char const *text;
}; };
#endif #endif

View file

@ -33,7 +33,7 @@ void HDSPMixerGain::draw()
fl_draw(text, x(), y(), w(), h(), FL_ALIGN_CENTER); fl_draw(text, x(), y(), w(), h(), FL_ALIGN_CENTER);
} }
void HDSPMixerGain::setText(char *txt) void HDSPMixerGain::setText(char const *txt)
{ {
strncpy(text, txt, 10); strncpy(text, txt, 10);
redraw(); redraw();

View file

@ -39,7 +39,7 @@ public:
char text[10]; char text[10];
HDSPMixerGain(int x, int y, int parenttype); HDSPMixerGain(int x, int y, int parenttype);
void draw(); void draw();
void setText(char *txt); void setText(char const *txt);
}; };
#endif #endif

View file

@ -51,7 +51,7 @@ class HDSPMixerMeter;
class HDSPMixerIOMixer:public Fl_Group class HDSPMixerIOMixer:public Fl_Group
{ {
private: private:
char **p_iomixer_xpm; char const **p_iomixer_xpm;
int channel_num, relative_num, mixer_type; int channel_num, relative_num, mixer_type;
std::stringstream channel_name; std::stringstream channel_name;
void update_child(Fl_Widget &widget); void update_child(Fl_Widget &widget);

View file

@ -21,7 +21,7 @@
#pragma implementation #pragma implementation
#include "HDSPMixerOutput.h" #include "HDSPMixerOutput.h"
static char *labels_madi_ss[64] = { static char const *labels_madi_ss[64] = {
"1", "2", "3", "4", "5", "6", "7", "8", "1", "2", "3", "4", "5", "6", "7", "8",
"9", "10", "11", "12", "13", "14", "15", "16", "9", "10", "11", "12", "13", "14", "15", "16",
"17", "18", "19", "20", "21", "22", "23", "24", "17", "18", "19", "20", "21", "22", "23", "24",
@ -32,25 +32,25 @@ static char *labels_madi_ss[64] = {
"57", "58", "59", "60", "61", "62", "63", "64" "57", "58", "59", "60", "61", "62", "63", "64"
}; };
static char *labels_madi_ds[64] = { static char const *labels_madi_ds[64] = {
"1", "2", "3", "4", "5", "6", "7", "8", "1", "2", "3", "4", "5", "6", "7", "8",
"9", "10", "11", "12", "13", "14", "15", "16", "9", "10", "11", "12", "13", "14", "15", "16",
"17", "18", "19", "20", "21", "22", "23", "24", "17", "18", "19", "20", "21", "22", "23", "24",
"25", "26", "27", "28", "29", "30", "31", "32", "25", "26", "27", "28", "29", "30", "31", "32",
}; };
static char *labels_madi_qs[16] = { static char const *labels_madi_qs[16] = {
"1", "2", "3", "4", "5", "6", "7", "8", "1", "2", "3", "4", "5", "6", "7", "8",
"9", "10", "11", "12", "13", "14", "15", "16", "9", "10", "11", "12", "13", "14", "15", "16",
}; };
static char *labels_aes32[16] = { static char const *labels_aes32[16] = {
"AES 1", "AES 2", "AES 3", "AES 4", "AES 5", "AES 6", "AES 7", "AES 8", "AES 1", "AES 2", "AES 3", "AES 4", "AES 5", "AES 6", "AES 7", "AES 8",
"AES 9", "AES 10", "AES 11", "AES 12", "AES 13", "AES 14", "AES 15", "AES 16" "AES 9", "AES 10", "AES 11", "AES 12", "AES 13", "AES 14", "AES 15", "AES 16"
}; };
static char *labels_raydat_ss[36] = { static char const *labels_raydat_ss[36] = {
"A1.1", "A1.2", "A1.3", "A1.4", "A1.5", "A1.6", "A1.7", "A1.8", "A1.1", "A1.2", "A1.3", "A1.4", "A1.5", "A1.6", "A1.7", "A1.8",
"A2.1", "A2.2", "A2.3", "A2.4", "A2.5", "A2.6", "A2.7", "A2.8", "A2.1", "A2.2", "A2.3", "A2.4", "A2.5", "A2.6", "A2.7", "A2.8",
"A3.1", "A3.2", "A3.3", "A3.4", "A3.5", "A3.6", "A3.7", "A3.8", "A3.1", "A3.2", "A3.3", "A3.4", "A3.5", "A3.6", "A3.7", "A3.8",
@ -59,7 +59,7 @@ static char *labels_raydat_ss[36] = {
"SP.L", "SP.R" "SP.L", "SP.R"
}; };
static char *labels_raydat_ds[20] = { static char const *labels_raydat_ds[20] = {
"A1.1", "A1.2", "A1.3", "A1.4", "A1.1", "A1.2", "A1.3", "A1.4",
"A2.1", "A2.2", "A2.3", "A2.4", "A2.1", "A2.2", "A2.3", "A2.4",
"A3.1", "A3.2", "A3.3", "A3.4", "A3.1", "A3.2", "A3.3", "A3.4",
@ -68,7 +68,7 @@ static char *labels_raydat_ds[20] = {
"SP.L", "SP.R" "SP.L", "SP.R"
}; };
static char *labels_raydat_qs[12] = { static char const *labels_raydat_qs[12] = {
"A1.1", "A1.2", "A1.1", "A1.2",
"A2.1", "A2.2", "A2.1", "A2.2",
"A3.1", "A3.2", "A3.1", "A3.2",
@ -78,7 +78,7 @@ static char *labels_raydat_qs[12] = {
}; };
static char *labels_aio_ss_input[14] = { static char const *labels_aio_ss_input[14] = {
"AN 1", "AN 2", "AN 1", "AN 2",
"SP.L", "SP.R", "SP.L", "SP.R",
"AES.L", "AES.R", "AES.L", "AES.R",
@ -86,7 +86,7 @@ static char *labels_aio_ss_input[14] = {
"A 5", "A 6", "A 7", "A 8" "A 5", "A 6", "A 7", "A 8"
}; };
static char *labels_aio_ss_playback[16] = { static char const *labels_aio_ss_playback[16] = {
"AN 1", "AN 2", "AN 1", "AN 2",
"SP.L", "SP.R", "SP.L", "SP.R",
"AES.L", "AES.R", "AES.L", "AES.R",
@ -95,14 +95,14 @@ static char *labels_aio_ss_playback[16] = {
"PH.L", "PH.R" "PH.L", "PH.R"
}; };
static char *labels_aio_ds_input[10] = { static char const *labels_aio_ds_input[10] = {
"AN 1", "AN 2", "AN 1", "AN 2",
"SP.L", "SP.R", "SP.L", "SP.R",
"AES.L", "AES.R", "AES.L", "AES.R",
"A 1", "A 2", "A 3", "A 4" "A 1", "A 2", "A 3", "A 4"
}; };
static char *labels_aio_ds_playback[12] = { static char const *labels_aio_ds_playback[12] = {
"AN 1", "AN 2", "AN 1", "AN 2",
"SP.L", "SP.R", "SP.L", "SP.R",
"AES.L", "AES.R", "AES.L", "AES.R",
@ -110,14 +110,14 @@ static char *labels_aio_ds_playback[12] = {
"PH.L", "PH.R" "PH.L", "PH.R"
}; };
static char *labels_aio_qs_input[8] = { static char const *labels_aio_qs_input[8] = {
"AN 1", "AN 2", "AN 1", "AN 2",
"SP.L", "SP.R", "SP.L", "SP.R",
"AES.L", "AES.R", "AES.L", "AES.R",
"A 1", "A 2" "A 1", "A 2"
}; };
static char *labels_aio_qs_playback[10] = { static char const *labels_aio_qs_playback[10] = {
"AN 1", "AN 2", "AN 1", "AN 2",
"SP.L", "SP.R", "SP.L", "SP.R",
"AES.L", "AES.R", "AES.L", "AES.R",
@ -126,44 +126,44 @@ static char *labels_aio_qs_playback[10] = {
}; };
static char *labels_mf_ss[20] = { static char const *labels_mf_ss[20] = {
"AN 1", "AN 2", "AN 3", "AN 4", "AN 5", "AN 6", "AN 7", "AN 8", "AN 1", "AN 2", "AN 3", "AN 4", "AN 5", "AN 6", "AN 7", "AN 8",
"A 1", "A 2", "A 3", "A 4", "A 5", "A 6", "A 7", "A 8", "A 1", "A 2", "A 3", "A 4", "A 5", "A 6", "A 7", "A 8",
"SP.L", "SP.R", "AN.L", "AN.R" "SP.L", "SP.R", "AN.L", "AN.R"
}; };
static char *labels_mf_ds[16] = { static char const *labels_mf_ds[16] = {
"AN 1", "AN 2", "AN 3", "AN 4", "AN 5", "AN 6", "AN 7", "AN 8", "AN 1", "AN 2", "AN 3", "AN 4", "AN 5", "AN 6", "AN 7", "AN 8",
"A 1", "A 2", "A 3", "A 4", "A 1", "A 2", "A 3", "A 4",
"SP.L", "SP.R", "AN.L", "AN.R" "SP.L", "SP.R", "AN.L", "AN.R"
}; };
static char *labels_df_ss[28] = { static char const *labels_df_ss[28] = {
"A1 1", "A1 2", "A1 3", "A1 4", "A1 5", "A1 6", "A1 7", "A1 8", "A1 1", "A1 2", "A1 3", "A1 4", "A1 5", "A1 6", "A1 7", "A1 8",
"A2 1", "A2 2", "A2 3", "A2 4", "A2 5", "A2 6", "A2 7", "A2 8", "A2 1", "A2 2", "A2 3", "A2 4", "A2 5", "A2 6", "A2 7", "A2 8",
"A3 1", "A3 2", "A3 3", "A3 4", "A3 5", "A3 6", "A3 7", "A3 8", "A3 1", "A3 2", "A3 3", "A3 4", "A3 5", "A3 6", "A3 7", "A3 8",
"SP.L", "SP.R", "AN.L", "AN.R" "SP.L", "SP.R", "AN.L", "AN.R"
}; };
static char *labels_df_ds[16] = { static char const *labels_df_ds[16] = {
"A1 1", "A1 2", "A1 3", "A1 4", "A1 1", "A1 2", "A1 3", "A1 4",
"A2 1", "A2 2", "A2 3", "A2 4", "A2 1", "A2 2", "A2 3", "A2 4",
"A3 1", "A3 2", "A3 3", "A3 4", "A3 1", "A3 2", "A3 3", "A3 4",
"SP.L", "SP.R", "AN.L", "AN.R" "SP.L", "SP.R", "AN.L", "AN.R"
}; };
static char *labels_9632_ss[16] = { static char const *labels_9632_ss[16] = {
"A 1", "A 2", "A 3", "A 4", "A 5", "A 6", "A 7", "A 8", "A 1", "A 2", "A 3", "A 4", "A 5", "A 6", "A 7", "A 8",
"SP.L", "SP.R", "AN 1", "AN 2", "AN 3", "AN 4", "AN 5", "AN 6" "SP.L", "SP.R", "AN 1", "AN 2", "AN 3", "AN 4", "AN 5", "AN 6"
}; };
static char *labels_9632_ds[12] = { static char const *labels_9632_ds[12] = {
"A 1", "A 2", "A 3", "A 4", "A 1", "A 2", "A 3", "A 4",
"SP.L", "SP.R", "AN 1", "AN 2", "AN 3", "AN 4", "AN 5", "AN 6" "SP.L", "SP.R", "AN 1", "AN 2", "AN 3", "AN 4", "AN 5", "AN 6"
}; };
static char *labels_9632_qs[8] = { static char const *labels_9632_qs[8] = {
"SP.L", "SP.R", "AN 1", "AN 2", "AN 3", "AN 4", "AN 5", "AN 6" "SP.L", "SP.R", "AN 1", "AN 2", "AN 3", "AN 4", "AN 5", "AN 6"
}; };

View file

@ -46,8 +46,8 @@ class HDSPMixerOutput:public Fl_Group
{ {
private: private:
int out_num; int out_num;
char **labels_input, **labels_playback; char const **labels_input, **labels_playback;
char **p_output_xpm; char const **p_output_xpm;
HDSPMixerPeak *peak; HDSPMixerPeak *peak;
HDSPMixerWindow *basew; HDSPMixerWindow *basew;
void update_child(Fl_Widget& widget); void update_child(Fl_Widget& widget);

View file

@ -24,7 +24,7 @@
#pragma implementation #pragma implementation
#include "HDSPMixerSelector.h" #include "HDSPMixerSelector.h"
static char *destinations_madi_ss[32] = { static char const *destinations_madi_ss[32] = {
"1+2", "3+4", "5+6", "7+8", "1+2", "3+4", "5+6", "7+8",
"9+10", "11+12", "13+14", "15+16", "9+10", "11+12", "13+14", "15+16",
"17+18", "19+20", "21+22", "23+24", "17+18", "19+20", "21+22", "23+24",
@ -35,24 +35,24 @@ static char *destinations_madi_ss[32] = {
"57+58", "59+60", "61+62", "63+64" "57+58", "59+60", "61+62", "63+64"
}; };
static char *destinations_madi_ds[16] = { static char const *destinations_madi_ds[16] = {
"1+2", "3+4", "5+6", "7+8", "1+2", "3+4", "5+6", "7+8",
"9+10", "11+12", "13+14", "15+16", "9+10", "11+12", "13+14", "15+16",
"17+18", "19+20", "21+22", "23+24", "17+18", "19+20", "21+22", "23+24",
"25+26", "27+28", "29+30", "31+32" "25+26", "27+28", "29+30", "31+32"
}; };
static char *destinations_madi_qs[8] = { static char const *destinations_madi_qs[8] = {
"1+2", "3+4", "5+6", "7+8", "1+2", "3+4", "5+6", "7+8",
"9+10", "11+12", "13+14", "15+16" "9+10", "11+12", "13+14", "15+16"
}; };
static char *destinations_aes32[8] = { static char const *destinations_aes32[8] = {
"AES 1+2", "AES 3+4", "AES 5+6", "AES 7+8", "AES 1+2", "AES 3+4", "AES 5+6", "AES 7+8",
"AES 9+10", "AES 11+12", "AES 13+14", "AES 15+16", "AES 9+10", "AES 11+12", "AES 13+14", "AES 15+16",
}; };
static char *destinations_raydat_ss[18] = { static char const *destinations_raydat_ss[18] = {
"A1 1+2", "A1 3+4", "A1 5+6", "A1 7+8", "A1 1+2", "A1 3+4", "A1 5+6", "A1 7+8",
"A2 1+2", "A2 3+4", "A2 5+6", "A2 7+8", "A2 1+2", "A2 3+4", "A2 5+6", "A2 7+8",
@ -62,7 +62,7 @@ static char *destinations_raydat_ss[18] = {
"SPDIF" "SPDIF"
}; };
static char *destinations_raydat_ds[10] = { static char const *destinations_raydat_ds[10] = {
"A1 1+2", "A1 3+4", "A1 1+2", "A1 3+4",
"A2 1+2", "A2 3+4", "A2 1+2", "A2 3+4",
"A3 1+2", "A3 3+4", "A3 1+2", "A3 3+4",
@ -71,7 +71,7 @@ static char *destinations_raydat_ds[10] = {
"SPDIF" "SPDIF"
}; };
static char *destinations_raydat_qs[6] = { static char const *destinations_raydat_qs[6] = {
"A1 1+2", "A1 1+2",
"A2 1+2", "A2 1+2",
"A3 1+2", "A3 1+2",
@ -81,7 +81,7 @@ static char *destinations_raydat_qs[6] = {
}; };
static char *destinations_aio_ss[8] = { static char const *destinations_aio_ss[8] = {
"AN 1+2", "AN 1+2",
"AES", "AES",
"SPDIF", "SPDIF",
@ -89,7 +89,7 @@ static char *destinations_aio_ss[8] = {
"Phones" "Phones"
}; };
static char *destinations_aio_ds[6] = { static char const *destinations_aio_ds[6] = {
"AN 1+2", "AN 1+2",
"AES", "AES",
"SPDIF", "SPDIF",
@ -97,7 +97,7 @@ static char *destinations_aio_ds[6] = {
"Phones" "Phones"
}; };
static char *destinations_aio_qs[5] = { static char const *destinations_aio_qs[5] = {
"AN 1+2", "AN 1+2",
"AES", "AES",
"SPDIF", "SPDIF",
@ -105,57 +105,57 @@ static char *destinations_aio_qs[5] = {
"Phones" "Phones"
}; };
static char *destinations_mf_ss[10] = { static char const *destinations_mf_ss[10] = {
"AN 1+2", "AN 3+4", "AN 5+6", "AN 7+8", "AN 1+2", "AN 3+4", "AN 5+6", "AN 7+8",
"A 1+2", "A 3+4", "A 5+6", "A 7+8", "A 1+2", "A 3+4", "A 5+6", "A 7+8",
"SPDIF", "Analog" "SPDIF", "Analog"
}; };
static char *destinations_mf_ds[8] = { static char const *destinations_mf_ds[8] = {
"AN 1+2", "AN 3+4", "AN 5+6", "AN 7+8", "AN 1+2", "AN 3+4", "AN 5+6", "AN 7+8",
"A 1+2", "A 3+4", "A 1+2", "A 3+4",
"SPDIF", "Analog" "SPDIF", "Analog"
}; };
static char *destinations_df_ss[14] = { static char const *destinations_df_ss[14] = {
"A1 1+2", "A1 3+4", "A1 5+6", "A1 7+8", "A1 1+2", "A1 3+4", "A1 5+6", "A1 7+8",
"A2 1+2", "A2 3+4", "A2 5+6", "A2 7+8", "A2 1+2", "A2 3+4", "A2 5+6", "A2 7+8",
"A3 1+2", "A3 3+4", "A3 5+6", "A3 7+8", "A3 1+2", "A3 3+4", "A3 5+6", "A3 7+8",
"SPDIF", "Analog" "SPDIF", "Analog"
}; };
static char *destinations_df_ds[8] = { static char const *destinations_df_ds[8] = {
"A1 1+2", "A1 3+4", "A1 1+2", "A1 3+4",
"A2 1+2", "A2 3+4", "A2 1+2", "A2 3+4",
"A3 1+2", "A3 3+4", "A3 1+2", "A3 3+4",
"SPDIF", "Analog" "SPDIF", "Analog"
}; };
static char *destinations_h9652_ss[13] = { static char const *destinations_h9652_ss[13] = {
"A1 1+2", "A1 3+4", "A1 5+6", "A1 7+8", "A1 1+2", "A1 3+4", "A1 5+6", "A1 7+8",
"A2 1+2", "A2 3+4", "A2 5+6", "A2 7+8", "A2 1+2", "A2 3+4", "A2 5+6", "A2 7+8",
"A3 1+2", "A3 3+4", "A3 5+6", "A3 7+8", "A3 1+2", "A3 3+4", "A3 5+6", "A3 7+8",
"SPDIF" "SPDIF"
}; };
static char *destinations_h9652_ds[7] = { static char const *destinations_h9652_ds[7] = {
"A1 1+2", "A1 3+4", "A1 1+2", "A1 3+4",
"A2 1+2", "A2 3+4", "A2 1+2", "A2 3+4",
"A3 1+2", "A3 3+4", "A3 1+2", "A3 3+4",
"SPDIF" "SPDIF"
}; };
static char *destinations_h9632_ss[8] = { static char const *destinations_h9632_ss[8] = {
"A 1+2", "A 3+4", "A 5+6", "A 7+8", "A 1+2", "A 3+4", "A 5+6", "A 7+8",
"SPDIF", "AN 1+2", "AN 3+4", "AN 5+6" "SPDIF", "AN 1+2", "AN 3+4", "AN 5+6"
}; };
static char *destinations_h9632_ds[6] = { static char const *destinations_h9632_ds[6] = {
"A 1+2", "A 3+4", "A 1+2", "A 3+4",
"SPDIF", "AN 1+2", "AN 3+4", "AN 5+6" "SPDIF", "AN 1+2", "AN 3+4", "AN 5+6"
}; };
static char *destinations_h9632_qs[4] = { static char const *destinations_h9632_qs[4] = {
"SPDIF", "AN 1+2", "AN 3+4", "AN 5+6" "SPDIF", "AN 1+2", "AN 3+4", "AN 5+6"
}; };

View file

@ -39,7 +39,7 @@ class HDSPMixerIOMixer;
class HDSPMixerSelector:public Fl_Menu_ class HDSPMixerSelector:public Fl_Menu_
{ {
private: private:
char **destinations; char const **destinations;
HDSPMixerWindow *basew; HDSPMixerWindow *basew;
public: public:
int max_dest; int max_dest;

View file

@ -91,7 +91,7 @@ static void rmsplus3_cb(Fl_Widget *widget, void *arg)
} }
HDSPMixerSetup::HDSPMixerSetup(int w, int h, char *label, HDSPMixerWindow *win):Fl_Double_Window(w, h, label) HDSPMixerSetup::HDSPMixerSetup(int w, int h, char const *label, HDSPMixerWindow *win):Fl_Double_Window(w, h, label)
{ {
basew = win; basew = win;
plm = new Fl_Group(10, 25, 380, 60, "Peak Level Meters"); plm = new Fl_Group(10, 25, 380, 60, "Peak Level Meters");

View file

@ -54,7 +54,7 @@ public:
int level_val; int level_val;
int numbers_val; int numbers_val;
int rmsplus3_val; int rmsplus3_val;
HDSPMixerSetup(int w, int h, char *label, HDSPMixerWindow *win); HDSPMixerSetup(int w, int h, char const *label, HDSPMixerWindow *win);
HDSPMixerWindow *basew; HDSPMixerWindow *basew;
void updateValues(); void updateValues();
}; };

View file

@ -21,44 +21,44 @@
#ifndef pixmaps_H #ifndef pixmaps_H
#define pixmaps_H #define pixmaps_H
extern char * Slider1_xpm[]; extern char const * Slider1_xpm[];
extern char * Slider2_xpm[]; extern char const * Slider2_xpm[];
extern char * b_blank_xpm[]; extern char const * b_blank_xpm[];
extern char * b_card1_xpm[]; extern char const * b_card1_xpm[];
extern char * b_card2_xpm[]; extern char const * b_card2_xpm[];
extern char * b_card3_xpm[]; extern char const * b_card3_xpm[];
extern char * b_mute_xpm[]; extern char const * b_mute_xpm[];
extern char * b_pre1_xpm[]; extern char const * b_pre1_xpm[];
extern char * b_pre2_xpm[]; extern char const * b_pre2_xpm[];
extern char * b_pre3_xpm[]; extern char const * b_pre3_xpm[];
extern char * b_pre4_xpm[]; extern char const * b_pre4_xpm[];
extern char * b_pre5_xpm[]; extern char const * b_pre5_xpm[];
extern char * b_pre6_xpm[]; extern char const * b_pre6_xpm[];
extern char * b_pre7_xpm[]; extern char const * b_pre7_xpm[];
extern char * b_pre8_xpm[]; extern char const * b_pre8_xpm[];
extern char * b_save_xpm[]; extern char const * b_save_xpm[];
extern char * b_solo_xpm[]; extern char const * b_solo_xpm[];
extern char * buttons_xpm[]; extern char const * buttons_xpm[];
extern char * empty_xpm[]; extern char const * empty_xpm[];
extern char * empty_linux_xpm[]; extern char const * empty_linux_xpm[];
extern char * iomixer_xpm[]; extern char const * iomixer_xpm[];
extern char * level_xpm[]; extern char const * level_xpm[];
extern char * monitor_xpm[]; extern char const * monitor_xpm[];
extern char * mute_xpm[]; extern char const * mute_xpm[];
extern char * output_xpm[]; extern char const * output_xpm[];
extern char * over_xpm[]; extern char const * over_xpm[];
extern char * peak_xpm[]; extern char const * peak_xpm[];
extern char * solo_xpm[]; extern char const * solo_xpm[];
extern char * iomixer_r_xpm[]; extern char const * iomixer_r_xpm[];
extern char * output_r_xpm[]; extern char const * output_r_xpm[];
extern char * matrix_white_xpm[]; extern char const * matrix_white_xpm[];
extern char * matrix_black_xpm[]; extern char const * matrix_black_xpm[];
extern char * matrix_yellow_xpm[]; extern char const * matrix_yellow_xpm[];
extern char * matrix_mute_xpm[]; extern char const * matrix_mute_xpm[];
extern char * matrix_grey_xpm[]; extern char const * matrix_grey_xpm[];
extern char * matrix_grey_l_xpm[]; extern char const * matrix_grey_l_xpm[];
extern char * matrix_grey_ol_xpm[]; extern char const * matrix_grey_ol_xpm[];
extern char * matrix_grey_o_xpm[]; extern char const * matrix_grey_o_xpm[];
#endif #endif