diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index 8af45eef0f..5b1b9060d4 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -932,8 +932,6 @@ Session::deliver_mmc (MIDI::MachineControl::Command cmd, nframes_t where) return; } - cerr << "delivering MMC, ID = " << (int) mmc_buffer[2] << endl; - mmc_buffer[nbytes++] = cmd; // cerr << "delivering MMC, cmd = " << hex << (int) cmd << dec << endl; diff --git a/libs/surfaces/powermate/powermate.cc b/libs/surfaces/powermate/powermate.cc index 139313f3f8..cf3aec7cfd 100644 --- a/libs/surfaces/powermate/powermate.cc +++ b/libs/surfaces/powermate/powermate.cc @@ -14,12 +14,15 @@ #include #include +#include +#include #include "powermate.h" using namespace ARDOUR; using namespace std; using namespace sigc; +using namespace PBD; #define NUM_VALID_PREFIXES 2 @@ -32,17 +35,22 @@ static const char *valid_prefix[NUM_VALID_PREFIXES] = { int open_powermate(const char *dev, int mode) { + if (!Glib::file_test (dev, Glib::FILE_TEST_EXISTS)) { + return -1; + } int fd = open(dev, mode); int i; char name[255]; if(fd < 0){ - fprintf(stderr, "Unable to open \"%s\": %s\n", dev, strerror(errno)); - return -1; + if (errno != EACCES) { + error << string_compose ("Unable to open \"%1\": %2", dev, strerror(errno)) << endmsg; + } + return -1; } if(ioctl(fd, EVIOCGNAME(sizeof(name)), name) < 0){ - fprintf(stderr, "\"%s\": EVIOCGNAME failed: %s\n", dev, strerror(errno)); + error << string_compose ("\"%1\": EVIOCGNAME failed: %2", dev, strerror(errno)) << endmsg; close(fd); return -1; } @@ -64,10 +72,10 @@ int find_powermate(int mode) for(i=0; i= 0) - return r; + if (r >= 0) { + return r; + } } - return -1; }