projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ARDOUR::ladspa_search_path function to get LADSPA module directories
[ardour.git]
/
libs
/
ardour
/
ardour
/
delivery.h
diff --git
a/libs/ardour/ardour/delivery.h
b/libs/ardour/ardour/delivery.h
index 95ef485527ae458756528b25b22657c35c11cda2..314b223538fa75c7aa6b508a8e40cd081ca5fbfe 100644
(file)
--- a/
libs/ardour/ardour/delivery.h
+++ b/
libs/ardour/ardour/delivery.h
@@
-30,7
+30,9
@@
namespace ARDOUR {
class BufferSet;
class IO;
class MuteMaster;
class BufferSet;
class IO;
class MuteMaster;
+class PannerShell;
class Panner;
class Panner;
+class Pannable;
class Delivery : public IOProcessor
{
class Delivery : public IOProcessor
{
@@
-50,13
+52,15
@@
public:
static bool role_requires_output_ports (Role r) { return r == Main || r == Send || r == Insert; }
static bool role_requires_output_ports (Role r) { return r == Main || r == Send || r == Insert; }
+ bool does_routing() const { return true; }
+
/* Delivery to an existing output */
/* Delivery to an existing output */
- Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<MuteMaster> mm, const std::string& name, Role);
+ Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<
Pannable>, boost::shared_ptr<
MuteMaster> mm, const std::string& name, Role);
/* Delivery to a new output owned by this object */
/* Delivery to a new output owned by this object */
- Delivery (Session& s, boost::shared_ptr<MuteMaster> mm, const std::string& name, Role);
+ Delivery (Session& s, boost::shared_ptr<
Pannable>, boost::shared_ptr<
MuteMaster> mm, const std::string& name, Role);
~Delivery ();
bool set_name (const std::string& name);
~Delivery ();
bool set_name (const std::string& name);
@@
-66,66
+70,58
@@
public:
bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
bool configure_io (ChanCount in, ChanCount out);
bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
bool configure_io (ChanCount in, ChanCount out);
- void run (BufferSet& bufs,
sframes_t start_frame, sframes_t end_frame, n
frames_t nframes, bool);
+ void run (BufferSet& bufs,
framepos_t start_frame, framepos_t end_frame, p
frames_t nframes, bool);
/* supplemental method used with MIDI */
/* supplemental method used with MIDI */
- void flush (nframes_t nframes, nframes64_t time);
- void transport_stopped ();
-
+ void flush_buffers (framecnt_t nframes);
void no_outs_cuz_we_no_monitor(bool);
void no_outs_cuz_we_no_monitor(bool);
-
- void set_solo_level (int32_t sl) { _solo_level = sl; }
- void set_solo_isolated (bool yn) { _solo_isolated = yn; }
-
- void cycle_start (nframes_t);
- void increment_output_offset (nframes_t);
- void transport_stopped (sframes_t frame);
+ void transport_stopped (framepos_t frame);
+ void realtime_locate ();
BufferSet& output_buffers() { return *_output_buffers; }
PBD::Signal0<void> MuteChange;
BufferSet& output_buffers() { return *_output_buffers; }
PBD::Signal0<void> MuteChange;
- static PBD::Signal1<void,nframes_t> CycleStart;
-
XMLNode& state (bool full);
int set_state (const XMLNode&, int version);
/* Panning */
static int disable_panners (void);
XMLNode& state (bool full);
int set_state (const XMLNode&, int version);
/* Panning */
static int disable_panners (void);
- static
int reset_panners (void
);
+ static
void reset_panners (
);
- boost::shared_ptr<Panner> panner() const { return _panner; }
+ boost::shared_ptr<PannerShell> panner_shell() const { return _panshell; }
+ boost::shared_ptr<Panner> panner() const;
+ void unpan ();
void reset_panner ();
void defer_pan_reset ();
void allow_pan_reset ();
uint32_t pans_required() const { return _configured_input.n_audio(); }
void reset_panner ();
void defer_pan_reset ();
void allow_pan_reset ();
uint32_t pans_required() const { return _configured_input.n_audio(); }
- void start_pan_touch (uint32_t which);
- void end_pan_touch (uint32_t which);
+ virtual uint32_t pan_outs() const;
protected:
Role _role;
BufferSet* _output_buffers;
gain_t _current_gain;
protected:
Role _role;
BufferSet* _output_buffers;
gain_t _current_gain;
- nframes_t _output_offset;
+ boost::shared_ptr<PannerShell> _panshell;
+
+ gain_t target_gain ();
+
+ private:
bool _no_outs_cuz_we_no_monitor;
bool _no_outs_cuz_we_no_monitor;
- uint32_t _solo_level;
- bool _solo_isolated;
boost::shared_ptr<MuteMaster> _mute_master;
boost::shared_ptr<MuteMaster> _mute_master;
- bool no_panner_reset;
- boost::shared_ptr<Panner> _panner;
-
+
static bool panners_legal;
static bool panners_legal;
- static PBD::Signal0<
int>
PannersLegal;
+ static PBD::Signal0<
void>
PannersLegal;
-
int
panners_became_legal ();
+
void
panners_became_legal ();
PBD::ScopedConnection panner_legal_c;
void output_changed (IOChange, void*);
PBD::ScopedConnection panner_legal_c;
void output_changed (IOChange, void*);
-
gain_t target_gain ()
;
+
bool _no_panner_reset
;
};
};