X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.cc;h=21848fff59de2e99d1fa8e59a6680833aeefccbf;hb=29f0d9732eb68fcaa22219cedddddd47bcaa8c17;hp=7745d6ec3e5f4725c7e561b4a38cd56d60d12a46;hpb=05bcdd1d4c583c68ed977164913ff47e94df7adb;p=ardour.git diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 7745d6ec3e..21848fff59 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -48,7 +48,8 @@ #include "ardour_ui.h" #include "midi_time_axis.h" #include "automation_time_axis.h" -#include "automation_midi_cc_line.h" +#include "automation_line.h" +#include "add_midi_cc_track_dialog.h" #include "canvas_impl.h" #include "crossfade_view.h" #include "enums.h" @@ -60,9 +61,6 @@ #include "point_selection.h" #include "prompter.h" #include "public_editor.h" -#include "plugin_automation_line.h" -#include "processor_automation_time_axis.h" -#include "midi_controller_time_axis.h" #include "region_view.h" #include "rgb_macros.h" #include "selection.h" @@ -81,8 +79,11 @@ using namespace Editing; MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shared_ptr rt, Canvas& canvas) - : AxisView(sess), // FIXME: won't compile without this, why?? - RouteTimeAxisView(ed, sess, rt, canvas) + : AxisView(sess) // FIXME: won't compile without this, why?? + , RouteTimeAxisView(ed, sess, rt, canvas) + , _note_mode(Sustained) + , _note_mode_item(NULL) + , _percussion_mode_item(NULL) { subplugin_menu.set_name ("ArdourContextMenu"); @@ -93,10 +94,12 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shar mute_button->set_active (false); solo_button->set_active (false); - if (is_midi_track()) + if (is_midi_track()) { controls_ebox.set_name ("MidiTimeAxisViewControlsBaseUnselected"); - else // bus + _note_mode = midi_track()->note_mode(); + } else { // MIDI bus (which doesn't exist yet..) controls_ebox.set_name ("MidiBusControlsBaseUnselected"); + } /* map current state of the route */ @@ -115,21 +118,21 @@ MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session& sess, boost::shar controls_base_unselected_name = "MidiTrackControlsBaseUnselected"; /* ask for notifications of any new RegionViews */ - _view->RegionViewAdded.connect (mem_fun(*this, &MidiTimeAxisView::region_view_added)); _view->attach (); - } /*else { // no MIDI busses yet - - controls_ebox.set_name ("MidiBusControlsBaseUnselected"); - controls_base_selected_name = "MidiBusControlsBaseSelected"; - controls_base_unselected_name = "MidiBusControlsBaseUnselected"; - }*/ + } } MidiTimeAxisView::~MidiTimeAxisView () { } +MidiStreamView* +MidiTimeAxisView::midi_view() +{ + return dynamic_cast(_view); +} + guint32 MidiTimeAxisView::show_at (double y, int& nth, Gtk::VBox *parent) { @@ -148,6 +151,33 @@ MidiTimeAxisView::hide () TimeAxisView::hide (); } +void +MidiTimeAxisView::append_extra_display_menu_items () +{ + using namespace Menu_Helpers; + + MenuList& items = display_menu->items(); + + // Note range + Menu *range_menu = manage(new Menu); + MenuList& range_items = range_menu->items(); + range_menu->set_name ("ArdourContextMenu"); + + RadioMenuItem::Group range_group; + + range_items.push_back (RadioMenuElem (range_group, _("Show Full Range"), bind ( + mem_fun(*this, &MidiTimeAxisView::set_note_range), + MidiStreamView::FullRange))); + + range_items.push_back (RadioMenuElem (range_group, _("Fit Contents"), bind ( + mem_fun(*this, &MidiTimeAxisView::set_note_range), + MidiStreamView::ContentsRange))); + + ((Gtk::CheckMenuItem&)range_items.back()).set_active(true); + + items.push_back (MenuElem (_("Note range"), *range_menu)); +} + void MidiTimeAxisView::build_automation_action_menu () { @@ -163,50 +193,95 @@ MidiTimeAxisView::build_automation_action_menu () mem_fun(*this, &MidiTimeAxisView::add_controller_track))); } +Gtk::Menu* +MidiTimeAxisView::build_mode_menu() +{ + using namespace Menu_Helpers; + + Menu* mode_menu = manage (new Menu); + MenuList& items = mode_menu->items(); + mode_menu->set_name ("ArdourContextMenu"); + + RadioMenuItem::Group mode_group; + items.push_back (RadioMenuElem (mode_group, _("Sustained"), + bind (mem_fun (*this, &MidiTimeAxisView::set_note_mode), Sustained))); + _note_mode_item = dynamic_cast(&items.back()); + _note_mode_item->set_active(_note_mode == Sustained); + + items.push_back (RadioMenuElem (mode_group, _("Percussive"), + bind (mem_fun (*this, &MidiTimeAxisView::set_note_mode), Percussive))); + _percussion_mode_item = dynamic_cast(&items.back()); + _percussion_mode_item->set_active(_note_mode == Percussive); + + return mode_menu; +} + +void +MidiTimeAxisView::set_note_mode(NoteMode mode) +{ + if (_note_mode != mode) { + _note_mode = mode; + midi_track()->set_note_mode(mode); + _view->redisplay_diskstream(); + } +} + + +void +MidiTimeAxisView::set_note_range(MidiStreamView::VisibleNoteRange range) +{ + //if (midi_view()->note_range() != range) { + midi_view()->set_note_range(range); + midi_view()->redisplay_diskstream(); + //} +} + + /** Prompt for a controller with a dialog and add an automation track for it */ void MidiTimeAxisView::add_controller_track() { - /* TODO: fancy controller selection dialog here... */ + int response; + Parameter param; + + { + AddMidiCCTrackDialog dialog; + dialog.set_transient_for(editor); + response = dialog.run(); + + if (response == Gtk::RESPONSE_ACCEPT) + param = dialog.parameter(); + } - ParamID param(MidiCCAutomation, 7); - create_automation_child(param); + if (response == Gtk::RESPONSE_ACCEPT) + create_automation_child(param, true); } void -MidiTimeAxisView::create_automation_child (ParamID param) +MidiTimeAxisView::create_automation_child (Parameter param, bool show) { if (param.type() == MidiCCAutomation) { - /* FIXME: this all probably leaks */ - - ARDOUR::AutomationList* al = _route->automation_list(param); + /* FIXME: don't create AutomationList for track itself */ - if (!al) - al = new ARDOUR::AutomationList(param, 0, 127, 64); + boost::shared_ptr c = _route->control(param); - _route->add_automation_parameter(al); + if (!c) { + boost::shared_ptr al(new ARDOUR::AutomationList(param, 0, 127, 64)); + c = boost::shared_ptr(_route->control_factory(al)); + _route->add_control(c); + } - MidiControllerTimeAxisView* track = new MidiControllerTimeAxisView (_session, - _route, + boost::shared_ptr track(new AutomationTimeAxisView (_session, + _route, _route, c, editor, *this, + true, parent_canvas, - _route->describe_parameter(param), - param, - *al); - - AutomationMidiCCLine* line = new AutomationMidiCCLine (param.to_string(), - *track, - *track->canvas_display, - *al); - - line->set_line_color (Config->canvasvar_AutomationLine.get()); - - track->add_line(*line); - - add_automation_child(param, track); + _route->describe_parameter(param))); + + add_automation_child(param, track, show); } else { error << "MidiTimeAxisView: unknown automation child " << param.to_string() << endmsg; @@ -244,3 +319,4 @@ MidiTimeAxisView::route_active_changed () } } +