zynaddsubfx

ZynAddSubFX open source synthesizer
Log | Files | Refs | Submodules | LICENSE

commit bcd41a1e3f6e19697591e4a1d63a933e03874385
parent 080289bc32f48dac8b847265b655523b9597cfa6
Author: fundamental <mark.d.mccurry@gmail.com>
Date:   Mon, 22 Aug 2011 13:11:18 -0400

FLTK: quieting down some warnings

Diffstat:
Msrc/UI/BankUI.fl | 12+++++++-----
Msrc/UI/OscilGenUI.fl | 9++++++---
Msrc/UI/PresetsUI.fl | 13++++++++-----
Msrc/UI/VirKeyboard.fl | 6+++---
4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/UI/BankUI.fl b/src/UI/BankUI.fl @@ -1,8 +1,9 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0107 +version 1.0110 header_name {.h} code_name {.cc} -decl {//Copyright (c) 2002-2005 Nasca Octavian Paul} {} +decl {//Copyright (c) 2002-2005 Nasca Octavian Paul} {selected +} decl {//License: GNU GPL version 2 or later} {} @@ -32,7 +33,9 @@ decl {\#include "../Misc/Config.h"} {public class BankProcess_ {} { Function {process()} {open return_type {virtual void} - } {code{;}} + } { + code {;} {} + } decl {Bank *bank;} {public } } @@ -88,8 +91,7 @@ if (*nselected==nslot) color(6); -copy_label(bank->getnamenumbered(nslot).c_str());} {selected - } +copy_label(bank->getnamenumbered(nslot).c_str());} {} } decl {int *what,*whatslot,nslot,highlight, *nselected;} {} decl {void (BankProcess_:: *fnc)(void);} {} diff --git a/src/UI/OscilGenUI.fl b/src/UI/OscilGenUI.fl @@ -2,7 +2,8 @@ version 1.0110 header_name {.h} code_name {.cc} -decl {//Copyright (c) 2002-2005 Nasca Octavian Paul} {} +decl {//Copyright (c) 2002-2005 Nasca Octavian Paul} {selected +} decl {//License: GNU GPL version 2 or later} {} @@ -128,7 +129,9 @@ delete [] spc;} {} class PSlider {: {public Fl_Slider} } { - Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} {code{;}} + Function {PSlider(int x,int y, int w, int h, const char *label=0):Fl_Slider(x,y,w,h,label)} {} { + code {;} {} + } Function {handle(int event)} {return_type int } { code {int X=x(),Y=y(),W=w(),H=h(); @@ -1026,7 +1029,7 @@ pthread_mutex_lock(&master->mutex); pthread_mutex_unlock(&master->mutex); redrawoscil(); -refresh();} selected +refresh();} xywh {670 525 55 15} box THIN_UP_BOX labelfont 1 labelsize 11 } Fl_Button {} { diff --git a/src/UI/PresetsUI.fl b/src/UI/PresetsUI.fl @@ -2,7 +2,7 @@ version 1.0110 header_name {.h} code_name {.cc} -decl {\#include <FL/fl_ask.H>} {public +decl {\#include <FL/fl_ask.H>} {selected public } decl {\#include <stdio.h>} {public @@ -18,9 +18,13 @@ decl {\#include "../Params/Presets.h"} {public class PresetsUI_ {} { Function {refresh()} {open return_type {virtual void} - } {code{;}} + } { + code {;} {} + } Function {~PresetsUI_()} {open return_type virtual - } {code{;}} + } { + code {;} {} + } } class PresetsUI {} { @@ -195,8 +199,7 @@ for (unsigned int i=0;i<presetsstore.presets.size();i++){ continue; copybrowse->add(name.c_str()); pastebrowse->add(name.c_str()); -};} {selected - } +};} {} } decl {Presets *p;} {public } diff --git a/src/UI/VirKeyboard.fl b/src/UI/VirKeyboard.fl @@ -1,12 +1,12 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0300 +version 1.0110 header_name {.h} code_name {.cc} decl {//Copyright (c) 2002-2005 Nasca Octavian Paul} {} decl {//License: GNU GPL version 2 or later} {} -decl {\#include <stdlib.h>} {public +decl {\#include <stdlib.h>} {selected public } decl {\#include <FL/fl_draw.H>} {public @@ -385,7 +385,7 @@ pitchwheelroller->do_callback();} } Fl_Dial {} { label Vrnd - callback {virkeys->rndvelocity=(int) o->value();} selected + callback {virkeys->rndvelocity=(int) o->value();} tooltip {Velocity Randomness} xywh {205 105 20 20} box ROUND_UP_BOX labelsize 10 align 129 maximum 127 step 1 code0 {o->value(virkeys->rndvelocity);} class WidgetPDial