fix gcc4.4 compile warnings

[ardour.git] / libs / midi++2 / fd_midiport.cc

diff --git a/libs/midi++2/fd_midiport.cc b/libs/midi++2/fd_midiport.cc
index 17a7eff367dac1f6f9eb2175ab2b4a2ca9d3ad74..9736d2b4da11cec7f39b3395075bb1cef50e7019 100644 (file)
--- a/libs/midi++2/fd_midiport.cc
+++ b/libs/midi++2/fd_midiport.cc
@@ -20,12 +20,13 @@
 
 #include <fcntl.h>
 #include <cerrno>
+#include <cstring>
 
-#include <pbd/error.h>
-#include <pbd/pathscanner.h>
+#include "pbd/error.h"
+#include "pbd/pathscanner.h"
 
-#include <midi++/types.h>
-#include <midi++/fd_midiport.h>
+#include "midi++/types.h"
+#include "midi++/fd_midiport.h"
 
 using namespace std;
 using namespace MIDI;
@@ -65,7 +66,7 @@ FD_MidiPort::FD_MidiPort (const XMLNode& node,
                        midi_filename_pattern = new string (pattern);
                }
 
-               if (desc.mode & O_NONBLOCK == 0) {
+               if ((desc.mode & O_NONBLOCK) == 0) {
                        /* we unconditionally set O_NONBLOCK during
                           open, but the request didn't ask for it,
                           so remove it.
@@ -91,7 +92,7 @@ FD_MidiPort::list_devices ()
 {
        PathScanner scanner;
 
-       return scanner (*midi_dirpath, *midi_filename_pattern, false, true);
+       return scanner (*midi_dirpath, *midi_filename_pattern, false, true, false);
 }      
 
 int
@@ -134,7 +135,7 @@ FD_MidiPort::do_slow_write (byte *msg, unsigned int msglen)
                }
 
                bytes_written++;
-               for (i = 0; i < slowdown * 10000; i++);
+               for (i = 0; i < slowdown * 10000; i++) {}
        }
 
 
@@ -150,7 +151,7 @@ FD_MidiPort::do_slow_write (byte *msg, unsigned int msglen)
 }
 
 int
-FD_MidiPort::read (byte* buf, size_t max, timestamp_t ignored)
+FD_MidiPort::read (byte* buf, size_t max)
 {
        int nread;