Soundship
/
Loopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

-Refactored GMasterTrack

main
Harry van Haaren 2013-09-10 21:51:05 +01:00
parent c2b965cf26
commit 95d1d7af70
3 changed files with 181 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/diskwriter.cxx
View File

@ -98,6 +98,7 @@ void DiskWriter::writeMaster()
}
// reverb
/*
Avtk::Reverb* rev = master->getReverb();
cJSON* reverb = cJSON_CreateObject();
cJSON_AddItemToObject( masterTrack, "reverb", reverb );
@ -105,6 +106,7 @@ void DiskWriter::writeMaster()
cJSON_AddNumberToObject( reverb, "size", rev->size() );
cJSON_AddNumberToObject( reverb, "wet", rev->wet() );
cJSON_AddNumberToObject( reverb, "damping", rev->damping() );
*/
//cJSON_AddNumberToObject( reverb, "wet", rev->wet() );
//cJSON_AddNumberToObject( reverb, "damping", rev->damping() );

169
src/gmastertrack.cxx Normal file
View File

@ -0,0 +1,169 @@
#include "gmastertrack.hxx"
static void gmastertrack_reverb_cb(Fl_Widget *w, void *data)
{
int enable = ((Avtk::Reverb*)w)->getActive();
printf("reverb enable %i\n",enable);
EventFxReverb e = EventFxReverb( enable, 0.5, 0.5, 0.5 );
writeToDspRingbuffer( &e );
}
static void gmastertrack_button_callback(Fl_Widget *w, void *data) {
if ( strcmp( w->label(), "Metro" ) == 0 )
{
Avtk::Button* b = (Avtk::Button*)w;
b->value( !b->value() );
EventMetronomeActive e = EventMetronomeActive( b->value() );
writeToDspRingbuffer( &e );
}
else if ( strcmp( w->label(), "BPM" ) == 0 )
{
Avtk::Dial* b = (Avtk::Dial*)w;
float bpm = b->value() * 160 + 60; // 60 - 220
EventTimeBPM e = EventTimeBPM( bpm );
writeToDspRingbuffer( &e );
}
else if ( strcmp( w->label(), "Tap" ) == 0 )
{
EventTimeTempoTap e;
writeToDspRingbuffer( &e );
}
else
{
cout << __FILE__ << __LINE__ << " Error: unknown command string" << endl;
}
}
GMasterTrack::GMasterTrack(int x, int y, int w, int h, const char* l ) :
Fl_Group(x, y, w, h),
title( strdup(l) ),
bg( x, y , w, h, title ),
// with "true" master flag: won't influence grid
clipSel(x + 5, y + 26 + 102, 140, 294,"", true),
source(x+5, y+26, 140, 100, ""),
volBox(x+5, y+422, 140, 172, ""),
/*
tapTempo(x + 25 + 52, y + 26 + 4, 63, 29,"Tap"),
metronomeButton(x + 9,y + 26 + 4, 64, 29,"Metro"),
*/
sidechain(x+9, y +428, 94, 94, ""),
reverb (x+9, y +527, 94, 62, ""),
inputVolume(x + 9,y + 26 + 4, w - 18, 29,""),
volume(x+106, y +425, 36, 166, "")
{
ID = privateID++;
bar = 0;
inputVolume.setOrientationHorizontal();
/*
tapTempo.callback( gmastertrack_button_callback, &ID );
metronomeButton.callback( gmastertrack_button_callback, 0 );
*/
reverb.callback( gmastertrack_reverb_cb, 0 );
//tapTempo.setBgColor( 0, 0, 0 );
//metronomeButton.setBgColor( 0, 0, 0 );
//metronomeButton.setColor( 0.4, 0.4, 0.4 );
//metronomeButton.setOutlineColor( 0.4, 0.4, 0.4 );
for(int i = 0; i < 4; i++)
{
int offset = 0;
/*
if ( i > 1 )
offset = 1;
*/
beatLights[i] = new Avtk::LightButton( x + 9 + 34 * i + offset, y + 25 + 37 , 30, 29, "" );
beatLights[i+4] = new Avtk::LightButton( x + 9 + 34 * i + offset, y + 25 + 37 + 32, 30, 29, "" );
}
beatLights[0]->setColor( 0.0, 1.0 , 0.0 );
beatLights[1]->setColor( 1.0, 1.0 , 0.0 );
beatLights[2]->setColor( 1.0, 0.48, 0.0 );
beatLights[3]->setColor( 1.0, 0.0 , 0.0 );
beatLights[4]->setColor( 0.0, 1.0 , 0.0 );
beatLights[5]->setColor( 1.0, 1.0 , 0.0 );
beatLights[6]->setColor( 1.0, 0.48, 0.0 );
beatLights[7]->setColor( 1.0, 0.0 , 0.0 );
volBox.maximum(1.0f);
volBox.minimum(0.0f);
volBox.color( FL_BLACK );
volBox.selection_color( FL_BLUE );
source.maximum(1.0f);
source.minimum(0.0f);
source.color( FL_BLACK );
source.selection_color( FL_BLUE );
volume.amplitude( 0.0, 0.0 );
end(); // close the group
}
void GMasterTrack::setTapTempo( bool b )
{
//tapTempo.setHighlight( b );
}
void GMasterTrack::setBarBeat(int b, int beat)
{
if ( beat % 4 == 0 )
{
bar = bar % 4 + 1;
}
int num = (beat % 4) + 1;
//cout << bar << " " << num << endl;
// turn all off
for( int i = 0; i < 8; i++)
beatLights[i]->value( 0 );
// bar lights
for( int i = 0; i < bar; i++)
beatLights[i]->value( 1 );
// beat starts at 4
for( int i = 0; i < num; i++)
beatLights[i+4]->value( 1 );
}
// FIXME: refactor into time class?
int bpm;
Avtk::Volume* GMasterTrack::getInputVolume()
{
return &inputVolume;
}
Avtk::Volume* GMasterTrack::getVolume()
{
return &volume;
}
Avtk::ClipSelector* GMasterTrack::getClipSelector()
{
return &clipSel;
}
/*
Avtk::Reverb* GMasterTrack::getReverb()
{
return &reverb;
}
*/
GMasterTrack::~GMasterTrack()
{
free(title);
}

