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

-Updating prints, fixed bug in diskwriter

Browse source
This commit is contained in:
Harry van Haaren 2013-09-23 12:30:54 +01:00
parent a12eef7974
commit a99ad9048c
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scrapeFixme.sh
View file

@ -1,12 +1,15 @@
rm FIXME rm FIXME
echo -e "\n===> Samplerate hardcoded:\n" > FIXME echo -e "\n===> Samplerate hardcoded:\n" > FIXME
grep -irn "44100" src/ >> FIXME grep -irnI "44100" src/ >> FIXME
echo -e "\n\n\n===> FIXME" >> FIXME echo -e "\n\n\n===> FIXME" >> FIXME
grep -irn "FIXME" src/ >> FIXME grep -irnI "FIXME" src/ >> FIXME
echo -e "\n\n\n===> TODO" >> FIXME echo -e "\n\n\n===> TODO" >> FIXME
grep -irn "TODO" src/ >> FIXME grep -irnI "TODO" src/ >> FIXME
echo -e "\n\n\n===> Prints" >> FIXME
grep -irnI "cout" src/ >> FIXME
geany FIXME geany FIXME

2
src/diskwriter.cxx
View file

@ -99,7 +99,7 @@ int DiskWriter::writeAudioBuffer(int track, int scene, AudioBuffer* ab )
stringstream path; stringstream path;
path << audioDir << "/" << filename.str(); path << audioDir << "/" << filename.str();
SndfileHandle outfile( path.str(), SFM_WRITE, SF_FORMAT_WAV | SF_FORMAT_FLOAT, 1, 44100); SndfileHandle outfile( path.str(), SFM_WRITE, SF_FORMAT_WAV | SF_FORMAT_FLOAT, 1, gui->samplerate );
cout << "Worker::writeSample() " << path.str() << " size: " << ab->getAudioFrames() << endl; cout << "Worker::writeSample() " << path.str() << " size: " << ab->getAudioFrames() << endl;
// FIXME: the size of the buffer is bigger than the audio contained in it: // FIXME: the size of the buffer is bigger than the audio contained in it:

4
src/gui.cxx
View file

@ -53,7 +53,6 @@ void close_cb(Fl_Widget*o, void*)
} }
static void gui_static_read_rb(void* inst) static void gui_static_read_rb(void* inst)
{ {
//cout << "read gui" << endl;
handleGuiEvents(); handleGuiEvents();
Fl::repeat_timeout( 1 / 30.f, &gui_static_read_rb, inst); Fl::repeat_timeout( 1 / 30.f, &gui_static_read_rb, inst);
} }
@ -91,7 +90,6 @@ static void gui_header_callback(Fl_Widget *w, void *data)
} }
else if ( strcmp(m->label(), "Load Session") == 0 ) else if ( strcmp(m->label(), "Load Session") == 0 )
{ {
cout << "Load clicked" << endl;
Fl_Native_File_Chooser fnfc; Fl_Native_File_Chooser fnfc;
fnfc.title("Load Session"); fnfc.title("Load Session");
fnfc.type(Fl_Native_File_Chooser::BROWSE_DIRECTORY); fnfc.type(Fl_Native_File_Chooser::BROWSE_DIRECTORY);
@ -113,8 +111,8 @@ static void gui_header_callback(Fl_Widget *w, void *data)
const char* name = fl_input( "Save session as", gui->getDiskWriter()->getLastSaveName().c_str() ); const char* name = fl_input( "Save session as", gui->getDiskWriter()->getLastSaveName().c_str() );
if ( name ) if ( name )
{ {
cout << "Save clicked, name = " << name << endl;
gui->getDiskWriter()->initialize( getenv("HOME"), name ); gui->getDiskWriter()->initialize( getenv("HOME"), name );
LUPPP_NOTE("%s %s","Saving session as ", name.c_str() );
EventStateSave e; EventStateSave e;
writeToDspRingbuffer( &e ); writeToDspRingbuffer( &e );
} }

4
src/jack.cxx
View file

@ -128,7 +128,7 @@ Jack::Jack() :
static_process, static_process,
static_cast<void*>(this)) ) static_cast<void*>(this)) )
{ {
cerr << "Jack() error setting process callback" << endl; LUPPP_ERROR("%s","Error setting process callback");
} }
if ( jack_set_timebase_callback(client, if ( jack_set_timebase_callback(client,
@ -136,7 +136,7 @@ Jack::Jack() :
(JackTimebaseCallback)static_timebase, (JackTimebaseCallback)static_timebase,
static_cast<void*>(this)) ) static_cast<void*>(this)) )
{ {
cerr << "Jack() error setting timebase callback" << endl; LUPPP_ERROR("%s","Error setting timebase callback");
} }
} }

2
src/looper.cxx
View file

@ -33,7 +33,7 @@ Looper::Looper(int t) :
fpb = 22050; fpb = 22050;
// init faust pitch shift variables // init faust pitch shift variables
fSamplingFreq = 44100; fSamplingFreq = jack->getSamplerate();
IOTA = 0; IOTA = 0;
//tmpRecordBuffer.resize(MAX_BUFFER_SIZE); //tmpRecordBuffer.resize(MAX_BUFFER_SIZE);

1
src/metronome.cxx
View file

@ -49,7 +49,6 @@ void Metronome::bar()
void Metronome::beat() void Metronome::beat()
{ {
playPoint = 0; playPoint = 0;
//cout << "Looper " << track << " got beat()" << flush;
} }
void Metronome::setFpb(int f) void Metronome::setFpb(int f)

6
src/timemanager.cxx
View file

@ -39,7 +39,7 @@ int TimeManager::getFpb()
void TimeManager::setBpm(float bpm) void TimeManager::setBpm(float bpm)
{ {
#ifdef DEBUG_TIME #ifdef DEBUG_TIME
cout << "setBpm() " << bpm << endl; LUPPP_NOTE("%s %f","setBpm()",bpm);
#endif #endif
setFpb( samplerate / bpm * 60 ); setFpb( samplerate / bpm * 60 );
} }
@ -48,7 +48,7 @@ void TimeManager::setBpm(float bpm)
void TimeManager::setFpb(float f) void TimeManager::setFpb(float f)
{ {
fpb = f; fpb = f;
//cout << "setFpb() " << fpb << endl; //LUPPP_NOTE("%s %f","setFpb()", fpb);
int bpm = ( samplerate * 60) / f; int bpm = ( samplerate * 60) / f;
@ -68,7 +68,7 @@ void TimeManager::setFpb(float f)
void TimeManager::registerObserver(TimeObserver* o) void TimeManager::registerObserver(TimeObserver* o)
{ {
//cout << "registerObserver() " << o << endl; //LUPPP_NOTE("%s","registerObserver()");
observers.push_back(o); observers.push_back(o);
o->setFpb( fpb ); o->setFpb( fpb );