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

Clean up changes in gmastertrack

main
Georg Krause 2019-06-05 13:01:33 +02:00
parent c14ea9b060
commit 70bc959f32
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gmastertrack.cxx
View File

@ -247,6 +247,8 @@ GMasterTrack::GMasterTrack(int x, int y, int w, int h, const char *l)
x + w * 2 / 4.f - 18, y + 436 + OFST * 2, 44, 22, "Metro"), x + w * 2 / 4.f - 18, y + 436 + OFST * 2, 44, 22, "Metro"),
autoStopRecButton( autoStopRecButton(
x + w * 2 / 4.f - 18, y + 436 + OFST * 3, 44, 22, "∞"), x + w * 2 / 4.f - 18, y + 436 + OFST * 3, 44, 22, "∞"),
beatLight(
x + 10, y + 437 + 54 * 3, 40, 42, ""),
tempoDial(x + w * 2 / 4.f - 18, y + 436 + OFST * 4, 45, 38, "BPM"), tempoDial(x + w * 2 / 4.f - 18, y + 436 + OFST * 4, 45, 38, "BPM"),
returnVol( returnVol(
@ -302,9 +304,7 @@ GMasterTrack::GMasterTrack(int x, int y, int w, int h, const char *l)
returnVol.align( FL_ALIGN_CENTER ); returnVol.align( FL_ALIGN_CENTER );
returnVol.callback( gmastertrack_returnVol_callback, 0 ); returnVol.callback( gmastertrack_returnVol_callback, 0 );
beatLight = new Avtk::LightButton( x + 10, y + 437 + 54 * 3, 40, 42, "" ); beatLight.value(1);
beatLight->setColor( 1.0, 0.0 , 0.0 );
beatLight->value(1);
volume.amplitude( 0.0, 0.0 ); volume.amplitude( 0.0, 0.0 );
volume.callback( gmastertrack_volume_callback, 0 ); volume.callback( gmastertrack_volume_callback, 0 );
@ -394,19 +394,19 @@ void GMasterTrack::setBarBeat(int b, int beat)
switch (beat_num) switch (beat_num)
{ {
case 0: case 0:
beatLight->setColor(1.0, 0.0, 0.0); beatLight.setColor(1.0, 0.0, 0.0);
cout << "first " << beat_num << "\n"; cout << "first " << beat_num << "\n";
break; break;
case 1: case 1:
beatLight->setColor(1.0, 0.48, 0.0); beatLight.setColor(1.0, 0.48, 0.0);
cout << "second " << beat_num << "\n"; cout << "second " << beat_num << "\n";
break; break;
case 2: case 2:
beatLight->setColor(1.0, 1.0, 0.0); beatLight.setColor(1.0, 1.0, 0.0);
cout << "third " << beat_num << "\n"; cout << "third " << beat_num << "\n";
break; break;
case 3: case 3:
beatLight->setColor(0.0, 1.0, 0.0); beatLight.setColor(0.0, 1.0, 0.0);
cout << "fuerthes " << beat_num << "\n"; cout << "fuerthes " << beat_num << "\n";
break; break;
default: default:
@ -415,8 +415,8 @@ void GMasterTrack::setBarBeat(int b, int beat)
char buf[2]; char buf[2];
sprintf(buf, "%d", beat_num+1); sprintf(buf, "%d", beat_num+1);
beatLight->copy_label(buf); beatLight.copy_label(buf);
beatLight->redraw(); beatLight.redraw();
} }
Avtk::Volume* GMasterTrack::getInputVolume() Avtk::Volume* GMasterTrack::getInputVolume()

2
src/gmastertrack.hxx
View File

@ -98,7 +98,7 @@ private:
Avtk::Dial returnVol; Avtk::Dial returnVol;
Avtk::LightButton* beatLight; Avtk::LightButton beatLight;
Avtk::Volume inputVolume; Avtk::Volume inputVolume;