zynaddsubfx

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

commit fd48567d6ab8dcbe63634855b9afeb0be78e0547
parent d12adb19675d938cbb97ce22e942eb712e324b88
Author: fundamental <[email protected]>
Date:   Thu, 19 Feb 2015 11:46:16 -0500

Fix 3.7.0 Warnings (Except override Warnings)

Diffstat:
Msrc/Misc/PresetExtractor.cpp | 2+-
Msrc/UI/BankView.cpp | 7-------
Msrc/UI/BankView.h | 1-
Msrc/UI/Connection.cpp | 2+-
Msrc/UI/Fl_Osc_Choice.cpp | 13+------------
Msrc/UI/Fl_Osc_DialF.cpp | 13+------------
Msrc/UI/Fl_Osc_Output.cpp | 2+-
Msrc/UI/Fl_Osc_Slider.H | 1-
Msrc/UI/Fl_Osc_VSlider.H | 3+--
Msrc/UI/Fl_Osc_Value.cpp | 5++++-
Msrc/UI/SUBnoteUI.fl | 2+-
11 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/src/Misc/PresetExtractor.cpp b/src/Misc/PresetExtractor.cpp @@ -41,7 +41,7 @@ class Capture:public rtosc::RtData virtual void reply(const char *path, const char *args, ...) { printf("reply(%p)(%s)(%s)...\n", msgbuf, path, args); - printf("size is %d\n", sizeof(msgbuf)); + //printf("size is %d\n", sizeof(msgbuf)); va_list va; va_start(va,args); char *buffer = msgbuf; diff --git a/src/UI/BankView.cpp b/src/UI/BankView.cpp @@ -150,13 +150,6 @@ static int modeCb(const char *label) return -1; } -static void control_widget_cb(Fl_Light_Button *button, void *bvc_) -{ - BankViewControls *bvc = (BankViewControls*)bvc_; - bvc->mode(modeCb(button->label())); - //TODO removeselection? -} - BankViewControls::BankViewControls(int x, int y, int w, int h, const char *label) :Fl_Group(x,y,w,h,label) { diff --git a/src/UI/BankView.h b/src/UI/BankView.h @@ -88,7 +88,6 @@ class BankView: public Fl_Group, public Fl_Osc_Widget std::string loc; //XXX TODO locked banks... - int mode; int nselected; int *npart; }; diff --git a/src/UI/Connection.cpp b/src/UI/Connection.cpp @@ -104,7 +104,7 @@ static rtosc::Ports ports = { ui->showUI(); } END BEGIN("alert:s") { - fl_alert(a0.s); + fl_alert("%s",a0.s); } END BEGIN("session-type:s") { if(strcmp(a0.s,"LASH")) diff --git a/src/UI/Fl_Osc_Choice.cpp b/src/UI/Fl_Osc_Choice.cpp @@ -7,18 +7,7 @@ #include <cassert> #include <sstream> -static Fl_Osc_Pane *fetch_osc_pane(Fl_Widget *w) -{ - if(!w) - return NULL; - - Fl_Osc_Pane *pane = dynamic_cast<Fl_Osc_Pane*>(w->parent()); - if(pane) - return pane; - return fetch_osc_pane(w->parent()); -} - -static void callback_fn(Fl_Widget *w, void *v) +static void callback_fn(Fl_Widget *w, void *) { ((Fl_Osc_Choice*)w)->cb(); } diff --git a/src/UI/Fl_Osc_DialF.cpp b/src/UI/Fl_Osc_DialF.cpp @@ -18,22 +18,11 @@ B string_cast(const A &a) return b; } -static void callback_fn(Fl_Widget *w, void *v) +static void callback_fn(Fl_Widget *w, void *) { ((Fl_Osc_DialF*)w)->cb(); } -static Fl_Osc_Pane *fetch_osc_pane(Fl_Widget *w) -{ - if(!w) - return NULL; - - Fl_Osc_Pane *pane = dynamic_cast<Fl_Osc_Pane*>(w->parent()); - if(pane) - return pane; - return fetch_osc_pane(w->parent()); -} - Fl_Osc_DialF::Fl_Osc_DialF(int X, int Y, int W, int H, const char *label) :WidgetPDial(X,Y,W,H, label), Fl_Osc_Widget() { diff --git a/src/UI/Fl_Osc_Output.cpp b/src/UI/Fl_Osc_Output.cpp @@ -5,7 +5,7 @@ #include <cassert> #include <sstream> -static void callback_fn(Fl_Widget *w, void *v) +static void callback_fn(Fl_Widget *w, void *) { ((Fl_Osc_Output*)w)->cb(); } diff --git a/src/UI/Fl_Osc_Slider.H b/src/UI/Fl_Osc_Slider.H @@ -24,7 +24,6 @@ class Fl_Osc_Slider:public Fl_Slider, public Fl_Osc_Widget void cb(void); static void _cb(Fl_Widget *w, void *); private: - double real_value; char osc_type; std::pair<Fl_Callback*, void*> cb_data; }; diff --git a/src/UI/Fl_Osc_VSlider.H b/src/UI/Fl_Osc_VSlider.H @@ -13,7 +13,7 @@ class Fl_Osc_VSlider:public Fl_Value_Slider, public Fl_Osc_Widget void OSC_value(char); void OSC_value(int); void OSC_value(float); - void init(std::string, char type = 'i'); + void init(std::string, char type = 'i'); //Refetch parameter information void update(void); @@ -22,7 +22,6 @@ class Fl_Osc_VSlider:public Fl_Value_Slider, public Fl_Osc_Widget void cb(void); static void _cb(Fl_Widget *w, void *); private: - double real_value; char osc_type; std::pair<Fl_Callback*, void*> cb_data; }; diff --git a/src/UI/Fl_Osc_Value.cpp b/src/UI/Fl_Osc_Value.cpp @@ -9,4 +9,7 @@ Fl_Osc_Value::~Fl_Osc_Value(void) {} void Fl_Osc_Value::init(const char *path) -{} +{ + (void)path; +} + diff --git a/src/UI/SUBnoteUI.fl b/src/UI/SUBnoteUI.fl @@ -73,7 +73,7 @@ return(1);} {} } Function {rebase(std::string new_base)} {return_type void } { - code {} {} + code {(void) new_base;} {} } Function {update()} {return_type void } {