projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove C++11'ism
[ardour.git]
/
libs
/
ardour
/
ardour
/
return.h
diff --git
a/libs/ardour/ardour/return.h
b/libs/ardour/ardour/return.h
index 1a33795a37aae402bf865c32e4a85094bd3c4b36..0dbf5eb1d38151f27a6efdf0abb86479902c3ff4 100644
(file)
--- a/
libs/ardour/ardour/return.h
+++ b/
libs/ardour/ardour/return.h
@@
-1,6
+1,6
@@
/*
Copyright (C) 2009 Paul Davis
/*
Copyright (C) 2009 Paul Davis
- Author: Dav
e
Robillard
+ Author: Dav
id
Robillard
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-21,51
+21,51
@@
#ifndef __ardour_return_h__
#define __ardour_return_h__
#ifndef __ardour_return_h__
#define __ardour_return_h__
-#include <sigc++/signal.h>
#include <string>
#include "pbd/stateful.h"
#include "ardour/ardour.h"
#include <string>
#include "pbd/stateful.h"
#include "ardour/ardour.h"
-#include "ardour/audioengine.h"
#include "ardour/io_processor.h"
namespace ARDOUR {
class Amp;
class PeakMeter;
#include "ardour/io_processor.h"
namespace ARDOUR {
class Amp;
class PeakMeter;
+class GainControl;
-class Return : public IOProcessor
+class
LIBARDOUR_API
Return : public IOProcessor
{
public:
Return (Session&, bool internal = false);
{
public:
Return (Session&, bool internal = false);
- Return (Session&, const XMLNode&, bool internal = false);
virtual ~Return ();
uint32_t bit_slot() const { return _bitslot; }
virtual ~Return ();
uint32_t bit_slot() const { return _bitslot; }
- void run (BufferSet& bufs, s
frames_t start_frame, sframes_t end_frame, nframes_t nframes
);
+ void run (BufferSet& bufs, s
amplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool
);
boost::shared_ptr<Amp> amp() const { return _amp; }
boost::shared_ptr<PeakMeter> meter() const { return _meter; }
boost::shared_ptr<Amp> amp() const { return _amp; }
boost::shared_ptr<PeakMeter> meter() const { return _meter; }
+ boost::shared_ptr<GainControl> gain_control() const { return _gain_control; }
bool metering() const { return _metering; }
void set_metering (bool yn) { _metering = yn; }
bool metering() const { return _metering; }
void set_metering (bool yn) { _metering = yn; }
- XMLNode& state(bool full);
- XMLNode& get_state(void);
- int set_state(const XMLNode& node);
+ int set_state(const XMLNode&, int version);
uint32_t pans_required() const { return _configured_input.n_audio(); }
uint32_t pans_required() const { return _configured_input.n_audio(); }
- bool can_support_io_configuration (const ChanCount& in, ChanCount& out)
const
;
+ bool can_support_io_configuration (const ChanCount& in, ChanCount& out);
bool configure_io (ChanCount in, ChanCount out);
static uint32_t how_many_returns();
bool configure_io (ChanCount in, ChanCount out);
static uint32_t how_many_returns();
- static void make_unique (XMLNode &, Session &);
+ static std::string name_and_id_new_return (Session&, uint32_t&);
+
+protected:
+ XMLNode& state();
- protected:
bool _metering;
bool _metering;
+ boost::shared_ptr<GainControl> _gain_control;
boost::shared_ptr<Amp> _amp;
boost::shared_ptr<PeakMeter> _meter;
boost::shared_ptr<Amp> _amp;
boost::shared_ptr<PeakMeter> _meter;
@@
-73,10
+73,9
@@
private:
/* disallow copy construction */
Return (const Return&);
/* disallow copy construction */
Return (const Return&);
- uint32_t
_bitslot;
+ uint32_t _bitslot;
- void collect_input (BufferSet& bufs, nframes_t nframes, ChanCount offset=ChanCount::ZERO);
- void just_meter_input (sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
+ void collect_input (BufferSet& bufs, pframes_t nframes, ChanCount offset = ChanCount::ZERO);
};
} // namespace ARDOUR
};
} // namespace ARDOUR