Use PBD::ffs for portability
This commit is contained in:
parent
5f2fcb2e32
commit
9cbe231b92
@ -19,8 +19,6 @@
|
|||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
#include <strings.h> // for ffs(3)
|
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
@ -28,6 +26,7 @@
|
|||||||
#include <sigc++/bind.h>
|
#include <sigc++/bind.h>
|
||||||
|
|
||||||
#include "pbd/error.h"
|
#include "pbd/error.h"
|
||||||
|
#include "pbd/ffs.h"
|
||||||
#include "pbd/stl_delete.h"
|
#include "pbd/stl_delete.h"
|
||||||
#include "pbd/whitespace.h"
|
#include "pbd/whitespace.h"
|
||||||
#include "pbd/basename.h"
|
#include "pbd/basename.h"
|
||||||
@ -1491,7 +1490,7 @@ MidiTimeAxisView::playback_channel_mode_changed ()
|
|||||||
_playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Play"), _("some")));
|
_playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Play"), _("some")));
|
||||||
break;
|
break;
|
||||||
case ForceChannel:
|
case ForceChannel:
|
||||||
_playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Play"), _("all"), ffs (midi_track()->get_playback_channel_mask())));
|
_playback_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Play"), _("all"), PBD::ffs (midi_track()->get_playback_channel_mask())));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1507,7 +1506,7 @@ MidiTimeAxisView::capture_channel_mode_changed ()
|
|||||||
_capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Rec"), _("some")));
|
_capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2</i>", _("Rec"), _("some")));
|
||||||
break;
|
break;
|
||||||
case ForceChannel:
|
case ForceChannel:
|
||||||
_capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Rec"), _("all"), ffs (midi_track()->get_capture_channel_mask())));
|
_capture_channel_status.set_markup (string_compose ("<b>%1</b>: <i>%2>%3</i>", _("Rec"), _("all"), PBD::ffs (midi_track()->get_capture_channel_mask())));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,8 @@
|
|||||||
#ifndef __ardour_midi_track_h__
|
#ifndef __ardour_midi_track_h__
|
||||||
#define __ardour_midi_track_h__
|
#define __ardour_midi_track_h__
|
||||||
|
|
||||||
|
#include "pbd/ffs.h"
|
||||||
|
|
||||||
#include "ardour/track.h"
|
#include "ardour/track.h"
|
||||||
#include "ardour/midi_ring_buffer.h"
|
#include "ardour/midi_ring_buffer.h"
|
||||||
|
|
||||||
@ -183,7 +185,7 @@ private:
|
|||||||
/* if mode is ForceChannel, force mask to the lowest set channel or 1 if no
|
/* if mode is ForceChannel, force mask to the lowest set channel or 1 if no
|
||||||
* channels are set.
|
* channels are set.
|
||||||
*/
|
*/
|
||||||
#define force_mask(mode,mask) (((mode) == ForceChannel) ? (((mask) ? (1<<(ffs((mask))-1)) : 1)) : mask)
|
#define force_mask(mode,mask) (((mode) == ForceChannel) ? (((mask) ? (1<<(PBD::ffs((mask))-1)) : 1)) : mask)
|
||||||
|
|
||||||
void _set_playback_channel_mode(ChannelMode mode, uint16_t mask) {
|
void _set_playback_channel_mode(ChannelMode mode, uint16_t mask) {
|
||||||
mask = force_mask (mode, mask);
|
mask = force_mask (mode, mask);
|
||||||
|
@ -26,10 +26,10 @@
|
|||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
#include <strings.h> // for ffs(3)
|
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
#include "pbd/error.h"
|
#include "pbd/error.h"
|
||||||
|
#include "pbd/ffs.h"
|
||||||
#include "pbd/basename.h"
|
#include "pbd/basename.h"
|
||||||
#include <glibmm/threads.h>
|
#include <glibmm/threads.h>
|
||||||
#include "pbd/xml++.h"
|
#include "pbd/xml++.h"
|
||||||
@ -438,7 +438,7 @@ MidiDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t
|
|||||||
break;
|
break;
|
||||||
case ForceChannel:
|
case ForceChannel:
|
||||||
if (ev.is_channel_event()) {
|
if (ev.is_channel_event()) {
|
||||||
ev.set_channel (ffs(mask) - 1);
|
ev.set_channel (PBD::ffs(mask) - 1);
|
||||||
}
|
}
|
||||||
_capture_buf->write(transport_frame + loop_offset + ev.time(),
|
_capture_buf->write(transport_frame + loop_offset + ev.time(),
|
||||||
ev.type(), ev.size(), ev.buffer());
|
ev.type(), ev.size(), ev.buffer());
|
||||||
|
@ -17,8 +17,7 @@
|
|||||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <strings.h> // for ffs(3)
|
#include "pbd/ffs.h"
|
||||||
|
|
||||||
#include "pbd/enumwriter.h"
|
#include "pbd/enumwriter.h"
|
||||||
#include "pbd/convert.h"
|
#include "pbd/convert.h"
|
||||||
#include "evoral/midi_util.h"
|
#include "evoral/midi_util.h"
|
||||||
@ -504,7 +503,7 @@ MidiTrack::filter_channels (BufferSet& bufs, ChannelMode mode, uint32_t mask)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case ForceChannel:
|
case ForceChannel:
|
||||||
ev.set_channel (ffs (mask) - 1);
|
ev.set_channel (PBD::ffs (mask) - 1);
|
||||||
++e;
|
++e;
|
||||||
break;
|
break;
|
||||||
case AllChannels:
|
case AllChannels:
|
||||||
|
Loading…
Reference in New Issue
Block a user