167
src/gmastertrack.hxx
View File

@ -24,173 +24,24 @@
using namespace std;
static void gmastertrack_reverb_cb(Fl_Widget *w, void *data)
{
int enable = ((Avtk::Reverb*)w)->getActive();
printf("reverb enable %i\n",enable);
EventFxReverb e = EventFxReverb( enable, 0.5, 0.5, 0.5 );
writeToDspRingbuffer( &e );
}
static void gmastertrack_button_callback(Fl_Widget *w, void *data) {
if ( strcmp( w->label(), "Metro" ) == 0 )
{
Avtk::Button* b = (Avtk::Button*)w;
b->value( !b->value() );
EventMetronomeActive e = EventMetronomeActive( b->value() );
writeToDspRingbuffer( &e );
}
else if ( strcmp( w->label(), "BPM" ) == 0 )
{
Avtk::Dial* b = (Avtk::Dial*)w;
float bpm = b->value() * 160 + 60; // 60 - 220
EventTimeBPM e = EventTimeBPM( bpm );
writeToDspRingbuffer( &e );
}
else if ( strcmp( w->label(), "Tap" ) == 0 )
{
EventTimeTempoTap e;
writeToDspRingbuffer( &e );
}
else
{
cout << __FILE__ << __LINE__ << " Error: unknown command string" << endl;
}
}
// FIXME: Refactor in .hxx .cxx
class GMasterTrack : public Fl_Group
{
public:
GMasterTrack(int x, int y, int w, int h, const char* l = 0 ) :
Fl_Group(x, y, w, h),
title( strdup(l) ),
bg( x, y , w, h, title ),
// with "true" master flag: won't influence grid
clipSel(x + 5, y + 26 + 102, 140, 294,"", true),
source(x+5, y+26, 140, 100, ""),
volBox(x+5, y+422, 140, 172, ""),
/*
tapTempo(x + 25 + 52, y + 26 + 4, 63, 29,"Tap"),
metronomeButton(x + 9,y + 26 + 4, 64, 29,"Metro"),
*/
sidechain(x+9, y +428, 94, 94, ""),
reverb (x+9, y +527, 94, 62, ""),
inputVolume(x + 9,y + 26 + 4, w - 18, 29,""),
volume(x+106, y +425, 36, 166, "")
{
ID = privateID++;
bar = 0;
inputVolume.setOrientationHorizontal();
/*
tapTempo.callback( gmastertrack_button_callback, &ID );
metronomeButton.callback( gmastertrack_button_callback, 0 );
*/
reverb.callback( gmastertrack_reverb_cb, 0 );
//tapTempo.setBgColor( 0, 0, 0 );
//metronomeButton.setBgColor( 0, 0, 0 );
//metronomeButton.setColor( 0.4, 0.4, 0.4 );
//metronomeButton.setOutlineColor( 0.4, 0.4, 0.4 );
for(int i = 0; i < 4; i++)
{
int offset = 0;
/*
if ( i > 1 )
offset = 1;
*/
beatLights[i] = new Avtk::LightButton( x + 9 + 34 * i + offset, y + 25 + 37 , 30, 29, "" );
beatLights[i+4] = new Avtk::LightButton( x + 9 + 34 * i + offset, y + 25 + 37 + 32, 30, 29, "" );
}
beatLights[0]->setColor( 0.0, 1.0 , 0.0 );
beatLights[1]->setColor( 1.0, 1.0 , 0.0 );
beatLights[2]->setColor( 1.0, 0.48, 0.0 );
beatLights[3]->setColor( 1.0, 0.0 , 0.0 );
beatLights[4]->setColor( 0.0, 1.0 , 0.0 );
beatLights[5]->setColor( 1.0, 1.0 , 0.0 );
beatLights[6]->setColor( 1.0, 0.48, 0.0 );
beatLights[7]->setColor( 1.0, 0.0 , 0.0 );
volBox.maximum(1.0f);
volBox.minimum(0.0f);
volBox.color( FL_BLACK );
volBox.selection_color( FL_BLUE );
source.maximum(1.0f);
source.minimum(0.0f);
source.color( FL_BLACK );
source.selection_color( FL_BLUE );
volume.amplitude( 0.0, 0.0 );
end(); // close the group
}
GMasterTrack(int x, int y, int w, int h, const char* l = 0 );
void setTapTempo( bool b )
{
//tapTempo.setHighlight( b );
}
void setBarBeat(int b, int beat)
{
if ( beat % 4 == 0 )
{
bar = bar % 4 + 1;
}
int num = (beat % 4) + 1;
//cout << bar << " " << num << endl;
// turn all off
for( int i = 0; i < 8; i++)
beatLights[i]->value( 0 );
// bar lights
for( int i = 0; i < bar; i++)
beatLights[i]->value( 1 );
// beat starts at 4
for( int i = 0; i < num; i++)
beatLights[i+4]->value( 1 );
}
void setTapTempo( bool b );
void setBarBeat(int b, int beat);
// FIXME: refactor into time class?
int bpm;
Avtk::Volume* getInputVolume()
{
return &inputVolume;
}
Avtk::Volume* getVolume()
{
return &volume;
}
Avtk::ClipSelector* getClipSelector()
{
return &clipSel;
}
Avtk::Reverb* getReverb()
{
return &reverb;
}
Avtk::Volume* getInputVolume();
Avtk::Volume* getVolume();
Avtk::ClipSelector* getClipSelector();
// Avtk::Reverb* getReverb()
~GMasterTrack()
{
free(title);
}
~GMasterTrack();
private:
@ -212,8 +63,10 @@ class GMasterTrack : public Fl_Group
*/
Avtk::LightButton* beatLights[8];
Avtk::SidechainGain sidechain;
Avtk::Reverb reverb;
Avtk::Volume inputVolume;
Avtk::Volume volume;