bool muted_main () const { return _mute_point & Main; }
bool muted_at (MutePoint mp) const { return _mute_point & mp; }
- bool muted() const { return _mute_point != MutePoint (0) && get_value() != 0.0; }
+ bool muted() const { return _mute_point != MutePoint (0); }
gain_t mute_gain_at (MutePoint) const;
void
AudioDiskstream::non_realtime_input_change ()
{
- cerr << "AD::NRIC ... " << name() << endl;
-
{
Glib::Mutex::Lock lm (state_lock);
boost::shared_ptr<ChannelList> c = channels.reader();
uint32_t n;
- cerr << _name << " RWS!!!\n";
-
if (!recordable()) {
return;
}
return;
}
+ PortSet& ports (_output->ports());
+ output_buffers().attach_buffers (ports, nframes, _output_offset);
+
// this Delivery processor is not a derived type, and thus we assume
// we really can modify the buffers passed in (it is almost certainly
// the main output stage of a Route). Contrast with Send::run_in_place()
gain_t tgain = target_gain ();
if (tgain != _current_gain) {
+
+ /* target gain has changed */
+
Amp::apply_gain (bufs, nframes, _current_gain, tgain);
_current_gain = tgain;
+
+ } else if (tgain == 0.0) {
+
+ /* we were quiet last time, and we're still supposed to be quiet.
+ Silence the outputs, and make sure the buffers are quiet too,
+ */
+
+ _output->silence (nframes);
+ Amp::apply_simple_gain (bufs, nframes, 0.0);
+
+ return;
+
+ } else if (tgain != 1.0) {
+
+ /* target gain has not changed, but is not unity */
+ Amp::apply_simple_gain (bufs, nframes, tgain);
}
// Attach output buffers to port buffers
- PortSet& ports (_output->ports());
- output_buffers().attach_buffers (ports, nframes, _output_offset);
-
if (_panner && _panner->npanners() && !_panner->bypassed()) {
// Use the panner to distribute audio to output port buffers
XMLNode* pan_node = node.child (X_("Panner"));
if (pan_node) {
- cerr << _name << " reset pan state from XML\n";
_panner->set_state (*pan_node);
}
void
Delivery::reset_panner ()
{
- cerr << _name << " reset panner - plegal ? " << panners_legal << endl;
-
if (panners_legal) {
if (!no_panner_reset) {
- cerr << "\treset panner with " << _output->name() << " = " << _output->n_ports()
- << " vs. " << pans_required () << endl;
_panner->reset (_output->n_ports().n_audio(), pans_required());
}
} else {
- cerr << "\tdefer pan reset till later\n";
panner_legal_c.disconnect ();
panner_legal_c = PannersLegal.connect (mem_fun (*this, &Delivery::panners_became_legal));
}
int
Delivery::panners_became_legal ()
{
- cerr << _name << " panners now legal, outputs @ " << _output << " on " << _output->name()
- << " = " << _output->n_ports() << " vs. " << pans_required() << endl;
_panner->reset (_output->n_ports().n_audio(), pans_required());
_panner->load (); // automation
panner_legal_c.disconnect ();
gain_t desired_gain;
MuteMaster::MutePoint mp;
+ switch (_role) {
+ case Main:
+ mp = MuteMaster::Main;
+ break;
+ case Listen:
+ mp = MuteMaster::Listen;
+ break;
+ case Send:
+ case Insert:
+ if (_placement == PreFader) {
+ mp = MuteMaster::PreFader;
+ } else {
+ mp = MuteMaster::PostFader;
+ }
+ break;
+ }
+
if (_solo_level) {
desired_gain = 1.0;
} else {
if (_solo_isolated) {
- switch (_role) {
- case Main:
- mp = MuteMaster::Main;
- break;
- case Listen:
- mp = MuteMaster::Listen;
- break;
- case Send:
- case Insert:
- if (_placement == PreFader) {
- mp = MuteMaster::PreFader;
- } else {
- mp = MuteMaster::PostFader;
- }
- break;
- }
-
desired_gain = _mute_master->mute_gain_at (mp);
- } else if (_session.soloing()) {
- switch (_role) {
- case Main:
- mp = MuteMaster::Main;
- break;
- case Listen:
- mp = MuteMaster::Listen;
- break;
- case Send:
- case Insert:
- if (_placement == PreFader) {
- mp = MuteMaster::PreFader;
- } else {
- mp = MuteMaster::PostFader;
- }
- break;
- }
+ } else if (_session.soloing()) {
desired_gain = min (Config->get_solo_mute_gain(), _mute_master->mute_gain_at (mp));
+
} else {
- desired_gain = 1.0;
+ desired_gain = _mute_master->mute_gain_at (mp);
}
}
#include "ardour/io.h"
#include "ardour/location.h"
#include "ardour/midi_track.h"
+#include "ardour/mute_master.h"
#include "ardour/panner.h"
#include "ardour/route_group.h"
#include "ardour/session.h"
ExportProfileManager::TimeFormat _ExportProfileManager_TimeFormat;
Delivery::Role _Delivery_Role;
IO::Direction _IO_Direction;
+ MuteMaster::MutePoint _MuteMaster_MutePoint;
#define REGISTER(e) enum_writer->register_distinct (typeid(e).name(), i, s); i.clear(); s.clear()
#define REGISTER_BITS(e) enum_writer->register_bits (typeid(e).name(), i, s); i.clear(); s.clear()
REGISTER_CLASS_ENUM (Delivery, Main);
REGISTER_BITS (_Delivery_Role);
+ REGISTER_CLASS_ENUM (MuteMaster, PreFader);
+ REGISTER_CLASS_ENUM (MuteMaster, PostFader);
+ REGISTER_CLASS_ENUM (MuteMaster, Listen);
+ REGISTER_CLASS_ENUM (MuteMaster, Main);
+ REGISTER (_MuteMaster_MutePoint);
+
REGISTER_CLASS_ENUM (IO, Input);
REGISTER_CLASS_ENUM (IO, Output);
REGISTER (_IO_Direction);
_active = true;
pending_state_node = 0;
setup_bundles ();
- cerr << "+++ IO created with name = " << _name << endl;
}
IO::IO (Session& s, const XMLNode& node, DataType dt)
pending_state_node = 0;
set_state (node);
-
setup_bundles ();
- cerr << "+++ IO created from XML with name = " << _name << endl;
}
IO::~IO ()
{
bool changed = false;
- cerr << "Ensure that IO " << _name << '/' << (_direction == Input ? "input" : "output")
- << " has " << count << endl;
-
if (count == n_ports() && !clear) {
- cerr << "\talready has " << n_ports() << endl;
return 0;
}
_session.set_dirty ();
}
- cerr << "\t@" << this << " established with " << n_ports() << endl;
-
return 0;
}
get_port_counts (node, n, c);
- cerr << _name << " got " << n << " from XML node" << endl;
-
if (ensure_ports (n, true, true, this)) {
error << string_compose(_("%1: cannot create I/O ports"), _name) << endmsg;
return -1;
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <iostream>
#include "ardour/mute_master.h"
#include "ardour/rc_configuration.h"
/* convenience wrapper around AutomationControl method */
if (yn) {
- set_value (1.0f);
+ set_value ((float) 0xffff);
} else {
set_value (0.0f);
}
void
MuteMaster::set_value (float f)
{
- mute_at ((MutePoint) ((int) rint (f)));
+ MutePoint old = _mute_point;
+ _mute_point = (MutePoint) (rint (f));
+ if (old != _mute_point) {
+ MutePointChanged (); // EMIT SIGNAL
+ }
}
float
bool changed = false;
bool do_not_and_did_not_need_panning = ((nouts < 2) && (outputs.size() < 2));
- cerr << "panner " << _name << " reset to " << nouts << " / " << npans << endl;
-
/* if new and old config don't need panning, or if
the config hasn't changed, we're done.
*/
has_meter_processor = true;
}
- cerr << _name << " setting up proc state for " << prop->value() << endl;
-
o = i;
if (prop->value() != "meter" && prop->value() != "amp" && prop->value() != "main-outs") {
// create it and move it to the correct location
if (o == _processors.end()) {
- cerr << "\tproc not in list\n";
-
if (add_processor_from_xml (**niter, i)) {
--i; // move iterator to the newly inserted processor
} else {
// ensure it is at the location provided in the XML state
} else {
- cerr << "\tproc in wrong place in list\n";
-
if (i != o) {
boost::shared_ptr<Processor> tmp = (*o);
_processors.erase (o); // remove the old copy
--i; // move iterator to the correct processor
}
- cerr << "\tnow reset proc " << (*i)->name() << endl;
(*i)->set_state (**niter);
}
}
void
Session::route_solo_changed (void* src, boost::weak_ptr<Route> wpr)
{
+ cerr << "RSC sud = " << solo_update_disabled << endl;
+
if (solo_update_disabled) {
// We know already
return;
delta = -1;
}
+ cerr << "\tshift solo level by " << delta << endl;
+
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+
if ((*i)->feeds (route->input())) {
/* do it */
}
}
- /* now figure out if anything is soloed */
+ /* make sure master is never muted by solo */
+
+ if (_master_out->main_outs()->solo_level() == 0) {
+ _master_out->main_outs()->mod_solo_level (1);
+ }
+
+ /* now figure out if anything that matters is soloed */
bool something_soloed = false;
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->soloed()) {
+ if (!(*i)->is_master() && !(*i)->is_hidden() && (*i)->soloed()) {
something_soloed = true;
break;
}
} else if (obj_T == typeid (Route).name() || obj_T == typeid (AudioTrack).name() || obj_T == typeid(MidiTrack).name()) {
if (boost::shared_ptr<Route> r = route_by_id(id)) {
return new MementoCommand<Route>(*r, before, after);
+ } else {
+ error << string_compose (X_("Route %1 not found in session"), id) << endmsg;
}
} else if (obj_T == typeid (Evoral::Curve).name() || obj_T == typeid (AutomationList).name()) {
std::map<PBD::ID, AutomationList*>::iterator i = automation_lists.find(id);
projects / ardour.git / commitdiff