smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-03 20:29:35 +01:00
Code Issues Projects Releases Wiki Activity

rename Route::is_hidden() to Route::is_auditioner() and Route::Hidden to Route::Auditioner. this has been the meaning of these terms for years now and it would be better to make it explicit

Browse source
This commit is contained in:
Paul Davis 2013-04-06 16:04:02 -04:00
parent 2a1b4bff48
commit cd6cbba299
17 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/editor.cc
View file

@ -4867,7 +4867,7 @@ Editor::add_routes (RouteList& routes)
for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
boost::shared_ptr<Route> route = (*x);
if (route->is_hidden() || route->is_monitor()) {
if (route->is_auditioner() || route->is_monitor()) {
continue;
}

4
gtk2_ardour/gain_meter.cc
View file

@ -186,7 +186,7 @@ GainMeterBase::set_controls (boost::shared_ptr<Route> r,
setup_gain_adjustment ();
if (!_route || !_route->is_hidden()) {
if (!_route || !_route->is_auditioner()) {
using namespace Menu_Helpers;
@ -926,7 +926,7 @@ GainMeter::set_controls (boost::shared_ptr<Route> r,
hbox.pack_start (meter_alignment, true, true);
// if (r && !r->is_hidden()) {
// if (r && !r->is_auditioner()) {
// fader_vbox->pack_start (gain_automation_state_button, false, false, 0);
// }

2
gtk2_ardour/mixer_ui.cc
View file

@ -321,7 +321,7 @@ Mixer_UI::add_strips (RouteList& routes)
for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
boost::shared_ptr<Route> route = (*x);
if (route->is_hidden()) {
if (route->is_auditioner()) {
continue;
}

2
gtk2_ardour/route_params_ui.cc
View file

@ -165,7 +165,7 @@ RouteParams_UI::add_routes (RouteList& routes)
for (RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
boost::shared_ptr<Route> route = (*x);
if (route->is_hidden()) {
if (route->is_auditioner()) {
return;
}

2
gtk2_ardour/route_time_axis.cc
View file

@ -124,7 +124,7 @@ RouteTimeAxisView::set_route (boost::shared_ptr<Route> rt)
set_height (preset_height (HeightNormal));
}
if (!_route->is_hidden()) {
if (!_route->is_auditioner()) {
if (gui_property ("visible").empty()) {
set_gui_property ("visible", true);
}

4
libs/ardour/ardour/route.h
View file

@ -74,7 +74,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
typedef std::list<boost::shared_ptr<Processor> > ProcessorList;
enum Flag {
Hidden = 0x1,
Auditioner = 0x1,
MasterOut = 0x2,
MonitorOut = 0x4
};
@ -106,7 +106,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember,
void set_order_key (RouteSortOrderKey, uint32_t);
void sync_order_keys (RouteSortOrderKey);
bool is_hidden() const { return _flags & Hidden; }
bool is_auditioner() const { return _flags & Auditioner; }
bool is_master() const { return _flags & MasterOut; }
bool is_monitor() const { return _flags & MonitorOut; }

2
libs/ardour/audio_track.cc
View file

@ -62,7 +62,7 @@ AudioTrack::create_diskstream ()
{
AudioDiskstream::Flag dflags = AudioDiskstream::Flag (0);
if (_flags & Hidden) {
if (_flags & Auditioner) {
dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Hidden);
} else {
dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Recordable);

2
libs/ardour/auditioner.cc
View file

@ -40,7 +40,7 @@ using namespace PBD;
#include "i18n.h"
Auditioner::Auditioner (Session& s)
: AudioTrack (s, "auditioner", Route::Hidden)
: AudioTrack (s, "auditioner", Route::Auditioner)
, current_frame (0)
, _auditioning (0)
, length (0)

2
libs/ardour/enums.cc
View file

@ -398,7 +398,7 @@ setup_enum_writer ()
REGISTER_CLASS_ENUM (Session, pullup_Minus4Minus1);
REGISTER (_Session_PullupFormat);
REGISTER_CLASS_ENUM (Route, Hidden);
REGISTER_CLASS_ENUM (Route, Auditioner);
REGISTER_CLASS_ENUM (Route, MasterOut);
REGISTER_CLASS_ENUM (Route, MonitorOut);
REGISTER_BITS (_Route_Flag);

2
libs/ardour/midi_track.cc
View file

@ -83,7 +83,7 @@ MidiTrack::create_diskstream ()
{
MidiDiskstream::Flag dflags = MidiDiskstream::Flag (0);
if (_flags & Hidden) {
if (_flags & Auditioner) {
dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Hidden);
} else {
dflags = MidiDiskstream::Flag (dflags | MidiDiskstream::Recordable);

14
libs/ardour/route.cc
View file

@ -161,7 +161,7 @@ Route::init ()
_monitor_control->activate ();
}
if (is_master() || is_monitor() || is_hidden()) {
if (is_master() || is_monitor() || is_auditioner()) {
_mute_master->set_solo_ignore (true);
}
@ -308,7 +308,7 @@ Route::sync_order_keys (RouteSortOrderKey base)
void
Route::set_remote_control_id_from_order_key (RouteSortOrderKey /*key*/, uint32_t rid)
{
if (is_master() || is_monitor() || is_hidden()) {
if (is_master() || is_monitor() || is_auditioner()) {
/* hard-coded remote IDs, or no remote ID */
return;
}
@ -779,7 +779,7 @@ Route::set_mute_master_solo ()
void
Route::set_solo_isolated (bool yn, void *src)
{
if (is_master() || is_monitor() || is_hidden()) {
if (is_master() || is_monitor() || is_auditioner()) {
return;
}
@ -793,7 +793,7 @@ Route::set_solo_isolated (bool yn, void *src)
boost::shared_ptr<RouteList> routes = _session.get_routes ();
for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
if ((*i).get() == this || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden()) {
if ((*i).get() == this || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_auditioner()) {
continue;
}
@ -1996,7 +1996,7 @@ Route::set_state (const XMLNode& node, int version)
_flags = Flag (0);
}
if (is_master() || is_monitor() || is_hidden()) {
if (is_master() || is_monitor() || is_auditioner()) {
_mute_master->set_solo_ignore (true);
}
@ -2212,7 +2212,7 @@ Route::set_state_2X (const XMLNode& node, int version)
_flags = Flag (0);
}
if (is_master() || is_monitor() || is_hidden()) {
if (is_master() || is_monitor() || is_auditioner()) {
_mute_master->set_solo_ignore (true);
}
@ -4242,7 +4242,7 @@ Route::fill_buffers_with_input (BufferSet& bufs, boost::shared_ptr<IO> io, pfram
case nothing was fed into it from the inputs at all.
*/
if (!is_hidden()) {
if (!is_auditioner()) {
bufs.set_count (io->n_ports());
}
}

18
libs/ardour/session.cc
View file

@ -1615,7 +1615,7 @@ Session::count_existing_track_channels (ChanCount& in, ChanCount& out)
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
if (tr && !tr->is_hidden()) {
if (tr && !tr->is_auditioner()) {
in += tr->n_inputs();
out += tr->n_outputs();
}
@ -2246,7 +2246,7 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool
*/
if (!r->has_order_key (EditorSort)) {
if (r->is_hidden()) {
if (r->is_auditioner()) {
/* use an arbitrarily high value */
r->set_order_key (EditorSort, UINT_MAX);
r->set_order_key (MixerSort, UINT_MAX);
@ -2471,7 +2471,7 @@ Session::route_listen_changed (void* /*src*/, boost::weak_ptr<Route> wpr)
/* new listen: disable all other listen */
boost::shared_ptr<RouteList> r = routes.reader ();
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden()) {
if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_auditioner()) {
continue;
}
(*i)->set_listen (false, this);
@ -2553,7 +2553,7 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
/* new solo: disable all other solos, but not the group if its solo-enabled */
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden() ||
if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_auditioner() ||
(leave_group_alone && ((*i)->route_group() == rg))) {
continue;
}
@ -2573,7 +2573,7 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p
bool via_sends_only;
bool in_signal_flow;
if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_hidden() ||
if ((*i) == route || (*i)->solo_isolated() || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_auditioner() ||
(leave_group_alone && ((*i)->route_group() == rg))) {
continue;
}
@ -2662,11 +2662,11 @@ Session::update_route_solo_state (boost::shared_ptr<RouteList> r)
}
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
if (!(*i)->is_master() && !(*i)->is_monitor() && !(*i)->is_hidden() && (*i)->self_soloed()) {
if (!(*i)->is_master() && !(*i)->is_monitor() && !(*i)->is_auditioner() && (*i)->self_soloed()) {
something_soloed = true;
}
if (!(*i)->is_hidden() && (*i)->listening_via_monitor()) {
if (!(*i)->is_auditioner() && (*i)->listening_via_monitor()) {
if (Config->get_solo_control_is_listen_control()) {
listeners++;
} else {
@ -4621,7 +4621,7 @@ Session::post_playback_latency ()
boost::shared_ptr<RouteList> r = routes.reader ();
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
if (!(*i)->is_hidden() && ((*i)->active())) {
if (!(*i)->is_auditioner() && ((*i)->active())) {
_worst_track_latency = max (_worst_track_latency, (*i)->update_signal_latency ());
}
}
@ -4727,7 +4727,7 @@ Session::update_latency_compensation (bool force_whole_graph)
boost::shared_ptr<RouteList> r = routes.reader ();
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
if (!(*i)->is_hidden() && ((*i)->active())) {
if (!(*i)->is_auditioner() && ((*i)->active())) {
framecnt_t tl;
if ((*i)->signal_latency () != (tl = (*i)->update_signal_latency ())) {
some_track_latency_changed = true;

8
libs/ardour/session_process.cc
View file

@ -125,7 +125,7 @@ Session::no_roll (pframes_t nframes)
PT_TIMING_CHECK (10);
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
if ((*i)->is_hidden()) {
if ((*i)->is_auditioner()) {
continue;
}
@ -170,7 +170,7 @@ Session::process_routes (pframes_t nframes, bool& need_butler)
int ret;
if ((*i)->is_hidden()) {
if ((*i)->is_auditioner()) {
continue;
}
@ -210,7 +210,7 @@ Session::silent_process_routes (pframes_t nframes, bool& need_butler)
int ret;
if ((*i)->is_hidden()) {
if ((*i)->is_auditioner()) {
continue;
}
@ -863,7 +863,7 @@ Session::process_audition (pframes_t nframes)
boost::shared_ptr<RouteList> r = routes.reader ();
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
if (!(*i)->is_hidden()) {
if (!(*i)->is_auditioner()) {
(*i)->silence (nframes);
}
}

18
libs/ardour/session_rtevents.cc
View file

@ -42,7 +42,7 @@ void
Session::rt_set_monitoring (boost::shared_ptr<RouteList> rl, MonitorChoice mc, bool /* group_override */)
{
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
if (!(*i)->is_hidden()) {
if (!(*i)->is_auditioner()) {
boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (*i);
if (t) {
t->set_monitoring (mc);
@ -63,7 +63,7 @@ void
Session::rt_set_solo (boost::shared_ptr<RouteList> rl, bool yn, bool /* group_override */)
{
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
if (!(*i)->is_hidden()) {
if (!(*i)->is_auditioner()) {
(*i)->set_solo (yn, this);
}
}
@ -84,7 +84,7 @@ void
Session::rt_cancel_solo_after_disconnect (boost::shared_ptr<RouteList> rl, bool upstream, bool /* group_override */)
{
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
if (!(*i)->is_hidden()) {
if (!(*i)->is_auditioner()) {
(*i)->cancel_solo_after_disconnect (upstream);
}
}
@ -112,7 +112,7 @@ Session::rt_set_just_one_solo (boost::shared_ptr<RouteList> just_one, bool yn, b
boost::shared_ptr<Route> r = just_one->front();
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
if (!(*i)->is_hidden() && r != *i) {
if (!(*i)->is_auditioner() && r != *i) {
(*i)->set_solo (!yn, (*i)->route_group());
}
}
@ -132,7 +132,7 @@ void
Session::rt_set_listen (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/ )
{
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
if (!(*i)->is_hidden()) {
if (!(*i)->is_auditioner()) {
(*i)->set_listen (yn, this);
}
}
@ -150,7 +150,7 @@ void
Session::rt_set_mute (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/)
{
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
if (!(*i)->is_monitor() && !(*i)->is_hidden()) {
if (!(*i)->is_monitor() && !(*i)->is_auditioner()) {
(*i)->set_mute (yn, this);
}
}
@ -168,7 +168,7 @@ void
Session::rt_set_solo_isolated (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/)
{
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
if (!(*i)->is_master() && !(*i)->is_monitor() && !(*i)->is_hidden()) {
if (!(*i)->is_master() && !(*i)->is_monitor() && !(*i)->is_auditioner()) {
(*i)->set_solo_isolated (yn, this);
}
}
@ -191,7 +191,7 @@ Session::set_record_enabled (boost::shared_ptr<RouteList> rl, bool yn, SessionEv
*/
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
if ((*i)->is_hidden()) {
if ((*i)->is_auditioner()) {
continue;
}
@ -209,7 +209,7 @@ void
Session::rt_set_record_enabled (boost::shared_ptr<RouteList> rl, bool yn, bool group_override)
{
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
if ((*i)->is_hidden()) {
if ((*i)->is_auditioner()) {
continue;
}

2
libs/ardour/session_state.cc
View file

@ -1139,7 +1139,7 @@ Session::state (bool full_state)
}
for (RouteList::iterator i = public_order.begin(); i != public_order.end(); ++i) {
if (!(*i)->is_hidden()) {
if (!(*i)->is_auditioner()) {
if (full_state) {
child->add_child_nocopy ((*i)->get_state());
} else {

2
libs/ardour/session_transport.cc
View file

@ -491,7 +491,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
boost::shared_ptr<RouteList> r = routes.reader ();
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
if (!(*i)->is_hidden()) {
if (!(*i)->is_auditioner()) {
(*i)->set_pending_declick (0);
}
}

2
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -261,7 +261,7 @@ MackieControlProtocol::get_sorted_routes()
continue;
}
if (route->is_hidden() || route->is_master() || route->is_monitor()) {
if (route->is_auditioner() || route->is_master() || route->is_monitor()) {
continue;
}