13
0

Merge branch 'master' into cairocanvas

This commit is contained in:
Paul Davis 2013-09-14 16:43:02 -04:00
commit 045ef69ac3

View File

@ -16,6 +16,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <iostream>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <jack/session.h> #include <jack/session.h>
@ -153,7 +154,7 @@ void
JackConnection::halted_callback () JackConnection::halted_callback ()
{ {
_jack = 0; _jack = 0;
cerr << "JACK HALTED\n"; std::cerr << "JACK HALTED\n";
Disconnected (""); Disconnected ("");
} }
@ -161,7 +162,7 @@ void
JackConnection::halted_info_callback (jack_status_t /*status*/, const char* reason) JackConnection::halted_info_callback (jack_status_t /*status*/, const char* reason)
{ {
_jack = 0; _jack = 0;
cerr << "JACK HALTED: " << reason << endl; std::cerr << "JACK HALTED: " << reason << std::endl;
Disconnected (reason); Disconnected (reason);
} }