smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

Monitor new signal to rebuild sendlist

Browse source 
remove debug lines, remove last FB bus works
This commit is contained in:
Len Ovens 2019-08-26 17:47:21 -07:00
parent 220fa45d35
commit fa94741f2c
2 changed files with 3 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

33
gtk2_ardour/foldback_strip.cc
View file

@ -94,7 +94,6 @@ FoldbackSend::FoldbackSend (boost::shared_ptr<Send> snd, \
{ {
//Gtk::HBox * snd_but_pan = new Gtk::HBox ();
HBox * snd_but_pan = new HBox (); HBox * snd_but_pan = new HBox ();
_button.set_distinct_led_click (true); _button.set_distinct_led_click (true);
@ -486,7 +485,6 @@ FoldbackStrip::set_route (boost::shared_ptr<Route> rt)
set_stuff_from_route (); set_stuff_from_route ();
_session->DirtyChanged.connect (route_connections, invalidator (*this), boost::bind (&FoldbackStrip::update_send_box, this), gui_context());
/* now force an update of all the various elements */ /* now force an update of all the various elements */
update_mute_display (); update_mute_display ();
@ -502,6 +500,8 @@ FoldbackStrip::set_route (boost::shared_ptr<Route> rt)
insert_box->show (); insert_box->show ();
update_send_box (); update_send_box ();
_session->FBSendsChanged.connect (route_connections, invalidator (*this), boost::bind (&FoldbackStrip::update_send_box, this), gui_context());
global_frame.show(); global_frame.show();
global_vpacker.show(); global_vpacker.show();
mute_solo_table.show(); mute_solo_table.show();
@ -522,64 +522,40 @@ FoldbackStrip::set_route (boost::shared_ptr<Route> rt)
void void
FoldbackStrip::update_send_box () FoldbackStrip::update_send_box ()
{ {
std::cout << "update_send_box\n";
clear_send_box (); clear_send_box ();
if (!_route) { if (!_route) {
return; return;
} }
std::cout << "update_send_box get fedby\n";
Route::FedBy fed_by = _route->fed_by(); Route::FedBy fed_by = _route->fed_by();
std::cout << "update_send_box got fedby\n";
for (Route::FedBy::iterator i = fed_by.begin(); i != fed_by.end(); ++i) { for (Route::FedBy::iterator i = fed_by.begin(); i != fed_by.end(); ++i) {
std::cout << "update_send_box route: " << i->r.lock()->name() << " \n";
if (i->sends_only) { if (i->sends_only) {
boost::shared_ptr<Route> s_rt (i->r.lock()); boost::shared_ptr<Route> s_rt (i->r.lock());
std::cout << "update_send_box sends only for " << s_rt->name() << " \n";
boost::shared_ptr<Send> snd = s_rt->internal_send_for (_route); boost::shared_ptr<Send> snd = s_rt->internal_send_for (_route);
if (snd) { if (snd) {
std::cout << "update_send_box got send\n";
FoldbackSend * fb_s = new FoldbackSend (snd, s_rt, _route); FoldbackSend * fb_s = new FoldbackSend (snd, s_rt, _route);
std::cout << "update_send_box started new FoldbackSend\n";
send_display.pack_start (*fb_s, Gtk::PACK_SHRINK); send_display.pack_start (*fb_s, Gtk::PACK_SHRINK);
std::cout << "update_send_box FbS packed\n";
fb_s->show (); fb_s->show ();
std::cout << "update_send_box FbS shown\n";
s_rt->processors_changed.connect (_connections, invalidator (*this), boost::bind (&FoldbackStrip::processors_changed, this, _1), gui_context ()); s_rt->processors_changed.connect (_connections, invalidator (*this), boost::bind (&FoldbackStrip::processors_changed, this, _1), gui_context ());
std::cout << "update_send_box sending route changed connected\n";
} }
} }
} }
std::cout << "update_send_box finished\n";
}
void
FoldbackStrip::update_send_box_2 (IOProcessor*,uint32_t)
{
std::cout << "update_send_box_2\n";
update_send_box ();
} }
void void
FoldbackStrip::clear_send_box () FoldbackStrip::clear_send_box ()
{ {
std::cout << "clear_send_box\n";
std::vector< Widget* > snd_list = send_display.get_children (); std::vector< Widget* > snd_list = send_display.get_children ();
_connections.drop_connections (); _connections.drop_connections ();
for (uint32_t i = 0; i < snd_list.size(); i++) { for (uint32_t i = 0; i < snd_list.size(); i++) {
std::cout << "clear_send_box for " << i << "\n";
send_display.remove (*(snd_list[i])); send_display.remove (*(snd_list[i]));
delete snd_list[i]; delete snd_list[i];
std::cout << "clear_send_box deleted " << i << "\n";
} }
std::cout << "clear_send_box for finished\n";
snd_list.clear(); snd_list.clear();
std::cout << "clear_send_box list cleared\n";
} }
void void
FoldbackStrip::processors_changed (RouteProcessorChange) FoldbackStrip::processors_changed (RouteProcessorChange)
{ {
std::cout << "processors_changed\n";
update_send_box (); update_send_box ();
} }
@ -1468,14 +1444,12 @@ FoldbackStrip::route_active_changed ()
void void
FoldbackStrip::copy_processors () FoldbackStrip::copy_processors ()
{ {
// processor_box.processor_operation (ProcessorBox::ProcessorsCopy);
insert_box->processor_operation (ProcessorBox::ProcessorsCopy); insert_box->processor_operation (ProcessorBox::ProcessorsCopy);
} }
void void
FoldbackStrip::cut_processors () FoldbackStrip::cut_processors ()
{ {
// processor_box.processor_operation (ProcessorBox::ProcessorsCut);
insert_box->processor_operation (ProcessorBox::ProcessorsCut); insert_box->processor_operation (ProcessorBox::ProcessorsCut);
} }
@ -1494,7 +1468,6 @@ FoldbackStrip::select_all_processors ()
void void
FoldbackStrip::deselect_all_processors () FoldbackStrip::deselect_all_processors ()
{ {
// processor_box.processor_operation (ProcessorBox::ProcessorsSelectNone);
insert_box->processor_operation (ProcessorBox::ProcessorsSelectNone); insert_box->processor_operation (ProcessorBox::ProcessorsSelectNone);
} }
@ -1572,9 +1545,9 @@ FoldbackStrip::remove_current_fb ()
set_route (next); set_route (next);
_session->remove_route (old_route); _session->remove_route (old_route);
} else { } else {
//_session->remove_route (old_route);
clear_send_box (); clear_send_box ();
RouteUI::self_delete (); RouteUI::self_delete ();
_session->remove_route (old_route);
} }

3
gtk2_ardour/foldback_strip.h
View file

@ -115,7 +115,6 @@ public:
boost::shared_ptr<ARDOUR::Stripable> stripable() const { return RouteUI::stripable(); } boost::shared_ptr<ARDOUR::Stripable> stripable() const { return RouteUI::stripable(); }
// Width get_width_enum () const { return _width; }
void* width_owner () const { return _width_owner; } void* width_owner () const { return _width_owner; }
PannerUI& panner_ui() { return panners; } PannerUI& panner_ui() { return panners; }
@ -126,7 +125,6 @@ public:
void set_route (boost::shared_ptr<ARDOUR::Route>); void set_route (boost::shared_ptr<ARDOUR::Route>);
void set_button_names (); void set_button_names ();
// void show_send (boost::shared_ptr<ARDOUR::Send>);
void revert_to_default_display (); void revert_to_default_display ();
/** @return the delivery that is being edited using our fader; it will be the /** @return the delivery that is being edited using our fader; it will be the
@ -237,7 +235,6 @@ private:
void update_output_display (); void update_output_display ();
void update_send_box (); void update_send_box ();
void update_send_box_2 (ARDOUR::IOProcessor*,uint32_t);
void processors_changed (ARDOUR::RouteProcessorChange); void processors_changed (ARDOUR::RouteProcessorChange);
void clear_send_box (); void clear_send_box ();