initial landing of new internal StepSequencer object
This commit is contained in:
parent
91de7ba60b
commit
6905a705a9
|
@ -39,6 +39,7 @@ namespace ARDOUR {
|
||||||
|
|
||||||
class Source;
|
class Source;
|
||||||
class SMFSource;
|
class SMFSource;
|
||||||
|
class StepSequencer;
|
||||||
|
|
||||||
typedef uint64_t superclock_t;
|
typedef uint64_t superclock_t;
|
||||||
|
|
||||||
|
@ -51,6 +52,8 @@ class BeatBox : public ARDOUR::Processor {
|
||||||
BeatBox (ARDOUR::Session& s);
|
BeatBox (ARDOUR::Session& s);
|
||||||
~BeatBox ();
|
~BeatBox ();
|
||||||
|
|
||||||
|
StepSequencer& sequencer() const { return *_sequencer; }
|
||||||
|
|
||||||
void run (BufferSet& /*bufs*/, samplepos_t /*start_frame*/, samplepos_t /*end_frame*/, double speed, pframes_t /*nframes*/, bool /*result_required*/);
|
void run (BufferSet& /*bufs*/, samplepos_t /*start_frame*/, samplepos_t /*end_frame*/, double speed, pframes_t /*nframes*/, bool /*result_required*/);
|
||||||
void silence (samplecnt_t nframes, samplepos_t start_frame);
|
void silence (samplecnt_t nframes, samplepos_t start_frame);
|
||||||
bool can_support_io_configuration (const ChanCount& in, ChanCount& out);
|
bool can_support_io_configuration (const ChanCount& in, ChanCount& out);
|
||||||
|
@ -82,6 +85,7 @@ class BeatBox : public ARDOUR::Processor {
|
||||||
bool fill_source (boost::shared_ptr<Source>);
|
bool fill_source (boost::shared_ptr<Source>);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
StepSequencer* _sequencer;
|
||||||
bool _start_requested;
|
bool _start_requested;
|
||||||
bool _running;
|
bool _running;
|
||||||
int _measures;
|
int _measures;
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
#include "ardour/midi_buffer.h"
|
#include "ardour/midi_buffer.h"
|
||||||
#include "ardour/session.h"
|
#include "ardour/session.h"
|
||||||
#include "ardour/smf_source.h"
|
#include "ardour/smf_source.h"
|
||||||
|
#include "ardour/step_sequencer.h"
|
||||||
|
|
||||||
using std::cerr;
|
using std::cerr;
|
||||||
using std::endl;
|
using std::endl;
|
||||||
|
@ -43,6 +44,7 @@ MultiAllocSingleReleasePool BeatBox::Event::pool (X_("beatbox events"), sizeof (
|
||||||
|
|
||||||
BeatBox::BeatBox (Session& s)
|
BeatBox::BeatBox (Session& s)
|
||||||
: Processor (s, _("BeatBox"))
|
: Processor (s, _("BeatBox"))
|
||||||
|
, _sequencer (0)
|
||||||
, _start_requested (false)
|
, _start_requested (false)
|
||||||
, _running (false)
|
, _running (false)
|
||||||
, _measures (2)
|
, _measures (2)
|
||||||
|
@ -61,10 +63,12 @@ BeatBox::BeatBox (Session& s)
|
||||||
, remove_queue (64)
|
, remove_queue (64)
|
||||||
{
|
{
|
||||||
_display_to_user = true;
|
_display_to_user = true;
|
||||||
|
_sequencer = new StepSequencer (1, 32);
|
||||||
}
|
}
|
||||||
|
|
||||||
BeatBox::~BeatBox ()
|
BeatBox::~BeatBox ()
|
||||||
{
|
{
|
||||||
|
delete _sequencer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -249,6 +249,7 @@ libardour_sources = [
|
||||||
'speakers.cc',
|
'speakers.cc',
|
||||||
'srcfilesource.cc',
|
'srcfilesource.cc',
|
||||||
'stripable.cc',
|
'stripable.cc',
|
||||||
|
'step_sequencer.cc',
|
||||||
'strip_silence.cc',
|
'strip_silence.cc',
|
||||||
'system_exec.cc',
|
'system_exec.cc',
|
||||||
'revision.cc',
|
'revision.cc',
|
||||||
|
|
Loading…
Reference in New Issue
Block a user