From 1245fbd2a8d60bab7b16b8a1d3c0122fee72f53f Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 00:57:38 +0200 Subject: Nuke trailing whitespace. Signed-off-by: Ralf Baechle --- hdlcutil/fl/xfhdlcchpar_main.cxx | 4 ++-- hdlcutil/fl/xfhdlcst_main.cxx | 8 ++++---- hdlcutil/fl/xfsmdiag_main.cxx | 18 +++++++++--------- hdlcutil/fl/xfsmmixer_main.cxx | 20 ++++++++++---------- 4 files changed, 25 insertions(+), 25 deletions(-) (limited to 'hdlcutil/fl') diff --git a/hdlcutil/fl/xfhdlcchpar_main.cxx b/hdlcutil/fl/xfhdlcchpar_main.cxx index 8ebee3d..7078d36 100644 --- a/hdlcutil/fl/xfhdlcchpar_main.cxx +++ b/hdlcutil/fl/xfhdlcchpar_main.cxx @@ -58,7 +58,7 @@ void cb_update(Fl_Widget *widget, void *udata) cp.ppersist = (int)(ppersist->value()); cp.fulldup = !!fulldup->value(); ret = hdrvc_set_channel_access_param(cp); - if (ret < 0) + if (ret < 0) perror("hdrvc_set_channel_access_param"); } @@ -71,7 +71,7 @@ void cb_quit(Fl_Button *, long) /* ---------------------------------------------------------------------- */ -static const char *usage_str = +static const char *usage_str = "[-i smif]\n" " -i: specify the name of the baycom kernel driver interface\n\n"; diff --git a/hdlcutil/fl/xfhdlcst_main.cxx b/hdlcutil/fl/xfhdlcst_main.cxx index a17e546..4542fe1 100644 --- a/hdlcutil/fl/xfhdlcst_main.cxx +++ b/hdlcutil/fl/xfhdlcst_main.cxx @@ -62,7 +62,7 @@ void cb_timer(void *) /* ---------------------------------------------------------------------- */ -static const char *usage_str = +static const char *usage_str = "[-i smif]\n" " -i: specify the name of the baycom kernel driver interface\n\n"; @@ -112,13 +112,13 @@ int main(int argc, char *argv[]) if (ret < 0) { perror("hdrvc_get_mode_name"); modename->hide(); - } else + } else modename->value(name); ret = hdrvc_get_driver_name(name, sizeof(name)); if (ret < 0) { perror("hdrvc_get_driver_name"); drivername->hide(); - } else + } else drivername->value(name); /* * check for soundmodem driver @@ -171,7 +171,7 @@ int main(int argc, char *argv[]) demodcyc->value(buf); sprintf(buf, "%d", smi.data.dbg.dma_residue); dmares->value(buf); - } + } } exit (0); } diff --git a/hdlcutil/fl/xfsmdiag_main.cxx b/hdlcutil/fl/xfsmdiag_main.cxx index 695d98f..1fd0dd8 100644 --- a/hdlcutil/fl/xfsmdiag_main.cxx +++ b/hdlcutil/fl/xfsmdiag_main.cxx @@ -58,7 +58,7 @@ static unsigned int drawflags = 0; /* ---------------------------------------------------------------------- */ scope::scope(int x, int y, int w, int h, const char *l) - : Fl_Box(x, y, w, h, l) + : Fl_Box(x, y, w, h, l) { box(FL_DOWN_FRAME); X = x+3; @@ -205,8 +205,8 @@ void scope::drawdata(short data[], int len, int xm) XGCValues gcv; mode(); - if (!pixmalloc || (drawmode != HDRVC_DIAGMODE_CONSTELLATION && - drawmode != HDRVC_DIAGMODE_INPUT && + if (!pixmalloc || (drawmode != HDRVC_DIAGMODE_CONSTELLATION && + drawmode != HDRVC_DIAGMODE_INPUT && drawmode != HDRVC_DIAGMODE_DEMOD)) return; gcv.line_width = 1; @@ -268,7 +268,7 @@ void cb_mode(Fl_Check_Button *, long which) case 256: drawflags ^= HDRVC_DIAGFLAG_DCDGATE; break; - + case 0: scdisp->mode(HDRVC_DIAGMODE_OFF); drawflags = 0; @@ -298,7 +298,7 @@ void cb_quit(Fl_Button *, long) { struct sm_diag_data diag; short data; - + diag.mode = HDRVC_DIAGMODE_OFF; diag.flags = 0; diag.datalen = 1; @@ -330,7 +330,7 @@ void cb_timer(void *) /* * draw scope */ - if ((ret = hdrvc_diag2(scdisp->mode(), drawflags, data, sizeof(data) / sizeof(short), + if ((ret = hdrvc_diag2(scdisp->mode(), drawflags, data, sizeof(data) / sizeof(short), &samplesperbit)) < 0) { perror("hdrvc_diag2"); exit(1); @@ -341,7 +341,7 @@ void cb_timer(void *) /* ---------------------------------------------------------------------- */ -static const char *usage_str = +static const char *usage_str = "[-i smif]\n" " -i: specify the name of the baycom kernel driver interface\n\n"; @@ -396,13 +396,13 @@ int main(int argc, char *argv[]) if (ret < 0) { perror("hdrvc_get_mode_name"); modename->hide(); - } else + } else modename->value(name); ret = hdrvc_get_driver_name(name, sizeof(name)); if (ret < 0) { perror("hdrvc_get_driver_name"); drivername->hide(); - } else + } else drivername->value(name); Fl::add_timeout(0.1, cb_timer); scopewindow->show(); diff --git a/hdlcutil/fl/xfsmmixer_main.cxx b/hdlcutil/fl/xfsmmixer_main.cxx index 5569e7c..83774a0 100644 --- a/hdlcutil/fl/xfsmmixer_main.cxx +++ b/hdlcutil/fl/xfsmmixer_main.cxx @@ -52,7 +52,7 @@ static int do_mix_ioctl(int cmd, struct sm_mixer_data *mixdat) { struct sm_ioctl par; int i; - + par.cmd = cmd; par.data.mix = *mixdat; i = hdrvc_sm_ioctl(cmd, &par); @@ -120,7 +120,7 @@ void update_ad1848(Fl_Widget *widget, void *udata) mdata |= 0x20; } mval *= 0.666666; - if (mval > 15) + if (mval > 15) mval = 15; mdata |= (int)mval; set_mixer_reg(0x00, mdata); @@ -139,7 +139,7 @@ void update_ad1848(Fl_Widget *widget, void *udata) mdata |= 0x20; } mval *= 0.666666; - if (mval > 15) + if (mval > 15) mval = 15; mdata |= (int)mval; set_mixer_reg(0x01, mdata); @@ -150,12 +150,12 @@ void update_ad1848(Fl_Widget *widget, void *udata) mval = ad1848_outl->value(); if (mval < -95) set_mixer_reg(0x06, 0x80); - else + else set_mixer_reg(0x06, (unsigned char)(mval * (-0.66666666))); mval = ad1848_outr->value(); if (mval < -95) set_mixer_reg(0x07, 0x80); - else + else set_mixer_reg(0x07, (unsigned char)(mval * (-0.66666666))); set_mixer_reg(0x0d, 0x00); } @@ -272,7 +272,7 @@ void update_ct1745(Fl_Widget *widget, void *udata) if (ct1745_srcl_midil->value()) mdata |= 0x40; if (ct1745_srcl_midir->value()) - mdata |= 0x20; + mdata |= 0x20; set_mixer_reg(0x3d, mdata); /* input sources left */ mdata = 0; if (ct1745_srcr_mic->value()) @@ -288,7 +288,7 @@ void update_ct1745(Fl_Widget *widget, void *udata) if (ct1745_srcr_midil->value()) mdata |= 0x40; if (ct1745_srcr_midir->value()) - mdata |= 0x20; + mdata |= 0x20; set_mixer_reg(0x3e, mdata); /* input sources right*/ } @@ -301,7 +301,7 @@ void cb_quit(Fl_Button *, long) /* ---------------------------------------------------------------------- */ -static const char *usage_str = +static const char *usage_str = "[-i smif]\n" " -i: specify the name of the soundmodem kernel driver interface\n\n"; @@ -312,7 +312,7 @@ int main(int argc, char *argv[]) int c, i; struct sm_mixer_data mixdat; unsigned char mdata; - + progname = *argv; printf("%s: Version 0.3; (C) 1996,1997,2000 by Thomas Sailer HB9JNX/AE4WA\n", progname); hdrvc_args(&argc, argv, "sm0"); @@ -352,7 +352,7 @@ int main(int argc, char *argv[]) case SM_MIXER_AD1848: case SM_MIXER_CRYSTAL: - printf("Mixer device: %s\n", mixdevice == SM_MIXER_CRYSTAL ? + printf("Mixer device: %s\n", mixdevice == SM_MIXER_CRYSTAL ? "CS423x" : "AD1848"); create_form_ad1848(); mdata = get_mixer_reg(0); -- cgit v1.2.3 From 5feb3d651dbd1b096a26963bd1dffcfe0a5f9eea Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 01:42:05 +0200 Subject: Remove useless initializations to 0 or NULL. They only inflate the .data section of the binary. Initializations to FALSE are still left to do. Signed-off-by: Ralf Baechle --- hdlcutil/fl/xfsmdiag_main.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hdlcutil/fl') diff --git a/hdlcutil/fl/xfsmdiag_main.cxx b/hdlcutil/fl/xfsmdiag_main.cxx index 1fd0dd8..2e05c29 100644 --- a/hdlcutil/fl/xfsmdiag_main.cxx +++ b/hdlcutil/fl/xfsmdiag_main.cxx @@ -53,7 +53,7 @@ /* ---------------------------------------------------------------------- */ static char *progname; -static unsigned int drawflags = 0; +static unsigned int drawflags; /* ---------------------------------------------------------------------- */ -- cgit v1.2.3 From 90f6ab2eceada8987fc6e5017ae415eade165c00 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 5 Jun 2013 01:47:40 +0200 Subject: Use tabs for indentation, not spaces. Signed-off-by: Ralf Baechle --- hdlcutil/fl/xfhdlcchpar_main.cxx | 2 +- hdlcutil/fl/xfhdlcst_main.cxx | 2 +- hdlcutil/fl/xfsmdiag.cxx | 40 ++++---- hdlcutil/fl/xfsmdiag_main.cxx | 24 ++--- hdlcutil/fl/xfsmmixer.cxx | 202 +++++++++++++++++++-------------------- hdlcutil/fl/xfsmmixer_main.cxx | 4 +- 6 files changed, 137 insertions(+), 137 deletions(-) (limited to 'hdlcutil/fl') diff --git a/hdlcutil/fl/xfhdlcchpar_main.cxx b/hdlcutil/fl/xfhdlcchpar_main.cxx index 7078d36..4b01138 100644 --- a/hdlcutil/fl/xfhdlcchpar_main.cxx +++ b/hdlcutil/fl/xfhdlcchpar_main.cxx @@ -79,7 +79,7 @@ static const char *usage_str = int main(int argc, char *argv[]) { - int c, i; + int c, i; int ret; struct hdrvc_channel_params cp; diff --git a/hdlcutil/fl/xfhdlcst_main.cxx b/hdlcutil/fl/xfhdlcst_main.cxx index 4542fe1..85a66db 100644 --- a/hdlcutil/fl/xfhdlcst_main.cxx +++ b/hdlcutil/fl/xfhdlcst_main.cxx @@ -70,7 +70,7 @@ static const char *usage_str = int main(int argc, char *argv[]) { - int c, i; + int c, i; int ret; struct hdrvc_channel_state cs; #ifdef HDRVC_KERNEL diff --git a/hdlcutil/fl/xfsmdiag.cxx b/hdlcutil/fl/xfsmdiag.cxx index 84c4bac..7232cfa 100644 --- a/hdlcutil/fl/xfsmdiag.cxx +++ b/hdlcutil/fl/xfsmdiag.cxx @@ -52,36 +52,36 @@ Fl_Window* create_the_forms() { { Fl_Group* o = scopemode = new Fl_Group(550, 10, 140, 130); o->align(FL_ALIGN_CENTER); { Fl_Box* o = new Fl_Box(550, 10, 140, 130); - o->box(FL_DOWN_BOX); + o->box(FL_DOWN_BOX); } { Fl_Check_Button* o = sm_off = new Fl_Check_Button(560, 20, 120, 20, "Off"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)cb_mode, (void*)(0)); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)cb_mode, (void*)(0)); } { Fl_Check_Button* o = sm_input = new Fl_Check_Button(560, 40, 120, 20, "Input"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)cb_mode, (void*)(1)); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)cb_mode, (void*)(1)); } { Fl_Check_Button* o = sm_demod = new Fl_Check_Button(560, 60, 120, 20, "Demodulator"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)cb_mode, (void*)(2)); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)cb_mode, (void*)(2)); } { Fl_Check_Button* o = sm_constell = new Fl_Check_Button(560, 80, 120, 20, "Constellation"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)cb_mode, (void*)(3)); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)cb_mode, (void*)(3)); } { Fl_Check_Button* o = sm_dcd = new Fl_Check_Button(560, 110, 120, 20, "Gated with DCD"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)cb_mode, (void*)(256)); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)cb_mode, (void*)(256)); } o->end(); } diff --git a/hdlcutil/fl/xfsmdiag_main.cxx b/hdlcutil/fl/xfsmdiag_main.cxx index 2e05c29..dce7029 100644 --- a/hdlcutil/fl/xfsmdiag_main.cxx +++ b/hdlcutil/fl/xfsmdiag_main.cxx @@ -94,7 +94,7 @@ void scope::resize(int xx, int yy, int ww, int hh) void scope::draw() { GC gc; - XGCValues gcv; + XGCValues gcv; /* cannot use draw_box(); as it clears the whole window -> flicker */ /* from fl_boxtype.C, fl_down_frame */ @@ -178,17 +178,17 @@ void scope::mode(int dmode) void scope::clear(void) { GC gc; - XGCValues gcv; + XGCValues gcv; if (!pixmalloc) return; gcv.line_width = 1; - gcv.line_style = LineSolid; + gcv.line_style = LineSolid; gcv.fill_style = FillSolid; - gc = XCreateGC(fl_display, pixmap, GCLineWidth | GCLineStyle | GCFillStyle, &gcv); - XSetState(fl_display, gc, col_background, col_background, GXcopy, AllPlanes); + gc = XCreateGC(fl_display, pixmap, GCLineWidth | GCLineStyle | GCFillStyle, &gcv); + XSetState(fl_display, gc, col_background, col_background, GXcopy, AllPlanes); XFillRectangle(fl_display, pixmap, gc, 0, 0, W, H); - XFreeGC(fl_display, gc); + XFreeGC(fl_display, gc); redraw(); } @@ -201,8 +201,8 @@ void scope::clear(void) void scope::drawdata(short data[], int len, int xm) { int cnt; - GC gc; - XGCValues gcv; + GC gc; + XGCValues gcv; mode(); if (!pixmalloc || (drawmode != HDRVC_DIAGMODE_CONSTELLATION && @@ -210,8 +210,8 @@ void scope::drawdata(short data[], int len, int xm) drawmode != HDRVC_DIAGMODE_DEMOD)) return; gcv.line_width = 1; - gcv.line_style = LineSolid; - gc = XCreateGC(fl_display, pixmap, GCLineWidth | GCLineStyle, &gcv); + gcv.line_style = LineSolid; + gc = XCreateGC(fl_display, pixmap, GCLineWidth | GCLineStyle, &gcv); if (drawmode == HDRVC_DIAGMODE_CONSTELLATION) { #define XCOORD(x) ((SHRT_MAX - (int)(x)) * W / USHRT_MAX) #define YCOORD(y) ((SHRT_MAX - (int)(y)) * H / USHRT_MAX) @@ -241,7 +241,7 @@ void scope::drawdata(short data[], int len, int xm) #undef XCOORD #undef YCOORD } - XFreeGC(fl_display, gc); + XFreeGC(fl_display, gc); redraw(); } @@ -349,7 +349,7 @@ static const char *usage_str = int main(int argc, char *argv[]) { - int c, i; + int c, i; int ret; unsigned int ifflags; char name[64]; diff --git a/hdlcutil/fl/xfsmmixer.cxx b/hdlcutil/fl/xfsmmixer.cxx index 57b5306..b5ba9b1 100644 --- a/hdlcutil/fl/xfsmmixer.cxx +++ b/hdlcutil/fl/xfsmmixer.cxx @@ -71,70 +71,70 @@ Fl_Window* create_form_ad1848() { { Fl_Group* o = ad1848_srcr = new Fl_Group(180, 150, 100, 120); o->align(FL_ALIGN_CENTER); { Fl_Box* o = new Fl_Box(180, 150, 100, 120); - o->box(FL_DOWN_BOX); + o->box(FL_DOWN_BOX); } { Fl_Check_Button* o = ad1848_srcr_line = new Fl_Check_Button(190, 180, 60, 20, "Line"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ad1848); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ad1848); } { Fl_Check_Button* o = ad1848_srcr_aux1 = new Fl_Check_Button(190, 200, 60, 20, "Aux1"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ad1848); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ad1848); } { Fl_Check_Button* o = ad1848_srcr_mic = new Fl_Check_Button(190, 220, 60, 20, "Mic"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ad1848); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ad1848); } { Fl_Check_Button* o = ad1848_srcr_dac = new Fl_Check_Button(190, 240, 60, 20, "DAC"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ad1848); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ad1848); } { Fl_Box* o = new Fl_Box(190, 160, 60, 20, "Right source"); - o->box(FL_FLAT_BOX); - o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + o->box(FL_FLAT_BOX); + o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } o->end(); } { Fl_Group* o = ad1848_srcl = new Fl_Group(180, 20, 100, 120); o->align(FL_ALIGN_CENTER); { Fl_Box* o = new Fl_Box(180, 20, 100, 120); - o->box(FL_DOWN_BOX); + o->box(FL_DOWN_BOX); } { Fl_Box* o = new Fl_Box(190, 30, 60, 20, "Left source"); - o->box(FL_FLAT_BOX); - o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + o->box(FL_FLAT_BOX); + o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } { Fl_Check_Button* o = ad1848_srcl_line = new Fl_Check_Button(190, 50, 60, 20, "Line"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ad1848); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ad1848); } { Fl_Check_Button* o = ad1848_srcl_aux1 = new Fl_Check_Button(190, 70, 60, 20, "Aux1"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ad1848); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ad1848); } { Fl_Check_Button* o = ad1848_srcl_mic = new Fl_Check_Button(190, 90, 60, 20, "Mic"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ad1848); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ad1848); } { Fl_Check_Button* o = ad1848_srcl_dac = new Fl_Check_Button(190, 110, 60, 20, "DAC"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ad1848); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ad1848); } o->end(); } @@ -216,29 +216,29 @@ Fl_Window* create_form_ct1345() { { Fl_Group* o = ct1345_src = new Fl_Group(100, 20, 70, 100); o->align(FL_ALIGN_CENTER); { Fl_Box* o = new Fl_Box(100, 20, 70, 100); - o->box(FL_DOWN_BOX); + o->box(FL_DOWN_BOX); } { Fl_Check_Button* o = ct1345_src_mic = new Fl_Check_Button(110, 50, 50, 20, "Mic"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1345); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1345); } { Fl_Check_Button* o = ct1345_src_cd = new Fl_Check_Button(110, 70, 50, 20, "CD"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1345); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1345); } { Fl_Check_Button* o = ct1345_src_line = new Fl_Check_Button(110, 90, 50, 20, "Line"); - o->type(102); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1345); + o->type(102); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1345); } { Fl_Box* o = new Fl_Box(110, 30, 50, 20, "Source"); - o->box(FL_FLAT_BOX); - o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + o->box(FL_FLAT_BOX); + o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } o->end(); } @@ -342,92 +342,92 @@ Fl_Window* create_form_ct1745() { { Fl_Group* o = ct1745_srcl = new Fl_Group(180, 20, 110, 180); o->align(FL_ALIGN_CENTER); { Fl_Box* o = new Fl_Box(180, 20, 110, 180); - o->box(FL_DOWN_BOX); + o->box(FL_DOWN_BOX); } { Fl_Box* o = new Fl_Box(191, 29, 89, 18, "Left source"); - o->box(FL_FLAT_BOX); - o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + o->box(FL_FLAT_BOX); + o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } { Fl_Check_Button* o = ct1745_srcl_mic = new Fl_Check_Button(190, 50, 90, 20, "Mic"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } { Fl_Check_Button* o = ct1745_srcl_cdl = new Fl_Check_Button(190, 70, 90, 20, "CD left"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } { Fl_Check_Button* o = ct1745_srcl_cdr = new Fl_Check_Button(190, 90, 90, 20, "CD right"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } { Fl_Check_Button* o = ct1745_srcl_linel = new Fl_Check_Button(190, 110, 90, 20, "Line left"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } { Fl_Check_Button* o = ct1745_srcl_midil = new Fl_Check_Button(190, 150, 90, 20, "MIDI left"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } { Fl_Check_Button* o = ct1745_srcl_midir = new Fl_Check_Button(190, 170, 90, 20, "MIDI right"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } { Fl_Check_Button* o = ct1745_srcl_liner = new Fl_Check_Button(190, 130, 90, 20, "Line right"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } o->end(); } { Fl_Group* o = ct1745_srcr = new Fl_Group(300, 20, 110, 180); o->align(FL_ALIGN_CENTER); { Fl_Box* o = new Fl_Box(300, 20, 110, 180); - o->box(FL_DOWN_BOX); + o->box(FL_DOWN_BOX); } { Fl_Box* o = new Fl_Box(311, 29, 89, 18, "Right source"); - o->box(FL_FLAT_BOX); - o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); + o->box(FL_FLAT_BOX); + o->align(FL_ALIGN_LEFT|FL_ALIGN_INSIDE); } { Fl_Check_Button* o = ct1745_srcr_mic = new Fl_Check_Button(310, 50, 90, 20, "Mic"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } { Fl_Check_Button* o = ct1745_srcr_cdl = new Fl_Check_Button(310, 70, 90, 20, "CD left"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } { Fl_Check_Button* o = ct1745_srcr_cdr = new Fl_Check_Button(310, 90, 90, 20, "CD right"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } { Fl_Check_Button* o = ct1745_srcr_linel = new Fl_Check_Button(310, 110, 90, 20, "Line left"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } { Fl_Check_Button* o = ct1745_srcr_midil = new Fl_Check_Button(310, 150, 90, 20, "MIDI left"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } { Fl_Check_Button* o = ct1745_srcr_midir = new Fl_Check_Button(310, 170, 90, 20, "MIDI right"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } { Fl_Check_Button* o = ct1745_srcr_liner = new Fl_Check_Button(310, 130, 90, 20, "Line right"); - o->down_box(FL_DIAMOND_DOWN_BOX); - o->selection_color(3); - o->callback((Fl_Callback*)update_ct1745); + o->down_box(FL_DIAMOND_DOWN_BOX); + o->selection_color(3); + o->callback((Fl_Callback*)update_ct1745); } o->end(); } diff --git a/hdlcutil/fl/xfsmmixer_main.cxx b/hdlcutil/fl/xfsmmixer_main.cxx index 83774a0..b33533f 100644 --- a/hdlcutil/fl/xfsmmixer_main.cxx +++ b/hdlcutil/fl/xfsmmixer_main.cxx @@ -50,7 +50,7 @@ static unsigned int mixdevice; static int do_mix_ioctl(int cmd, struct sm_mixer_data *mixdat) { - struct sm_ioctl par; + struct sm_ioctl par; int i; par.cmd = cmd; @@ -309,7 +309,7 @@ static const char *usage_str = int main(int argc, char *argv[]) { - int c, i; + int c, i; struct sm_mixer_data mixdat; unsigned char mdata; -- cgit v1.2.3