X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Fmidi_time_axis.cc;h=33160f8da3e185fb2c07167563d351b393434f2a;hb=7d553eea8028977021f1526b8ab538737a21767c;hp=6bbc813eb2f960508901eb78a8d4805f2a19a763;hpb=96048ad4c09aca166dcccce9abe91da209a09b93;p=ardour.git diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 6bbc813eb2..33160f8da3 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -25,6 +25,9 @@ #include +#include +#include + #include "pbd/error.h" #include "pbd/ffs.h" #include "pbd/stl_delete.h" @@ -35,10 +38,10 @@ #include "pbd/stateful_diff_command.h" #include "gtkmm2ext/gtk_ui.h" -#include "gtkmm2ext/selector.h" -#include "gtkmm2ext/bindable_button.h" #include "gtkmm2ext/utils.h" +#include "widgets/tooltips.h" + #include "ardour/event_type_map.h" #include "ardour/midi_patch_manager.h" #include "ardour/midi_playlist.h" @@ -61,7 +64,6 @@ #include "ardour/track.h" #include "ardour/types.h" -#include "ardour_button.h" #include "automation_line.h" #include "automation_time_axis.h" #include "editor.h" @@ -74,17 +76,16 @@ #include "midi_streamview.h" #include "midi_region_view.h" #include "midi_time_axis.h" +#include "patch_change_dialog.h" #include "piano_roll_header.h" #include "playlist_selector.h" #include "plugin_selector.h" #include "plugin_ui.h" #include "point_selection.h" -#include "prompter.h" #include "region_view.h" #include "rgb_macros.h" #include "selection.h" #include "step_editor.h" -#include "tooltips.h" #include "utils.h" #include "note_base.h" @@ -93,7 +94,6 @@ #include "pbd/i18n.h" using namespace ARDOUR; -using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; @@ -122,6 +122,7 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanva , controller_menu (0) , poly_pressure_menu (0) , _step_editor (0) + , _patch_change_dialog (0) { _midnam_model_selector.disable_scrolling(); _midnam_custom_device_mode_selector.disable_scrolling(); @@ -153,7 +154,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) */ RouteTimeAxisView::set_route (rt); - _view->apply_color (gdk_color_to_rgba (color()), StreamView::RegionColor); + _view->apply_color (ARDOUR_UI_UTILS::gdk_color_to_rgba (color()), StreamView::RegionColor); subplugin_menu.set_name ("ArdourContextMenu"); @@ -260,8 +261,8 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) } } - set_tooltip (_midnam_model_selector, _("External MIDI Device")); - set_tooltip (_midnam_custom_device_mode_selector, _("External Device Mode")); + ArdourWidgets::set_tooltip (_midnam_model_selector, _("External MIDI Device")); + ArdourWidgets::set_tooltip (_midnam_custom_device_mode_selector, _("External Device Mode")); _midi_controls_box.pack_start (_midnam_model_selector, false, false, 2); _midi_controls_box.pack_start (_midnam_custom_device_mode_selector, false, false, 2); @@ -313,7 +314,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr rt) *i, route_id, has_parameter, parameter); if (p && route_id == _route->id () && has_parameter) { const std::string& visible = gui_object_state().get_string (*i, X_("visible")); - create_automation_child (parameter, string_is_affirmative (visible)); + create_automation_child (parameter, string_to (visible)); } } } @@ -345,6 +346,9 @@ MidiTimeAxisView::~MidiTimeAxisView () delete controller_menu; delete _step_editor; + + delete _patch_change_dialog; + _patch_change_dialog = 0; } void @@ -559,7 +563,8 @@ MidiTimeAxisView::append_extra_display_menu_items () items.push_back (MenuElem (_("Channel Selector"), sigc::mem_fun(*this, &MidiTimeAxisView::toggle_channel_selector))); - items.push_back (MenuElem (_("Select Patch"), *build_patch_menu())); + items.push_back (MenuElem (_("Select Patch..."), + sigc::mem_fun(*this, &MidiTimeAxisView::send_patch_change))); color_mode_menu = build_color_mode_menu(); if (color_mode_menu) { @@ -1076,108 +1081,49 @@ MidiTimeAxisView::build_color_mode_menu() return mode_menu; } -Gtk::Menu* -MidiTimeAxisView::build_patch_menu() +void +MidiTimeAxisView::immediate_patch_chnage_response (int response) { - using namespace MIDI::Name; - using namespace Menu_Helpers; - - boost::shared_ptr device_names = get_device_names(); - const std::string device_mode = gui_property (X_("midnam-custom-device-mode")); - - Menu* pc_menu = manage (new Menu); - MenuList& pc_items = pc_menu->items(); - - for (uint32_t chn = 0; chn < 16; ++chn) { - boost::shared_ptr channel_name_set = device_names->channel_name_set_by_channel (device_mode, chn); - // see also PatchChange::initialize_popup_menus - if (!channel_name_set) { - continue; - } - const ChannelNameSet::PatchBanks& patch_banks = channel_name_set->patch_banks(); - if (patch_banks.size () == 0) { - continue; - } - - Gtk::Menu& chan_menu = *manage(new Gtk::Menu()); - - if (patch_banks.size() > 1) { - - for (ChannelNameSet::PatchBanks::const_iterator bank = patch_banks.begin(); - bank != patch_banks.end(); - ++bank) { - Glib::RefPtr underscores = Glib::Regex::create("_"); - std::string replacement(" "); - - Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu()); - - const PatchNameList& patches = (*bank)->patch_name_list(); - Gtk::Menu::MenuList& patch_menus = patch_bank_menu.items(); - - for (PatchNameList::const_iterator patch = patches.begin(); - patch != patches.end(); - ++patch) { - std::string name = underscores->replace((*patch)->name().c_str(), -1, 0, replacement); - - patch_menus.push_back( - Gtk::Menu_Helpers::MenuElem( - name, - sigc::bind( - sigc::mem_fun(*this, &MidiTimeAxisView::on_patch_menu_selected), - chn, (*patch)->patch_primary_key())) ); - } - - - std::string name = underscores->replace((*bank)->name().c_str(), -1, 0, replacement); - - chan_menu.items().push_back( - Gtk::Menu_Helpers::MenuElem( - name, - patch_bank_menu) ); - } - } else { - /* only one patch bank, so make it the initial menu */ - - const PatchNameList& patches = patch_banks.front()->patch_name_list(); + if (response != RESPONSE_ACCEPT || !_route) { + delete _patch_change_dialog; + _patch_change_dialog = 0; + return; + } + Evoral::PatchChange p (_patch_change_dialog->patch ()); - for (PatchNameList::const_iterator patch = patches.begin(); - patch != patches.end(); - ++patch) { - std::string name = (*patch)->name(); - boost::replace_all (name, "_", " "); + uint8_t chn = p.channel(); - chan_menu.items().push_back ( - Gtk::Menu_Helpers::MenuElem ( - name, - sigc::bind (sigc::mem_fun(*this, &MidiTimeAxisView::on_patch_menu_selected), - chn, (*patch)->patch_primary_key()))); - } - } + boost::shared_ptr bank_msb = _route->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_MSB_BANK), true); + boost::shared_ptr bank_lsb = _route->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_LSB_BANK), true); + boost::shared_ptr program = _route->automation_control(Evoral::Parameter (MidiPgmChangeAutomation, chn), true); - pc_items.push_back( - Gtk::Menu_Helpers::MenuElem( - string_compose (_("Channel %1"), chn + 1), - chan_menu)); + if (!bank_msb || ! bank_lsb || !program) { + _patch_change_dialog->show (); + return; } - return pc_menu; + + bank_msb->set_value (p.bank_msb (), Controllable::NoGroup); + bank_lsb->set_value (p.bank_lsb (), Controllable::NoGroup); + program->set_value (p.program () , Controllable::NoGroup); + _patch_change_dialog->show (); } void -MidiTimeAxisView::on_patch_menu_selected (int chn, const MIDI::Name::PatchPrimaryKey& key) +MidiTimeAxisView::send_patch_change () { if (!_route) { return; } - boost::shared_ptr bank_msb = _route->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_MSB_BANK), true); - boost::shared_ptr bank_lsb = _route->automation_control(Evoral::Parameter (MidiCCAutomation, chn, MIDI_CTL_LSB_BANK), true); - boost::shared_ptr program = _route->automation_control(Evoral::Parameter (MidiPgmChangeAutomation, chn), true); - - if (!bank_msb || ! bank_lsb || !program) { + if (_patch_change_dialog) { + _patch_change_dialog->present (); return; } - bank_msb->set_value ((key.bank() >> 7) & 0x7f, Controllable::NoGroup); - bank_lsb->set_value (key.bank() & 0x7f, Controllable::NoGroup); - program->set_value (key.program(), Controllable::NoGroup); + + Evoral::PatchChange empty (Evoral::Beats(), 0, 0, 0); + PatchChangeDialog* d = new PatchChangeDialog (0, 0, empty, _route->instrument_info(), Gtk::Stock::APPLY, false, false); + d->signal_response().connect (sigc::mem_fun (*this, &MidiTimeAxisView::immediate_patch_chnage_response)); + _patch_change_dialog = d; + _patch_change_dialog->present (); } void @@ -1397,6 +1343,10 @@ MidiTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool } add_automation_child (param, track, show); + if (selected ()) { + reshow_selection (_editor.get_selection().time); + } + break; case PanWidthAutomation: @@ -1646,9 +1596,11 @@ MidiTimeAxisView::automation_child_menu_item (Evoral::Parameter param) } boost::shared_ptr -MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit, const int32_t sub_num) +MidiTimeAxisView::add_region (framepos_t f, framecnt_t length, bool commit) { Editor* real_editor = dynamic_cast (&_editor); + MusicFrame pos (f, 0); + if (commit) { real_editor->begin_reversible_command (Operations::create_region); } @@ -1665,8 +1617,8 @@ MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit, co boost::shared_ptr region = (RegionFactory::create (src, plist)); /* sets beat position */ - region->set_position (pos, sub_num); - playlist()->add_region (region, pos, 1.0, false, sub_num); + region->set_position (pos.frame, pos.division); + playlist()->add_region (region, pos.frame, 1.0, false, pos.division); _session->add_command (new StatefulDiffCommand (playlist())); if (commit) {