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

Merged feature branch into master 

Conflicts:
	Tupfile
	run.sh
	test.sh
main
Harry van Haaren 2013-09-15 16:44:44 +01:00
parent 5fc06eb8dc 57e5a86d94
commit ac45129efb
5 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tupfile
View File

@ -10,5 +10,4 @@ LDFLAGS +=-lgcov
endif
# LINK
: src/*.o |> ^c^ g++ %f $(LDFLAGS) -o %o && touch luppp.newBuild |> luppp | luppp.newBuild
: src/*.o |> ^c^ g++ %f $(LDFLAGS) -o %o |> luppp

4
run.sh
View File

@ -2,4 +2,8 @@
set -e
tup upd
<<<<<<< HEAD
xterm -e "sleep 1 && aj-snapshot -r .ajsnapshot" & releaseBuild/luppp
=======
xterm -e "sleep 1 && aj-snapshot -r .ajsnapshot" & ./releaseBuild/luppp
>>>>>>> master

22
src/gmastertrack.cxx
View File

@ -1,7 +1,16 @@
#include "gmastertrack.hxx"
static void gmastertrack_button_callback(Fl_Widget *w, void *data) {
static void gmastertrack_tempoDial_callback(Fl_Widget *w, void *data)
{
Avtk::Dial* b = (Avtk::Dial*)w;
float bpm = b->value() * 160 + 60; // 60 - 220
EventTimeBPM e = EventTimeBPM( bpm );
writeToDspRingbuffer( &e );
}
static void gmastertrack_button_callback(Fl_Widget *w, void *data)
{
if ( strcmp( w->label(), "Metro" ) == 0 )
{
Avtk::Button* b = (Avtk::Button*)w;
@ -9,13 +18,6 @@ static void gmastertrack_button_callback(Fl_Widget *w, void *data) {
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;
@ -59,6 +61,8 @@ GMasterTrack::GMasterTrack(int x, int y, int w, int h, const char* l ) :
tapTempo.callback( gmastertrack_button_callback, &ID );
metronomeButton.callback( gmastertrack_button_callback, 0 );
tempoDial.callback( gmastertrack_tempoDial_callback, 0 );
tempoDial.align( FL_ALIGN_CENTER );
returnVol.align( FL_ALIGN_CENTER );
@ -87,7 +91,7 @@ GMasterTrack::GMasterTrack(int x, int y, int w, int h, const char* l ) :
void GMasterTrack::setBpm( int b )
{
bpm = b;
tempoDial.value( ( bpm - 60 ) / 140.f );
tempoDial.value( ( bpm - 60 ) / 160.f );
}
int GMasterTrack::getBpm()

6
src/timemanager.cxx
View File

@ -9,6 +9,10 @@
#include "observer/time.hxx"
#include "jack.hxx"
extern Jack* jack;
using namespace std;
TimeManager::TimeManager():
@ -32,7 +36,7 @@ int TimeManager::getFpb()
void TimeManager::setBpm(float bpm)
{
cout << "setBpm() " << bpm << endl;
setFpb( 44100 / bpm * 60 );
setFpb( jack->getSamplerate() / bpm * 60 );
}

29
test.sh
View File

@ -1,22 +1,51 @@
# Tup with CONFIG_LUPPP_BUILD_TESTS=y
# Compile with:
<<<<<<< HEAD
# define BUILD_TESTS
# define BUILD_COVERAGE_TEST
# -lgcov
=======
#define BUILD_TESTS
#define BUILD_COVERAGE_TEST
#-lgcov
>>>>>>> master
<<<<<<< HEAD
# run the tests:
# Luppp quits after tests are finished
# gcov scrapes .gcna / .gcdo files, produces .gcov files
# cp source files into dir: needed for analysis by lcov
# lcov scrapes .gcov files into lcov.info
# genhtml produces index.html from lcov.info
=======
# Run gcov on each file, it shows output data:
cd testBuild/src/
gcov -r -b *.gcda
>>>>>>> master
cd testBuild/
<<<<<<< HEAD
./luppp
cd src
=======
#rm src/*.gcda
#rm src/*.gcno
#rm src/lcov.info
#rm src/gcov.css
#rm src/*.html
#rm src/*.png
#rm gcov.data
>>>>>>> master
gcov -r -b *
cp -r ../../src/* ./