hiro/openAV-Luppp
1
0
Fork 0
mirror of https://github.com/vale981/openAV-Luppp synced 2025-03-05 09:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some tweaks.

Browse source
This commit is contained in:
Valentin Boettcher 2018-04-05 19:37:26 +02:00
parent da8c6286fb
commit c9349b4dcc
3 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/avtk/clipselector.cxx
View file

@ -18,7 +18,6 @@
#include "clipselector.hxx" #include "clipselector.hxx"
#include <stdio.h>
#include <unistd.h> #include <unistd.h>
#pragma GCC diagnostic ignored "-Wmissing-field-initializers" #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
@ -219,8 +218,9 @@ void ClipSelector::draw()
bool toRecord = clips[i].getBeatsToRecord() == -1; bool toRecord = clips[i].getBeatsToRecord() == -1;
if(strlen(bars)) { if(strlen(bars)) {
cairo_move_to( cr, x + clipWidth - 5 - getCairoTextWith(cr, bars), drawY + textHeight - 8);
cairo_set_source_rgba( cr, 255 / 255.f, (toRecord) ? 255 / 255.f : 0 , 255 / 255.f , 0.9 ); cairo_set_source_rgba( cr, 255 / 255.f, (toRecord) ? 255 / 255.f : 0 , 255 / 255.f , 0.9 );
cairo_move_to( cr, x + clipWidth - 5 - getCairoTextWith(cr, bars), drawY + textHeight - 8);
cairo_set_font_size( cr, 11 ); cairo_set_font_size( cr, 11 );
cairo_show_text( cr, bars); cairo_show_text( cr, bars);
@ -239,6 +239,10 @@ void ClipSelector::draw()
// trim the names // trim the names
while(getCairoTextWith(cr, tmp.c_str()) > clipWidth - (clipHeight + 15 + beatLen)){ while(getCairoTextWith(cr, tmp.c_str()) > clipWidth - (clipHeight + 15 + beatLen)){
if(tmp.length() < 4){
tmp = "";
break;
}
tmp = tmp.substr(0, tmp.length() - 4); tmp = tmp.substr(0, tmp.length() - 4);
tmp += "…"; tmp += "…";
} }
@ -274,13 +278,18 @@ void ClipSelector::resize(int X, int Y, int W, int H)
void setRecordBarsCb(Fl_Widget *w, void* data) void setRecordBarsCb(Fl_Widget *w, void* data)
{ {
if(!w || !data)
return;
ClipSelector *track = (ClipSelector*)w; ClipSelector *track = (ClipSelector*)w;
long bars = (long)data; long bars = (long)data;
if(bars == -2){ if(bars == -2){
const char* answer = fl_input("Enter a custom number: "); const char* answer = fl_input("Enter a custom number: ");
if(!answer) bars = atoi(answer);
if(!answer || bars <= 0|| bars > MAX_BARS) {
bars = -1; bars = -1;
else fl_message("Invalid Input. You may enter a number smaller than %i!", MAX_BARS);
} else
bars = atoi(answer); bars = atoi(answer);
} }
@ -351,14 +360,15 @@ int ClipSelector::handle(int event)
RECORD_LENGTH_MENU_ITEM(32), RECORD_LENGTH_MENU_ITEM(32),
RECORD_LENGTH_MENU_ITEM(64), RECORD_LENGTH_MENU_ITEM(64),
{0}, {0},
{ "Bars to record", 0, 0, 0, FL_SUBMENU | FL_MENU_DIVIDER }, { "Bars to record", 0, 0, 0, FL_SUBMENU | FL_MENU_DIVIDER},
RECORD_BARS_MENU_ITEM(1), RECORD_BARS_MENU_ITEM(1),
RECORD_BARS_MENU_ITEM(2), RECORD_BARS_MENU_ITEM(2),
RECORD_BARS_MENU_ITEM(4), RECORD_BARS_MENU_ITEM(4),
RECORD_BARS_MENU_ITEM(6), RECORD_BARS_MENU_ITEM(6),
RECORD_BARS_MENU_ITEM(8), RECORD_BARS_MENU_ITEM(8),
{"Endless", 0, setRecordBarsCb, (void*)-1, FL_MENU_DIVIDER | (clips[clipNum].getBeatsToRecord() < 0) ? FL_ACTIVATE : 0 }, {"Endless", 0, setRecordBarsCb, (void*)-1, FL_MENU_DIVIDER | (clips[clipNum].getBeatsToRecord() <= 0) ? FL_ACTIVATE : 0
{"Custom", 0, setRecordBarsCb, (void*)-2}, | empty ? 0 : FL_MENU_INACTIVE},
{"Custom", 0, setRecordBarsCb, (void*)-2, empty ? 0 : FL_MENU_INACTIVE},
{0}, {0},
//{ "Record" }, //{ "Record" },
{ "Use as tempo" }, { "Use as tempo" },
@ -454,9 +464,13 @@ void ClipState::setBeats(int numBeats, bool isBeatsToRecord)
if(numBeats > 0) { if(numBeats > 0) {
beatsText = std::to_string(numBeats); beatsText = std::to_string(numBeats);
barsText = std::to_string(numBeats/4); barsText = std::to_string(numBeats/4);
if(isBeatsToRecord){
beatsToRecord = numBeats;
} else {
beats = numBeats; beats = numBeats;
if(numBeats <= 0)
beatsToRecord = (isBeatsToRecord) ? numBeats : -1; beatsToRecord = -1;
}
} }
else else
barsText = beatsText = std::string(""); barsText = beatsText = std::string("");

4
src/avtk/clipselector.hxx
View file

@ -85,8 +85,8 @@ private:
std::string beatsText; std::string beatsText;
std::string barsText; std::string barsText;
int beatsToRecord; int beatsToRecord = -1;
int beats; int beats = 0;
}; };
class ClipSelector : public Fl_Button class ClipSelector : public Fl_Button

1
src/config.hxx
View file

@ -65,6 +65,7 @@
#define LUPPP_RETURN_WARNING 1 #define LUPPP_RETURN_WARNING 1
#define LUPPP_RETURN_ERROR 2 #define LUPPP_RETURN_ERROR 2
#define MAX_BARS 100
/// debug.hxx for printing convienience /// debug.hxx for printing convienience
#include "debug.hxx" #include "debug.hxx"