smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-16 18:36:03 +01:00
Code Issues Projects Releases Wiki Activity

remove all debugging output from NPAE debugging process

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@7362 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-07-02 21:05:08 +00:00
parent 9f5a179bf1
commit d8770da34f
6 changed files with 1 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/audioengine.cc
View file

@ -292,15 +292,12 @@ AudioEngine::_process_callback (nframes_t nframes, void *arg)
void
AudioEngine::_freewheel_callback (int onoff, void *arg)
{
cerr << "JACK says FREEWHEEL = " << onoff << endl;
static_cast<AudioEngine*>(arg)->_freewheeling = onoff;
}
int
AudioEngine::process_callback (nframes_t nframes)
{
cerr << "JACK says PROCESS (" << nframes << ')' << endl;
// CycleTimer ct ("AudioEngine::process");
GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
Glib::Mutex::Lock tm (_process_lock, Glib::TRY_LOCK);

28
libs/ardour/session_butler.cc
View file

@ -176,8 +176,6 @@ Session::butler_thread_work ()
pfd[0].fd = butler_request_pipe[0];
pfd[0].events = POLLIN|POLLERR|POLLHUP;
cerr << "Butler sleeps with DWO = " << disk_work_outstanding << endl;
if (poll (pfd, 1, (disk_work_outstanding ? 0 : -1)) < 0) {
if (errno == EINTR) {
@ -190,11 +188,8 @@ Session::butler_thread_work ()
break;
}
cerr << "Butler awake\n";
if (pfd[0].revents & ~POLLIN) {
error << string_compose (_("Error on butler thread request pipe: fd=%1 err=%2"), pfd[0].fd, pfd[0].revents) << endmsg;
cerr << string_compose (_("Error on butler thread request pipe: fd=%1 err=%2"), pfd[0].fd, pfd[0].revents) << endl;
break;
}
@ -211,21 +206,17 @@ Session::butler_thread_work ()
switch ((ButlerRequest::Type) req) {
case ButlerRequest::Wake:
cerr << "\tWAKE request\n";
break;
case ButlerRequest::Run:
cerr << "\tRUN request\n";
butler_should_run = true;
break;
case ButlerRequest::Pause:
cerr << "\tPAUSE request\n";
butler_should_run = false;
break;
case ButlerRequest::Quit:
cerr << "\tQUIT request\n";
pthread_exit_pbd (0);
/*NOTREACHED*/
break;
@ -251,14 +242,9 @@ Session::butler_thread_work ()
restart:
disk_work_outstanding = false;
cerr << "transport work = " << g_atomic_int_get (&butler_should_do_transport_work) << endl;
if (transport_work_requested()) {
cerr << "Do transport work\n";
butler_transport_work ();
cerr << "\tdone with that\n";
} else {
cerr << "no transport work to do\n";
}
}
begin = get_microseconds();
@ -286,7 +272,6 @@ Session::butler_thread_work ()
break;
case 1:
bytes += ds->read_data_count();
cerr << (*i)->name() << " not completely written, DWO = true\n";
disk_work_outstanding = true;
break;
@ -300,12 +285,10 @@ Session::butler_thread_work ()
if (i != dsl->begin() && i != dsl->end()) {
/* we didn't get to all the streams */
cerr << "Some streams not serviced, DWO = true\n";
disk_work_outstanding = true;
}
if (!err && transport_work_requested()) {
cerr << "transport worked is now requested, going back to the start\n";
goto restart;
}
@ -333,7 +316,6 @@ Session::butler_thread_work ()
break;
case 1:
bytes += (*i)->write_data_count();
cerr << (*i)->name() << " not completely written, DWO = true\n";
disk_work_outstanding = true;
break;
@ -360,7 +342,6 @@ Session::butler_thread_work ()
}
if (!err && transport_work_requested()) {
cerr << "transport worked is now requested, going back to the start 2\n";
goto restart;
}
@ -387,18 +368,11 @@ Session::butler_thread_work ()
// cerr << "AFTER " << (*i)->name() << ": pb = " << (*i)->playback_buffer_load() << " cp = " << (*i)->capture_buffer_load() << endl;
// }
cerr << "Loop done, but BSR = "
<< butler_should_run
<< " DWO = " << disk_work_outstanding
<< " TWR = " << g_atomic_int_get (&butler_should_do_transport_work)
<< " so back to restart\n";
goto restart;
}
butler_paused.signal();
}
cerr << "Butler loop done\n";
}
pthread_exit_pbd (0);

5
libs/ardour/session_events.cc
View file

