smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-26 08:27:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix warnings.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4155 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-11-13 21:48:51 +00:00
parent 2bb5a8cdb0
commit 963a390bea
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -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;
}

2
libs/surfaces/mackie/mackie_control_protocol_poll.cc
View file

@ -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

2
libs/surfaces/mackie/mackie_port.cc
View file

@ -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;