From a149c94423180a88f3989526d7340c06c88e355e Mon Sep 17 00:00:00 2001 From: Valentin Boettcher Date: Thu, 5 Apr 2018 22:54:41 +0200 Subject: [PATCH] Some glitches fixed. --- src/avtk/clipselector.cxx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/avtk/clipselector.cxx b/src/avtk/clipselector.cxx index a2d3e53..f04d4ec 100644 --- a/src/avtk/clipselector.cxx +++ b/src/avtk/clipselector.cxx @@ -23,7 +23,7 @@ #pragma GCC diagnostic ignored "-Wmissing-field-initializers" #include "../gui.hxx" -#define RECORD_BARS_MENU_ITEM(num) { #num, 0, setRecordBarsCb, (void*)num, FL_MENU_RADIO | ((clips[clipNum].getBeatsToRecord() == num*4) ? FL_ACTIVATE : 0 | empty ? 0 : FL_MENU_INACTIVE) } +#define RECORD_BARS_MENU_ITEM(num) { #num, 0, setRecordBarsCb, (void*)num, FL_MENU_RADIO | ((clips[clipNum].getBeatsToRecord() == num*4) ? FL_MENU_VALUE : 0) | (empty ? 0 : FL_MENU_INACTIVE) } #define RECORD_LENGTH_MENU_ITEM(num) {#num, 0, setLengthCb, (void*)num, empty ? FL_MENU_INACTIVE : 0} extern Gui* gui; @@ -289,14 +289,14 @@ void setRecordBarsCb(Fl_Widget *w, void* data) const char* answer = fl_input("Enter a custom number: "); if(!answer) { bars = -1; - fl_message("Please enter value between 1 and %.", MAX_BARS); + fl_message("Please enter value between 1 and %i.", MAX_BARS); } else bars = atoi(answer); } - if(bars <= 0 || bars > MAX_BARS) { + if(bars > MAX_BARS) { bars = -1; - fl_message("Please enter value between 1 and %.", MAX_BARS); + fl_message("Please enter value between 1 and %i.", MAX_BARS); } EventLooperBarsToRecord e(track->ID, track->getLastClipNum(), bars); @@ -372,10 +372,9 @@ int ClipSelector::handle(int event) RECORD_BARS_MENU_ITEM(4), RECORD_BARS_MENU_ITEM(6), RECORD_BARS_MENU_ITEM(8), - {"Endless", 0, setRecordBarsCb, (void*)-1, FL_MENU_DIVIDER | FL_MENU_RADIO | ((clips[clipNum].getBeatsToRecord() <= 0) ? FL_ACTIVATE : 0) - | empty ? 0 : FL_MENU_INACTIVE}, + {"Endless", 0, setRecordBarsCb, (void*)-1, FL_MENU_DIVIDER | FL_MENU_RADIO | ((clips[clipNum].getBeatsToRecord() <= 0) ? FL_MENU_VALUE : 0) | (empty ? 0 : FL_MENU_INACTIVE)}, {"Custom", 0, setRecordBarsCb, (void*)-2, empty ? 0 : FL_MENU_INACTIVE}, - {0}, + {0}, //{ "Record" }, { "Use as tempo" }, { "Rename", 0, 0, 0, FL_MENU_DIVIDER},