@ -97,7 +97,6 @@ Session::queue_event (Event* ev)
if (_state_of_the_state & Loading) {
merge_event (ev);
} else {
cerr << "********** push event action " << ev->action << " type " << enum_2_string (ev->type) << " to pending\n";
pending_events.write (&ev, 1);
}
}
@ -293,14 +292,10 @@ Session::process_event (Event* ev)
if (ev->type != Event::Locate) {
immediate_events.insert (immediate_events.end(), ev);
_remove_event (ev);
cerr << "**** EARLY RETURN from process event, pending = "
<< hex << (int) post_transport_work << dec << " type was " << enum_2_string (ev->type) << endl;
return;
}
}
cerr << "%*%*%*%*%*% PROCESS EVENT TYPE " << enum_2_string (ev->type) << endl;
switch (ev->type) {
case Event::SetLoop:
set_play_loop (ev->yes_or_no);

21
libs/ardour/session_process.cc
View file

@ -260,8 +260,6 @@ Session::process_with_events (nframes_t nframes)
nframes_t stop_limit;
long frames_moved;
cerr << "++PWE\n";
/* make sure the auditioner is silent */
if (auditioner) {
@ -271,7 +269,6 @@ Session::process_with_events (nframes_t nframes)
/* handle any pending events */
while (pending_events.read (&ev, 1) == 1) {
cerr << "********** merge event action " << ev->action << " type " << enum_2_string (ev->type) << " to pending\n";
merge_event (ev);
}
@ -283,12 +280,9 @@ Session::process_with_events (nframes_t nframes)
while (!non_realtime_work_pending() && !immediate_events.empty()) {
Event *ev = immediate_events.front ();
immediate_events.pop_front ();
cerr << "******* process immediate effect event type " << ev->action << " type " << enum_2_string (ev->type) << endl;
process_event (ev);
}
dump_events ();
/* Events caused a transport change, send an MTC Full Frame (SMPTE) message.
* This is sent whether rolling or not, to give slaves an idea of ardour time
* on locates (and allow slow slaves to position and prepare for rolling)
@ -299,13 +293,11 @@ Session::process_with_events (nframes_t nframes)
if (!process_can_proceed()) {
_silent = true;
cerr << "++PWE out 1\n";
return;
}
if (events.empty() || next_event == events.end()) {
process_without_events (nframes);
cerr << "++PWE out 2\n";
return;
}
@ -328,7 +320,6 @@ Session::process_with_events (nframes_t nframes)
if (_transport_speed == 0) {
no_roll (nframes);
cerr << "++PWE out 3\n";
return;
}
@ -345,7 +336,6 @@ Session::process_with_events (nframes_t nframes)
if (maybe_stop (stop_limit)) {
no_roll (nframes);
cerr << "++PWE out 4\n";
return;
}
@ -375,7 +365,6 @@ Session::process_with_events (nframes_t nframes)
if (process_routes (this_nframes)) {
fail_roll (nframes);
cerr << "++PWE out 4\n";
return;
}
@ -434,7 +423,6 @@ Session::process_with_events (nframes_t nframes)
send_midi_time_code_in_another_thread ();
}
cerr << "++PWE out 5\n";
return;
}
@ -754,8 +742,6 @@ Session::process_without_events (nframes_t nframes)
nframes_t stop_limit;
long frames_moved;
cerr << "++PwE\n";
if (!process_can_proceed()) {
_silent = true;
return;
@ -763,14 +749,12 @@ Session::process_without_events (nframes_t nframes)
if (!_exporting && _slave) {
if (!follow_slave (nframes)) {
cerr << "++PwE out 1\n";
return;
}
}
if (_transport_speed == 0) {
fail_roll (nframes);
cerr << "++PwE out 2\n";
return;
}
@ -786,12 +770,10 @@ Session::process_without_events (nframes_t nframes)
if (maybe_stop (stop_limit)) {
no_roll (nframes);
cerr << "++PwE out 2\n";
return;
}
if (maybe_sync_start (nframes)) {
cerr << "++PwE out 3\n";
return;
}
@ -803,7 +785,6 @@ Session::process_without_events (nframes_t nframes)
if (process_routes (nframes)) {
fail_roll (nframes);
cerr << "++PwE out 4\n";
return;
}
@ -826,7 +807,6 @@ Session::process_without_events (nframes_t nframes)
send_midi_time_code_in_another_thread ();
}
cerr << "++PwE out 5\n";
return;
}
@ -866,7 +846,6 @@ Session::process_audition (nframes_t nframes)
}
if (!auditioner->active()) {
cerr << "P1 pf = pwe\n";
process_function = &Session::process_with_events;
}
}

1
libs/ardour/session_state.cc
View file

@ -223,7 +223,6 @@ Session::first_stage_init (string fullpath, string snapshot_name)
click_emphasis_length = 0;
_clicking = false;
cerr << "P2 pf = pwe\n";
process_function = &Session::process_with_events;
if (Config->get_use_video_sync()) {

2
libs/ardour/session_transport.cc
View file

@ -1062,10 +1062,8 @@ Session::post_transport ()
{
if (post_transport_work & PostTransportAudition) {
if (auditioner && auditioner->active()) {
cerr << "P3 pf = pa\n";
process_function = &Session::process_audition;
} else {
cerr << "P4 pf = pwe\n";
process_function = &Session::process_with_events;
}
}