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

Added controls for send/return to gui (non-functional)

Browse source
This commit is contained in:
Gerald 2016-11-10 23:13:37 +01:00 • committed by Harry van Haaren
parent 8fd3e1e1bf
commit 10d0d48285
3 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/gtrack.cxx
View file

@ -28,6 +28,7 @@ static void gtrack_xsideDial_cb(Fl_Widget *w, void *data);
static void gtrack_sendDial_cb(Fl_Widget *w, void *data); static void gtrack_sendDial_cb(Fl_Widget *w, void *data);
static void gtrack_send_cb(Fl_Widget *w, void *data); static void gtrack_send_cb(Fl_Widget *w, void *data);
static void gtrack_record_cb(Fl_Widget *w, void *data); static void gtrack_record_cb(Fl_Widget *w, void *data);
static void gtrack_jacksendactivate_cb(Fl_Widget* w,void *data);
GTrack::GTrack(int x, int y, int w, int h, const char* l ) : GTrack::GTrack(int x, int y, int w, int h, const char* l ) :
@ -37,18 +38,22 @@ GTrack::GTrack(int x, int y, int w, int h, const char* l ) :
radial( x+5, y+ 26, 100, 100, ""), radial( x+5, y+ 26, 100, 100, ""),
clipSel(x + 5, y + 26 + 102, 100, 294,""), clipSel(x + 5, y + 26 + 102, 100, 294,""),
jackSendBox(x+5, y+422, 100, 45, ""),
volBox(x+5, y+422, 100, 172, ""), jackSendDial(x+21, y+422+8, 30,30, ""),
volume(x+66, y +425, 36, 166, ""), jackSendActivate(x+66, y+422+11, 36,25, "FX"),
volBox(x+5, y+422+50, 100, 172, ""),
volume(x+66, y +425+50, 36, 166, ""),
sendDial (x+21, y +430 + 0, 30, 30, ""), sendDial (x+21, y +430 + 50, 30, 30, ""),
sendActive (x+11, y +430 + 32, 50, 25, "Snd"), sendActive (x+11, y +430 + 82, 50, 25, "Snd"),
xsideDial (x+21, y +430 + 69, 30, 30, ""), xsideDial (x+21, y +430 + 69+50, 30, 30, ""),
keyActive (x+11, y +430 + 101, 50, 25, "Key"), keyActive (x+11, y +430 + 151, 50, 25, "Key"),
recordActive (x+11, y +430 + 132, 50, 25, "XRec") recordActive (x+11, y +430 + 182, 50, 25, "XRec")
{ {
ID = privateID++; ID = privateID++;
@ -68,7 +73,10 @@ GTrack::GTrack(int x, int y, int w, int h, const char* l ) :
recordActive.callback( gtrack_record_cb, this ); recordActive.callback( gtrack_record_cb, this );
volume.callback( gtrack_vol_cb, this ); volume.callback( gtrack_vol_cb, this );
jackSendActivate.setColor( 0, 0.6, 1 );
jackSendActivate.callback(gtrack_jacksendactivate_cb,this);
jackSendDial.align(FL_ALIGN_INSIDE);
//volBox.color( fl_rgb_color( 0,0,0 ) ); //volBox.color( fl_rgb_color( 0,0,0 ) );
end(); // close the group end(); // close the group
@ -171,3 +179,11 @@ void gtrack_record_cb(Fl_Widget *w, void *data)
//printf("track %i record Arm %s\n", track->ID, b ? "off" : "on" ); //printf("track %i record Arm %s\n", track->ID, b ? "off" : "on" );
} }
void gtrack_jacksendactivate_cb(Fl_Widget* w,void *data)
{
GTrack* track = (GTrack*) data;
Avtk::LightButton* d = (Avtk::LightButton*)w;
bool b=d->value();
d->value(!b);
}

6
src/gtrack.hxx
View file

@ -78,12 +78,16 @@ class GTrack : public Fl_Group
Avtk::RadialStatus radial; Avtk::RadialStatus radial;
Avtk::ClipSelector clipSel; Avtk::ClipSelector clipSel;
Avtk::Box volBox; Avtk::Box volBox;
Avtk::Volume volume; Avtk::Volume volume;
private: private:
Avtk::Box jackSendBox;
Avtk::Dial jackSendDial;
Avtk::LightButton jackSendActivate;
Avtk::Dial sendDial; Avtk::Dial sendDial;
Avtk::LightButton sendActive; Avtk::LightButton sendActive;

4
src/gui.cxx
View file

@ -362,7 +362,7 @@ static int cb_nsm_save ( char **out_msg, void *userdata )
Gui::Gui(const char* argZero) : Gui::Gui(const char* argZero) :
samplerate( 0 ), samplerate( 0 ),
window(1110,650), window(1110,700),
enableJackSendReturns(false), enableJackSendReturns(false),
diskReader( new DiskReader() ), diskReader( new DiskReader() ),
diskWriter( new DiskWriter() ) diskWriter( new DiskWriter() )
@ -459,7 +459,7 @@ Gui::Gui(const char* argZero) :
stringstream s; stringstream s;
s << "Track " << i+1; s << "Track " << i+1;
//printf("track name %s\n", s.str().c_str() ); //printf("track name %s\n", s.str().c_str() );
tracks.push_back( new GTrack(8 + i * 118, 40, 110, 600, s.str().c_str() ) ); tracks.push_back( new GTrack(8 + i * 118, 40, 110, 650, s.str().c_str() ) );
} }
master = new GMasterTrack(8 + i * 118, 40, 150, 600, "Master"); master = new GMasterTrack(8 + i * 118, 40, 150, 600, "Master");