X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fredirect_box.cc;h=fcd04c9bd7c51dd4bc7e676af9d5d36f56c12612;hb=2592a320d42dd4a157ee16101c042d875d3142be;hp=54179f54ef9d7eb8d97ea504b8d2e1f2da712108;hpb=3436df6eabaefa19b2572a2765e6d8ac08942c9d;p=ardour.git diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc index 54179f54ef..fcd04c9bd7 100644 --- a/gtk2_ardour/redirect_box.cc +++ b/gtk2_ardour/redirect_box.cc @@ -19,10 +19,13 @@ */ #include -#include #include +#include + +#include + #include #include #include @@ -35,7 +38,7 @@ #include #include #include -#include +#include #include #include #include @@ -44,7 +47,6 @@ #include "ardour_ui.h" #include "ardour_dialog.h" -#include "ardour_message.h" #include "public_editor.h" #include "redirect_box.h" #include "keyboard.h" @@ -52,7 +54,6 @@ #include "route_redirect_selection.h" #include "mixer_ui.h" #include "actions.h" - #include "plugin_ui.h" #include "send_ui.h" #include "io_selector.h" @@ -61,16 +62,24 @@ #include "i18n.h" +#ifdef HAVE_AUDIOUNIT +#include "au_pluginui.h" +#endif + using namespace sigc; using namespace ARDOUR; +using namespace PBD; using namespace Gtk; using namespace Glib; using namespace Gtkmm2ext; RedirectBox* RedirectBox::_current_redirect_box = 0; +RefPtr RedirectBox::paste_action; +bool RedirectBox::get_colors = true; +Gdk::Color* RedirectBox::active_redirect_color; +Gdk::Color* RedirectBox::inactive_redirect_color; - -RedirectBox::RedirectBox (Placement pcmnt, Session& sess, Route& rt, PluginSelector &plugsel, +RedirectBox::RedirectBox (Placement pcmnt, Session& sess, boost::shared_ptr rt, PluginSelector &plugsel, RouteRedirectSelection & rsel, bool owner_is_mixer) : _route(rt), _session(sess), @@ -78,13 +87,22 @@ RedirectBox::RedirectBox (Placement pcmnt, Session& sess, Route& rt, PluginSelec _placement(pcmnt), _plugin_selector(plugsel), _rr_selection(rsel) - //redirect_display (1) { + if (get_colors) { + active_redirect_color = new Gdk::Color; + inactive_redirect_color = new Gdk::Color; + set_color (*active_redirect_color, rgba_from_style ("RedirectSelector", 0xff, 0, 0, 0, "fg", Gtk::STATE_ACTIVE, false )); + set_color (*inactive_redirect_color, rgba_from_style ("RedirectSelector", 0xff, 0, 0, 0, "fg", Gtk::STATE_NORMAL, false )); + get_colors = false; + } + _width = Wide; redirect_menu = 0; send_action_menu = 0; redirect_drag_in_progress = false; - + no_redirect_redisplay = false; + ignore_delete = false; + model = ListStore::create(columns); RefPtr selection = redirect_display.get_selection(); @@ -92,86 +110,73 @@ RedirectBox::RedirectBox (Placement pcmnt, Session& sess, Route& rt, PluginSelec selection->signal_changed().connect (mem_fun (*this, &RedirectBox::selection_changed)); redirect_display.set_model (model); - redirect_display.append_column ("WHY?", columns.text); - redirect_display.set_name ("MixerRedirectSelector"); + redirect_display.append_column (X_("notshown"), columns.text); + redirect_display.set_name ("RedirectSelector"); redirect_display.set_headers_visible (false); redirect_display.set_reorderable (true); - redirect_display.set_size_request (-1, 48); + redirect_display.set_size_request (-1, 40); + redirect_display.get_column(0)->set_sizing(TREE_VIEW_COLUMN_FIXED); + redirect_display.get_column(0)->set_fixed_width(48); redirect_display.add_object_drag (columns.redirect.index(), "redirects"); redirect_display.signal_object_drop.connect (mem_fun (*this, &RedirectBox::object_drop)); - // Does this adequately replace the drag start/stop signal handlers? - model->signal_rows_reordered().connect (mem_fun (*this, &RedirectBox::redirects_reordered)); + TreeViewColumn* name_col = redirect_display.get_column(0); + CellRendererText* renderer = dynamic_cast(redirect_display.get_column_cell_renderer (0)); + name_col->add_attribute(renderer->property_foreground_gdk(), columns.color); + redirect_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); + + model->signal_row_deleted().connect (mem_fun (*this, &RedirectBox::row_deleted)); redirect_scroller.add (redirect_display); redirect_eventbox.add (redirect_scroller); - pack_start (redirect_eventbox, true, true); + + redirect_scroller.set_size_request (-1, 40); - redirect_scroller.show (); - redirect_display.show (); - redirect_eventbox.show (); - show_all (); + pack_start (redirect_eventbox, true, true); - _route.redirects_changed.connect (mem_fun(*this, &RedirectBox::redirects_changed)); + _route->redirects_changed.connect (mem_fun(*this, &RedirectBox::redisplay_redirects)); redirect_eventbox.signal_enter_notify_event().connect (bind (sigc::ptr_fun (RedirectBox::enter_box), this)); - //redirect_eventbox.signal_leave_notify_event().connect (bind (sigc::ptr_fun (RedirectBox::leave_box), this)); - - redirect_display.signal_button_press_event().connect (mem_fun(*this, &RedirectBox::redirect_button)); - redirect_display.signal_button_release_event().connect (mem_fun(*this, &RedirectBox::redirect_button)); - //redirect_display.signal_button_release_event().connect_after (ptr_fun (do_not_propagate)); - set_stuff_from_route (); + redirect_display.signal_button_press_event().connect (mem_fun(*this, &RedirectBox::redirect_button_press_event), false); + redirect_display.signal_button_release_event().connect (mem_fun(*this, &RedirectBox::redirect_button_press_event)); /* start off as a passthru strip. we'll correct this, if necessary, in update_diskstream_display(). */ - //set_name ("AudioTrackStripBase"); - /* now force an update of all the various elements */ - redirects_changed (0); - - //add_events (Gdk::BUTTON_RELEASE_MASK); + redisplay_redirects (0); } RedirectBox::~RedirectBox () { -// GoingAway(); /* EMIT_SIGNAL */ - } void -RedirectBox::object_drop (string type, uint32_t cnt, void** ptr) +RedirectBox::object_drop (string type, uint32_t cnt, const boost::shared_ptr* ptr) { - if (type != "redirects") { + if (type != "redirects" || cnt == 0 || !ptr) { return; } -} -void -RedirectBox::set_stuff_from_route () -{ -} + /* do something with the dropped redirects */ -void -RedirectBox::set_title (const std::string & title) -{ - redirect_display.get_column(0)->set_title (title); -} - -void -RedirectBox::set_title_shown (bool flag) -{ + list > redirects; + + for (uint32_t n = 0; n < cnt; ++n) { + redirects.push_back (ptr[n]); + } + + paste_redirect_list (redirects); } - void RedirectBox::update() { - redirects_changed(0); + redisplay_redirects (0); } @@ -183,26 +188,25 @@ RedirectBox::set_width (Width w) } _width = w; - redirects_changed(0); + redisplay_redirects (0); } - void -RedirectBox::remove_redirect_gui (Redirect *redirect) +RedirectBox::remove_redirect_gui (boost::shared_ptr redirect) { - Insert *insert = 0; - Send *send = 0; - PortInsert *port_insert = 0; + boost::shared_ptr insert; + boost::shared_ptr send; + boost::shared_ptr port_insert; - if ((insert = dynamic_cast (redirect)) != 0) { + if ((insert = boost::dynamic_pointer_cast (redirect)) != 0) { - if ((port_insert = dynamic_cast (insert)) != 0) { + if ((port_insert = boost::dynamic_pointer_cast (insert)) != 0) { PortInsertUI *io_selector = reinterpret_cast (port_insert->get_gui()); port_insert->set_gui (0); delete io_selector; } - } else if ((send = dynamic_cast (insert)) != 0) { + } else if ((send = boost::dynamic_pointer_cast (insert)) != 0) { SendUIWindow *sui = reinterpret_cast (send->get_gui()); send->set_gui (0); delete sui; @@ -242,7 +246,9 @@ RedirectBox::show_redirect_menu (gint arg) redirect_menu = build_redirect_menu (); } - redirect_menu->popup (1, 0); + paste_action->set_sensitive (!_rr_selection.redirects.empty()); + + redirect_menu->popup (1, arg); } void @@ -257,84 +263,63 @@ RedirectBox::redirect_drag_end (GdkDragContext *context) redirect_drag_in_progress = false; } -gint -RedirectBox::redirect_button (GdkEventButton *ev) -{ - Redirect *redirect; - TreeModel::Row row = *(redirect_display.get_selection()->get_selected()); - - if (row) - redirect = row[columns.redirect]; - - switch (ev->type) { - case GDK_BUTTON_PRESS: - if (ev->button == 3) { - show_redirect_menu (0); // Handle the context-click menu here as well - return TRUE; - } - else - return FALSE; - - case GDK_2BUTTON_PRESS: - if (ev->state != 0) { - return FALSE; +bool +RedirectBox::redirect_button_press_event (GdkEventButton *ev) +{ + TreeIter iter; + TreeModel::Path path; + TreeViewColumn* column; + int cellx; + int celly; + boost::shared_ptr redirect; + int ret = false; + bool selected = false; + + if (redirect_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) { + if ((iter = model->get_iter (path))) { + redirect = (*iter)[columns.redirect]; + selected = redirect_display.get_selection()->is_selected (iter); } - /* might be edit event, see below */ - break; - - case GDK_BUTTON_RELEASE: - break; - - default: - /* shouldn't be here, but gcc complains */ - return FALSE; + } - + if (redirect && Keyboard::is_delete_event (ev)) { Glib::signal_idle().connect (bind (mem_fun(*this, &RedirectBox::idle_delete_redirect), redirect)); - return TRUE; - - } else if (redirect && (Keyboard::is_edit_event (ev) || ev->type == GDK_2BUTTON_PRESS)) { + ret = true; + + } else if (redirect && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS && ev->state == 0))) { if (_session.engine().connected()) { /* XXX giving an error message here is hard, because we may be in the midst of a button press */ edit_redirect (redirect); } - return TRUE; - + ret = true; + } else if (Keyboard::is_context_menu_event (ev)) { - show_redirect_menu(0); - return TRUE; //stop_signal (*clist, "button-release-event"); - } else { - switch (ev->button) { - case 1: - return FALSE; - break; + show_redirect_menu(ev->time); + ret = true; - case 2: - if (redirect) { - redirect->set_active (!redirect->active(), this); - } - break; + } else if (redirect && ev->button == 2 && ev->state == 0) { + + redirect->set_active (!redirect->active(), this); + ret = true; - case 3: - break; + } + else if (redirect && ev->button == 1 && selected) { - default: - return FALSE; - } + // this is purely informational but necessary + RedirectSelected (redirect); // emit } - - return TRUE; + + return ret; } Menu * RedirectBox::build_redirect_menu () { redirect_menu = dynamic_cast(ActionManager::get_widget("/redirectmenu") ); - redirect_menu->signal_map_event().connect (mem_fun(*this, &RedirectBox::redirect_menu_map_handler)); redirect_menu->set_name ("ArdourContextMenu"); show_all_children(); @@ -346,18 +331,7 @@ void RedirectBox::selection_changed () { bool sensitive = (redirect_display.get_selection()->count_selected_rows()) ? true : false; - - for (vector >::iterator i = ActionManager::plugin_selection_sensitive_actions.begin(); i != ActionManager::plugin_selection_sensitive_actions.end(); ++i) { - (*i)->set_sensitive (sensitive); - } -} - -gint -RedirectBox::redirect_menu_map_handler (GdkEventAny *ev) -{ - // GTK2FIX - // popup_act_grp->get_action("paste")->set_sensitive (!_rr_selection.redirects.empty()); - return FALSE; + ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive); } void @@ -382,32 +356,32 @@ RedirectBox::choose_plugin () } void -RedirectBox::insert_plugin_chosen (Plugin *plugin) +RedirectBox::insert_plugin_chosen (boost::shared_ptr plugin) { if (plugin) { - Redirect *redirect = new PluginInsert (_session, *plugin, _placement); + boost::shared_ptr redirect (new PluginInsert (_session, plugin, _placement)); redirect->active_changed.connect (mem_fun(*this, &RedirectBox::show_redirect_active)); uint32_t err_streams; - if (_route.add_redirect (redirect, this, &err_streams)) { + if (_route->add_redirect (redirect, this, &err_streams)) { wierd_plugin_dialog (*plugin, err_streams, _route); - delete redirect; + // XXX SHAREDPTR delete plugin here .. do we even need to care? } } } void -RedirectBox::wierd_plugin_dialog (Plugin& p, uint32_t streams, IO& io) +RedirectBox::wierd_plugin_dialog (Plugin& p, uint32_t streams, boost::shared_ptr io) { ArdourDialog dialog ("wierd plugin dialog"); Label label; /* i hate this kind of code */ - if (streams > p.get_info().n_inputs) { + if (streams > p.get_info()->n_inputs) { label.set_text (string_compose (_( "You attempted to add a plugin (%1).\n" "The plugin has %2 inputs\n" @@ -417,9 +391,9 @@ RedirectBox::wierd_plugin_dialog (Plugin& p, uint32_t streams, IO& io) "This makes no sense - you are throwing away\n" "part of the signal."), p.name(), - p.get_info().n_inputs, + p.get_info()->n_inputs, streams)); - } else if (streams < p.get_info().n_inputs) { + } else if (streams < p.get_info()->n_inputs) { label.set_text (string_compose (_( "You attempted to add a plugin (%1).\n" "The plugin has %2 inputs\n" @@ -430,7 +404,7 @@ RedirectBox::wierd_plugin_dialog (Plugin& p, uint32_t streams, IO& io) "side-chain inputs. A future version of Ardour will\n" "support this type of configuration."), p.name(), - p.get_info().n_inputs, + p.get_info()->n_inputs, streams)); } else { label.set_text (string_compose (_( @@ -444,10 +418,10 @@ RedirectBox::wierd_plugin_dialog (Plugin& p, uint32_t streams, IO& io) "\n" "Ardour does not understand what to do in such situations.\n"), p.name(), - p.get_info().n_inputs, - p.get_info().n_outputs, - io.n_inputs(), - io.n_outputs(), + p.get_info()->n_inputs, + p.get_info()->n_outputs, + io->n_inputs(), + io->n_outputs(), streams)); } @@ -459,46 +433,42 @@ RedirectBox::wierd_plugin_dialog (Plugin& p, uint32_t streams, IO& io) dialog.set_modal (true); dialog.show_all (); - // GTK2FIX - //dialog.realize(); - //dialog.get_window()->set_decorations (Gdk::WMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH)); - dialog.run (); } void RedirectBox::choose_insert () { - Redirect *redirect = new PortInsert (_session, _placement); + boost::shared_ptr redirect (new PortInsert (_session, _placement)); redirect->active_changed.connect (mem_fun(*this, &RedirectBox::show_redirect_active)); - _route.add_redirect (redirect, this); + _route->add_redirect (redirect, this); } void RedirectBox::choose_send () { - Send *send = new Send (_session, _placement); + boost::shared_ptr send (new Send (_session, _placement)); /* XXX need redirect lock on route */ - send->ensure_io (0, _route.max_redirect_outs(), false, this); + send->ensure_io (0, _route->max_redirect_outs(), false, this); - IOSelectorWindow *ios = new IOSelectorWindow (_session, *send, false, true); + IOSelectorWindow *ios = new IOSelectorWindow (_session, send, false, true); ios->show_all (); - ios->selector().Finished.connect (bind (mem_fun(*this, &RedirectBox::send_io_finished), static_cast(send), ios)); + ios->selector().Finished.connect (bind (mem_fun(*this, &RedirectBox::send_io_finished), boost::static_pointer_cast(send), ios)); } void -RedirectBox::send_io_finished (IOSelector::Result r, Redirect* redirect, IOSelectorWindow* ios) +RedirectBox::send_io_finished (IOSelector::Result r, boost::shared_ptr redirect, IOSelectorWindow* ios) { switch (r) { case IOSelector::Cancelled: - delete redirect; + // delete redirect; XXX SHAREDPTR HOW TO DESTROY THE REDIRECT ? do we even need to think about it? break; case IOSelector::Accepted: - _route.add_redirect (redirect, this); + _route->add_redirect (redirect, this); break; } @@ -506,16 +476,23 @@ RedirectBox::send_io_finished (IOSelector::Result r, Redirect* redirect, IOSelec } void -RedirectBox::redirects_changed (void *src) +RedirectBox::redisplay_redirects (void *src) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &RedirectBox::redirects_changed), src)); - - //redirect_display.freeze (); + ENSURE_GUI_THREAD(bind (mem_fun(*this, &RedirectBox::redisplay_redirects), src)); + + if (no_redirect_redisplay) { + return; + } + + ignore_delete = true; model->clear (); + ignore_delete = false; + redirect_active_connections.clear (); redirect_name_connections.clear (); - _route.foreach_redirect (this, &RedirectBox::add_redirect_to_display); + void (RedirectBox::*pmf)(boost::shared_ptr) = &RedirectBox::add_redirect_to_display; + _route->foreach_redirect (this, pmf); switch (_placement) { case PreFader: @@ -525,37 +502,36 @@ RedirectBox::redirects_changed (void *src) build_redirect_tooltip(redirect_eventbox, _("Post-fader inserts, sends & plugins:")); break; } - //redirect_display.thaw (); } void -RedirectBox::add_redirect_to_display (Redirect *redirect) +RedirectBox::add_redirect_to_display (boost::shared_ptr redirect) { if (redirect->placement() != _placement) { return; } Gtk::TreeModel::Row row = *(model->append()); - row[columns.text] = redirect_name (*redirect); + row[columns.text] = redirect_name (redirect); row[columns.redirect] = redirect; - show_redirect_active (redirect, this); + show_redirect_active (redirect.get(), this); redirect_active_connections.push_back (redirect->active_changed.connect (mem_fun(*this, &RedirectBox::show_redirect_active))); redirect_name_connections.push_back (redirect->name_changed.connect (bind (mem_fun(*this, &RedirectBox::show_redirect_name), redirect))); } string -RedirectBox::redirect_name (Redirect& redirect) +RedirectBox::redirect_name (boost::shared_ptr redirect) { - Send *send; + boost::shared_ptr send; string name_display; - if (!redirect.active()) { + if (!redirect->active()) { name_display = " ("; } - if ((send = dynamic_cast (&redirect)) != 0) { + if ((send = boost::dynamic_pointer_cast (redirect)) != 0) { name_display += '>'; @@ -570,7 +546,7 @@ RedirectBox::redirect_name (Redirect& redirect) name_display += send->name().substr (lbracket+1, lbracket-rbracket-1); break; case Narrow: - name_display += short_version (send->name().substr (lbracket+1, lbracket-rbracket-1), 4); + name_display += PBD::short_version (send->name().substr (lbracket+1, lbracket-rbracket-1), 4); break; } @@ -578,16 +554,16 @@ RedirectBox::redirect_name (Redirect& redirect) switch (_width) { case Wide: - name_display += redirect.name(); + name_display += redirect->name(); break; case Narrow: - name_display += short_version (redirect.name(), 5); + name_display += PBD::short_version (redirect->name(), 5); break; } } - if (!redirect.active()) { + if (!redirect->active()) { name_display += ')'; } @@ -609,62 +585,62 @@ RedirectBox::build_redirect_tooltip (EventBox& box, string start) } void -RedirectBox::show_redirect_name (void* src, Redirect *redirect) +RedirectBox::show_redirect_name (void* src, boost::shared_ptr redirect) { ENSURE_GUI_THREAD(bind (mem_fun(*this, &RedirectBox::show_redirect_name), src, redirect)); - - show_redirect_active (redirect, src); + show_redirect_active (redirect.get(), src); } void -RedirectBox::show_redirect_active (Redirect *redirect, void *src) +RedirectBox::show_redirect_active (Redirect* redirect, void *src) { ENSURE_GUI_THREAD(bind (mem_fun(*this, &RedirectBox::show_redirect_active), redirect, src)); Gtk::TreeModel::Children children = model->children(); Gtk::TreeModel::Children::iterator iter = children.begin(); - while( iter != children.end()) - { - if ((*iter)[columns.redirect] == redirect) - break; - iter++; - } + while (iter != children.end()) { - (*iter)[columns.text] = redirect_name (*redirect); + boost::shared_ptr r = (*iter)[columns.redirect]; - if (redirect->active()) { - redirect_display.get_selection()->select (iter); - } else { - redirect_display.get_selection()->unselect (iter); + if (r.get() == redirect) { + (*iter)[columns.text] = redirect_name (r); + + if (redirect->active()) { + (*iter)[columns.color] = *active_redirect_color; + } else { + (*iter)[columns.color] = *inactive_redirect_color; + } + break; + } + + iter++; } } void -RedirectBox::redirects_reordered (const TreeModel::Path& path,const TreeModel::iterator& iter ,int* hmm) +RedirectBox::row_deleted (const Gtk::TreeModel::Path& path) { - /* this is called before the reorder has been done, so just queue - something for idle time. - */ - - Glib::signal_idle().connect (mem_fun(*this, &RedirectBox::compute_redirect_sort_keys)); + if (!ignore_delete) { + compute_redirect_sort_keys (); + } } -gint +void RedirectBox::compute_redirect_sort_keys () { uint32_t sort_key = 0; Gtk::TreeModel::Children children = model->children(); for (Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) { - Redirect *redirect = (*iter)[columns.redirect]; - redirect->set_sort_key (sort_key, this); + boost::shared_ptr r = (*iter)[columns.redirect]; + r->set_sort_key (sort_key); sort_key++; } - if (_route.sort_redirects ()) { + if (_route->sort_redirects ()) { - redirects_changed (0); + redisplay_redirects (0); /* now tell them about the problem */ @@ -676,7 +652,6 @@ You cannot reorder this set of redirects\n\ in that way because the inputs and\n\ outputs do not work correctly.")); - dialog.get_vbox()->pack_start (label); dialog.add_button (Stock::OK, RESPONSE_ACCEPT); @@ -685,20 +660,14 @@ outputs do not work correctly.")); dialog.set_modal (true); dialog.show_all (); - // GTK2FIX - //dialog.realize(); - //dialog.get_window()->set_decorations (Gdk::WMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH)); - dialog.run (); } - - return FALSE; } void RedirectBox::rename_redirects () { - vector to_be_renamed; + vector > to_be_renamed; get_selected_redirects (to_be_renamed); @@ -706,7 +675,7 @@ RedirectBox::rename_redirects () return; } - for (vector::iterator i = to_be_renamed.begin(); i != to_be_renamed.end(); ++i) { + for (vector >::iterator i = to_be_renamed.begin(); i != to_be_renamed.end(); ++i) { rename_redirect (*i); } } @@ -714,7 +683,7 @@ RedirectBox::rename_redirects () void RedirectBox::cut_redirects () { - vector to_be_removed; + vector > to_be_removed; get_selected_redirects (to_be_removed); @@ -729,7 +698,7 @@ RedirectBox::cut_redirects () _rr_selection.set (to_be_removed); - for (vector::iterator i = to_be_removed.begin(); i != to_be_removed.end(); ++i) { + for (vector >::iterator i = to_be_removed.begin(); i != to_be_removed.end(); ++i) { void* gui = (*i)->get_gui (); @@ -737,7 +706,7 @@ RedirectBox::cut_redirects () static_cast(gui)->hide (); } - if (_route.remove_redirect (*i, this)) { + if (_route->remove_redirect (*i, this)) { /* removal failed */ _rr_selection.remove (*i); } @@ -748,8 +717,8 @@ RedirectBox::cut_redirects () void RedirectBox::copy_redirects () { - vector to_be_copied; - vector copies; + vector > to_be_copied; + vector > copies; get_selected_redirects (to_be_copied); @@ -757,61 +726,49 @@ RedirectBox::copy_redirects () return; } - for (vector::iterator i = to_be_copied.begin(); i != to_be_copied.end(); ++i) { - copies.push_back (Redirect::clone (**i)); + for (vector >::iterator i = to_be_copied.begin(); i != to_be_copied.end(); ++i) { + copies.push_back (Redirect::clone (*i)); } _rr_selection.set (copies); } gint -RedirectBox::idle_delete_redirect (Redirect *redirect) +RedirectBox::idle_delete_redirect (boost::shared_ptr redirect) { /* NOT copied to _mixer.selection() */ - if (_route.remove_redirect (redirect, this)) { - /* removal failed */ - return FALSE; - } - - delete redirect; + _route->remove_redirect (redirect, this); return FALSE; } void -RedirectBox::rename_redirect (Redirect* redirect) -{ - ArdourDialog dialog (_("ardour: rename redirect"), true); - Entry entry; - VBox vbox; - HBox hbox; - Button ok_button (_("OK")); - Button cancel_button (_("Cancel")); - - dialog.set_name ("RedirectRenameWindow"); - dialog.set_size_request (300, -1); - dialog.set_position (Gtk::WIN_POS_MOUSE); - - dialog.add_action_widget (entry, RESPONSE_ACCEPT); - dialog.add_button (Stock::OK, RESPONSE_ACCEPT); - dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL); - - entry.set_name ("RedirectNameDisplay"); - entry.set_text (redirect->name()); - entry.select_region (0, -1); - entry.grab_focus (); - - switch (dialog.run ()) { - case RESPONSE_ACCEPT: - redirect->set_name (entry.get_text(), this); - break; - default: +RedirectBox::rename_redirect (boost::shared_ptr redirect) +{ + ArdourPrompter name_prompter (true); + string result; + name_prompter.set_prompt (_("rename redirect")); + name_prompter.set_initial_text (redirect->name()); + name_prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT); + name_prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false); + name_prompter.show_all (); + + switch (name_prompter.run ()) { + + case Gtk::RESPONSE_ACCEPT: + name_prompter.get_result (result); + if (result.length()) { + redirect->set_name (result, this); + } break; } + + return; + } void -RedirectBox::cut_redirect (Redirect *redirect) +RedirectBox::cut_redirect (boost::shared_ptr redirect) { /* this essentially transfers ownership of the redirect of the redirect from the route to the mixer @@ -826,15 +783,15 @@ RedirectBox::cut_redirect (Redirect *redirect) static_cast(gui)->hide (); } - if (_route.remove_redirect (redirect, this)) { + if (_route->remove_redirect (redirect, this)) { _rr_selection.remove (redirect); } } void -RedirectBox::copy_redirect (Redirect *redirect) +RedirectBox::copy_redirect (boost::shared_ptr redirect) { - Redirect* copy = Redirect::clone (*redirect); + boost::shared_ptr copy = Redirect::clone (redirect); _rr_selection.add (copy); } @@ -845,44 +802,47 @@ RedirectBox::paste_redirects () return; } - RedirectSelection& sel (_rr_selection.redirects); - list others; + paste_redirect_list (_rr_selection.redirects); +} - for (list::iterator i = sel.begin(); i != sel.end(); ++i) { +void +RedirectBox::paste_redirect_list (list >& redirects) +{ + list > copies; - Redirect* copy = Redirect::clone (**i); + for (list >::iterator i = redirects.begin(); i != redirects.end(); ++i) { + + boost::shared_ptr copy = Redirect::clone (*i); copy->set_placement (_placement, this); - others.push_back (copy); + copies.push_back (copy); } - if (_route.add_redirects (others, this)) { - for (list::iterator i = others.begin(); i != others.end(); ++i) { - delete *i; - } + if (_route->add_redirects (copies, this)) { string msg = _( "Copying the set of redirects on the clipboard failed,\n\ probably because the I/O configuration of the plugins\n\ could not match the configuration of this track."); - ArdourMessage am (0, X_("bad redirect copy dialog"), msg); + MessageDialog am (msg); + am.run (); } } void -RedirectBox::activate_redirect (Redirect *r) +RedirectBox::activate_redirect (boost::shared_ptr r) { r->set_active (true, 0); } void -RedirectBox::deactivate_redirect (Redirect *r) +RedirectBox::deactivate_redirect (boost::shared_ptr r) { r->set_active (false, 0); } void -RedirectBox::get_selected_redirects (vector& redirects) +RedirectBox::get_selected_redirects (vector >& redirects) { vector pathlist = redirect_display.get_selection()->get_selected_rows(); @@ -891,12 +851,12 @@ RedirectBox::get_selected_redirects (vector& redirects) } void -RedirectBox::for_selected_redirects (void (RedirectBox::*pmf)(Redirect*)) +RedirectBox::for_selected_redirects (void (RedirectBox::*pmf)(boost::shared_ptr)) { vector pathlist = redirect_display.get_selection()->get_selected_rows(); for (vector::iterator iter = pathlist.begin(); iter != pathlist.end(); ++iter) { - Redirect* redirect = (*(model->get_iter(*iter)))[columns.redirect]; + boost::shared_ptr redirect = (*(model->get_iter(*iter)))[columns.redirect]; (this->*pmf)(redirect); } } @@ -907,12 +867,13 @@ RedirectBox::clone_redirects () RouteSelection& routes (_rr_selection.routes); if (!routes.empty()) { - if (_route.copy_redirects (*routes.front(), _placement)) { + if (_route->copy_redirects (*routes.front(), _placement)) { string msg = _( "Copying the set of redirects on the clipboard failed,\n\ probably because the I/O configuration of the plugins\n\ could not match the configuration of this track."); - ArdourMessage am (0, X_("bad redirect copy dialog"), msg); + MessageDialog am (msg); + am.run (); } } } @@ -920,7 +881,7 @@ could not match the configuration of this track."); void RedirectBox::all_redirects_active (bool state) { - _route.all_redirects_active (state); + _route->all_redirects_active (state); } void @@ -929,7 +890,7 @@ RedirectBox::clear_redirects() string prompt; vector choices; - if (dynamic_cast(&_route) != 0) { + if (boost::dynamic_pointer_cast(_route) != 0) { prompt = _("Do you really want to remove all redirects from this track?\n" "(this cannot be undone)"); } else { @@ -937,35 +898,29 @@ RedirectBox::clear_redirects() "(this cannot be undone)"); } - choices.push_back (_("Yes, remove them all")); choices.push_back (_("Cancel")); + choices.push_back (_("Yes, remove them all")); Gtkmm2ext::Choice prompter (prompt, choices); - prompter.chosen.connect(sigc::ptr_fun(Gtk::Main::quit)); - prompter.show_all (); - - Gtk::Main::run (); - - if (prompter.get_choice() == 0) { - _route.clear_redirects (this); + if (prompter.run () == 1) { + _route->clear_redirects (this); } } - void -RedirectBox::edit_redirect (Redirect* redirect) +RedirectBox::edit_redirect (boost::shared_ptr redirect) { - Insert *insert; + boost::shared_ptr insert; - if (dynamic_cast(&_route) != 0) { + if (boost::dynamic_pointer_cast(_route) != 0) { - if (dynamic_cast (&_route)->freeze_state() == AudioTrack::Frozen) { + if (boost::dynamic_pointer_cast (_route)->freeze_state() == AudioTrack::Frozen) { return; } } - if ((insert = dynamic_cast (redirect)) == 0) { + if ((insert = boost::dynamic_pointer_cast (redirect)) == 0) { /* its a send */ @@ -973,7 +928,7 @@ RedirectBox::edit_redirect (Redirect* redirect) return; } - Send *send = dynamic_cast (redirect); + boost::shared_ptr send = boost::dynamic_pointer_cast (redirect); SendUIWindow *send_ui; @@ -982,7 +937,7 @@ RedirectBox::edit_redirect (Redirect* redirect) string title; title = string_compose(_("ardour: %1"), send->name()); - send_ui = new SendUIWindow (*send, _session); + send_ui = new SendUIWindow (send, _session); send_ui->set_title (title); send->set_gui (send_ui); @@ -1000,60 +955,78 @@ RedirectBox::edit_redirect (Redirect* redirect) /* its an insert */ - PluginInsert *plugin_insert; - PortInsert *port_insert; + boost::shared_ptr plugin_insert; + boost::shared_ptr port_insert; - if ((plugin_insert = dynamic_cast (insert)) != 0) { + if ((plugin_insert = boost::dynamic_pointer_cast (insert)) != 0) { - PluginUIWindow *plugin_ui; + ARDOUR::PluginType type = plugin_insert->type(); + + if (type == ARDOUR::LADSPA || type == ARDOUR::VST) { + PluginUIWindow *plugin_ui; - if (plugin_insert->get_gui() == 0) { + if (plugin_insert->get_gui() == 0) { - string title; - string maker = plugin_insert->plugin().maker(); - string::size_type email_pos; + string title; + string maker = plugin_insert->plugin()->maker(); + string::size_type email_pos; - if ((email_pos = maker.find_first_of ('<')) != string::npos) { - maker = maker.substr (0, email_pos - 1); - } + if ((email_pos = maker.find_first_of ('<')) != string::npos) { + maker = maker.substr (0, email_pos - 1); + } - if (maker.length() > 32) { - maker = maker.substr (0, 32); - maker += " ..."; - } + if (maker.length() > 32) { + maker = maker.substr (0, 32); + maker += " ..."; + } - title = string_compose(_("ardour: %1: %2 (by %3)"), _route.name(), plugin_insert->name(), maker); + title = string_compose(_("ardour: %1: %2 (by %3)"), _route->name(), plugin_insert->name(), maker); + + plugin_ui = new PluginUIWindow (plugin_insert); + if (_owner_is_mixer) { + ARDOUR_UI::instance()->the_mixer()->ensure_float (*plugin_ui); + } else { + ARDOUR_UI::instance()->the_editor().ensure_float (*plugin_ui); + } + plugin_ui->set_title (title); + plugin_insert->set_gui (plugin_ui); - plugin_ui = new PluginUIWindow (_session.engine(), *plugin_insert); - if (_owner_is_mixer) { - ARDOUR_UI::instance()->the_mixer()->ensure_float (*plugin_ui); } else { - ARDOUR_UI::instance()->the_editor().ensure_float (*plugin_ui); + plugin_ui = reinterpret_cast (plugin_insert->get_gui()); } - plugin_ui->set_title (title); - plugin_insert->set_gui (plugin_ui); - - } else { - plugin_ui = reinterpret_cast (plugin_insert->get_gui()); - } - if (plugin_ui->is_visible()) { - plugin_ui->get_window()->raise (); + if (plugin_ui->is_visible()) { + plugin_ui->get_window()->raise (); + } else { + plugin_ui->show_all (); + } +#ifdef HAVE_AUDIOUNIT + } else if (type == ARDOUR::AudioUnit) { + AUPluginUI* plugin_ui; + if (plugin_insert->get_gui() == 0) { + plugin_ui = new AUPluginUI (plugin_insert); + } else { + plugin_ui = reinterpret_cast (plugin_insert->get_gui()); + } + + // raise window, somehow +#endif } else { - plugin_ui->show_all (); + warning << "Unsupported plugin sent to RedirectBox::edit_redirect()" << endmsg; + return; } - - } else if ((port_insert = dynamic_cast (insert)) != 0) { + } else if ((port_insert = boost::dynamic_pointer_cast (insert)) != 0) { if (!_session.engine().connected()) { - ArdourMessage msg (NULL, "nojackdialog", _("Not connected to JACK - no I/O changes are possible")); + MessageDialog msg ( _("Not connected to JACK - no I/O changes are possible")); + msg.run (); return; } PortInsertWindow *io_selector; if (port_insert->get_gui() == 0) { - io_selector = new PortInsertWindow (_session, *port_insert); + io_selector = new PortInsertWindow (_session, port_insert); port_insert->set_gui (io_selector); } else { @@ -1086,22 +1059,6 @@ RedirectBox::enter_box (GdkEventCrossing *ev, RedirectBox* rb) return false; } -bool -RedirectBox::leave_box (GdkEventCrossing *ev, RedirectBox* rb) -{ - switch (ev->detail) { - case GDK_NOTIFY_INFERIOR: - break; - - case GDK_NOTIFY_VIRTUAL: - /* fallthru */ - default: - _current_redirect_box = 0; - } - - return false; -} - void RedirectBox::register_actions () { @@ -1119,7 +1076,7 @@ RedirectBox::register_actions () ActionManager::plugin_selection_sensitive_actions.push_back(act); act = ActionManager::register_action (popup_act_grp, X_("copy"), _("Copy"), sigc::ptr_fun (RedirectBox::rb_copy)); ActionManager::plugin_selection_sensitive_actions.push_back(act); - ActionManager::ActionManager::register_action (popup_act_grp, X_("paste"), _("Paste"), sigc::ptr_fun (RedirectBox::rb_paste)); + paste_action = ActionManager::register_action (popup_act_grp, X_("paste"), _("Paste"), sigc::ptr_fun (RedirectBox::rb_paste)); act = ActionManager::register_action (popup_act_grp, X_("rename"), _("Rename"), sigc::ptr_fun (RedirectBox::rb_rename)); ActionManager::plugin_selection_sensitive_actions.push_back(act); ActionManager::register_action (popup_act_grp, X_("selectall"), _("Select All"), sigc::ptr_fun (RedirectBox::rb_select_all)); @@ -1202,6 +1159,8 @@ RedirectBox::rb_paste () if (_current_redirect_box == 0) { return; } + + _current_redirect_box->paste_redirects (); } void