Fix warnings.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4155 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 39a1438f35056e6e288b9e48d17ff136409e0217..de6623c4d2b684845b61083b3e66bdbfc9682759 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -1132,7 +1132,7 @@ string MackieControlProtocol::format_bbt_timecode( nframes_t now_frame )
        // figure out subdivisions per beat
        const Meter & meter = session->tempo_map().meter_at( now_frame );
        int subdiv = 2;
-       if ( meter.note_divisor() == 8 && meter.beats_per_bar() == 12.0 || meter.beats_per_bar() == 9.0 || meter.beats_per_bar() == 6.0 )
+       if ( meter.note_divisor() == 8 && (meter.beats_per_bar() == 12.0 || meter.beats_per_bar() == 9.0 || meter.beats_per_bar() == 6.0) )
        {
                subdiv = 3;
        }

diff --git a/libs/surfaces/mackie/mackie_control_protocol_poll.cc b/libs/surfaces/mackie/mackie_control_protocol_poll.cc
index 1b087222cdafb249c77a334ad416f40f4366c2ad..88c00ed6eb225dd0d99685bbb675d94a52234aef 100644 (file)
--- a/libs/surfaces/mackie/mackie_control_protocol_poll.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol_poll.cc
@@ -135,7 +135,7 @@ void MackieControlProtocol::read_ports()
                // this will cause handle_midi_any in the MackiePort to be triggered
                // for alsa/raw ports
                // alsa/sequencer ports trigger the midi parser off poll
-               if ( pfd[p].revents & POLLIN > 0 )
+               if ( (pfd[p].revents & POLLIN) > 0 )
                {
                        // avoid deadlocking?
                        // doesn't seem to make a difference

diff --git a/libs/surfaces/mackie/mackie_port.cc b/libs/surfaces/mackie/mackie_port.cc
index d9ced05da314dd1dddfba82ea1d101bb3c238078..d767c4c7450877bb095e63cc9d071707deb4debe 100644 (file)
--- a/libs/surfaces/mackie/mackie_port.cc
+++ b/libs/surfaces/mackie/mackie_port.cc
@@ -139,7 +139,7 @@ MidiByteArray calculate_challenge_response( MidiByteArray::iterator begin, MidiB
        // from the Logic docs.
        retval << ( 0x7f & ( l[0] + ( l[1] ^ 0xa ) - l[3] ) );
        retval << ( 0x7f & ( ( l[2] >> l[3] ) ^ ( l[0] + l[3] ) ) );
-       retval << ( 0x7f & ( l[3] - ( l[2] << 2 ) ^ ( l[0] | l[1] ) ) );
+       retval << ( 0x7f & ( (l[3] - ( l[2] << 2 )) ^ ( l[0] | l[1] ) ) );
        retval << ( 0x7f & ( l[1] - l[2] + ( 0xf0 ^ ( l[3] << 4 ) ) ) );
        
        return retval;