diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-07-01 15:48:24 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-07-01 15:48:24 +0000 |
commit | 67e21fd82ee3a2bf326b652b99484941bbb7efbb (patch) | |
tree | a1f13e395fc89e825e2c01a4ab9f90c1726fc71e /gtk2_ardour | |
parent | 10e12dc28774afa92ce64ebc76d9b3a55dd81c91 (diff) |
add MIDI input control column to editor route list; tweak SVG for MIDI not DIN
git-svn-id: svn://localhost/ardour2/branches/3.0@9779 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/editor_routes.cc | 85 | ||||
-rw-r--r-- | gtk2_ardour/editor_routes.h | 10 | ||||
-rw-r--r-- | gtk2_ardour/icons/midi_socket_small.png | bin | 751 -> 742 bytes | |||
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 7 |
4 files changed, 89 insertions, 13 deletions
diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index 9e27c7725e..a8fbb58d32 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -87,11 +87,29 @@ EditorRoutes::EditorRoutes (Editor* e) rec_state_column->add_attribute(rec_col_renderer->property_state(), _columns.rec_state); rec_state_column->add_attribute(rec_col_renderer->property_visible(), _columns.is_track); + rec_state_column->set_sizing(TREE_VIEW_COLUMN_FIXED); rec_state_column->set_alignment(ALIGN_CENTER); rec_state_column->set_expand(false); rec_state_column->set_fixed_width(15); + // MIDI Input Active + + CellRendererPixbufMulti* input_active_col_renderer = manage (new CellRendererPixbufMulti()); + input_active_col_renderer->set_pixbuf (0, ::get_icon("midi_socket_small")); + input_active_col_renderer->set_pixbuf (1, ::get_icon("midi_socket_small")); + input_active_col_renderer->signal_changed().connect (sigc::mem_fun (*this, &EditorRoutes::on_input_active_changed)); + + TreeViewColumn* input_active_column = manage (new TreeViewColumn ("I", *input_active_col_renderer)); + + input_active_column->add_attribute(input_active_col_renderer->property_state(), _columns.is_input_active); + input_active_column->add_attribute (input_active_col_renderer->property_visible(), _columns.is_midi); + + input_active_column->set_sizing(TREE_VIEW_COLUMN_FIXED); + input_active_column->set_alignment(ALIGN_CENTER); + input_active_column->set_expand(false); + input_active_column->set_fixed_width(20); + // Mute enable toggle CellRendererPixbufMulti* mute_col_renderer = manage (new CellRendererPixbufMulti()); @@ -153,16 +171,15 @@ EditorRoutes::EditorRoutes (Editor* e) solo_safe_state_column->set_expand(false); solo_safe_state_column->set_fixed_width(22); + _display.append_column (*input_active_column); _display.append_column (*rec_state_column); _display.append_column (*mute_state_column); _display.append_column (*solo_state_column); _display.append_column (*solo_isolate_state_column); _display.append_column (*solo_safe_state_column); - int colnum = _display.append_column (_("Name"), _columns.text); - TreeViewColumn* c = _display.get_column (colnum-1); - c->set_data ("i_am_the_tab_column", (void*) 0xfeedface); - _display.append_column (_("V"), _columns.visible); + _name_column = _display.append_column (_("Name"), _columns.text) - 1; + _visible_column = _display.append_column (_("V"), _columns.visible) - 1; _display.set_headers_visible (true); _display.set_name ("TrackListDisplay"); @@ -173,12 +190,12 @@ EditorRoutes::EditorRoutes (Editor* e) _display.set_size_request (100, -1); _display.add_object_drag (_columns.route.index(), "routes"); - CellRendererText* name_cell = dynamic_cast<CellRendererText*> (_display.get_column_cell_renderer (5)); + CellRendererText* name_cell = dynamic_cast<CellRendererText*> (_display.get_column_cell_renderer (_name_column)); assert (name_cell); name_cell->signal_editing_started().connect (sigc::mem_fun (*this, &EditorRoutes::name_edit_started)); - TreeViewColumn* name_column = _display.get_column (5); + TreeViewColumn* name_column = _display.get_column (_name_column); assert (name_column); @@ -191,13 +208,13 @@ EditorRoutes::EditorRoutes (Editor* e) name_cell->signal_edited().connect (sigc::mem_fun (*this, &EditorRoutes::name_edit)); // Set the visible column cell renderer to radio toggle - CellRendererToggle* visible_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (6)); + CellRendererToggle* visible_cell = dynamic_cast<CellRendererToggle*> (_display.get_column_cell_renderer (_visible_column)); visible_cell->property_activatable() = true; visible_cell->property_radio() = false; visible_cell->signal_toggled().connect (sigc::mem_fun (*this, &EditorRoutes::visible_changed)); - TreeViewColumn* visible_col = dynamic_cast<TreeViewColumn*> (_display.get_column (6)); + TreeViewColumn* visible_col = dynamic_cast<TreeViewColumn*> (_display.get_column (_visible_column)); visible_col->set_expand(false); visible_col->set_sizing(TREE_VIEW_COLUMN_FIXED); visible_col->set_fixed_width(30); @@ -292,6 +309,24 @@ EditorRoutes::set_session (Session* s) } void +EditorRoutes::on_input_active_changed (std::string const & path_string) +{ + // Get the model row that has been toggled. + Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); + + TimeAxisView* tv = row[_columns.tv]; + RouteTimeAxisView *rtv = dynamic_cast<RouteTimeAxisView*> (tv); + + if (rtv) { + boost::shared_ptr<MidiTrack> mt; + mt = rtv->midi_track(); + if (mt) { + mt->set_input_active (!mt->input_active()); + } + } +} + +void EditorRoutes::on_tv_rec_enable_changed (std::string const & path_string) { // Get the model row that has been toggled. @@ -517,6 +552,8 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes) for (list<RouteTimeAxisView*>::iterator x = routes.begin(); x != routes.end(); ++x) { + boost::shared_ptr<MidiTrack> midi_trk = boost::dynamic_pointer_cast<MidiTrack> ((*x)->route()); + row = *(_model->append ()); row[_columns.text] = (*x)->route()->name(); @@ -524,6 +561,15 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes) row[_columns.tv] = *x; row[_columns.route] = (*x)->route (); row[_columns.is_track] = (boost::dynamic_pointer_cast<Track> ((*x)->route()) != 0); + + if (midi_trk) { + row[_columns.is_input_active] = midi_trk->input_active (); + row[_columns.is_midi] = true; + } else { + row[_columns.is_input_active] = false; + row[_columns.is_midi] = false; + } + row[_columns.mute_state] = (*x)->route()->muted(); row[_columns.solo_state] = RouteUI::solo_visual_state ((*x)->route()); row[_columns.solo_isolate_state] = (*x)->route()->solo_isolated(); @@ -552,6 +598,7 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes) if ((*x)->is_midi_track()) { boost::shared_ptr<MidiTrack> t = boost::dynamic_pointer_cast<MidiTrack> ((*x)->route()); t->StepEditStatusChange.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_rec_display, this), gui_context()); + t->InputActiveChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_input_active_display, this), gui_context()); } (*x)->route()->mute_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_mute_display, this), gui_context()); @@ -566,6 +613,7 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes) update_solo_display (true); update_solo_isolate_display (); update_solo_safe_display (); + update_input_active_display (); resume_redisplay (); _redisplay_does_not_sync_order_keys = false; } @@ -911,7 +959,7 @@ EditorRoutes::key_press (GdkEventKey* ev) name_editable = 0; } - col = _display.get_column (5); // select&focus on name column + col = _display.get_column (_name_column); // select&focus on name column if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { treeview_select_previous (_display, _model, col); @@ -1236,6 +1284,25 @@ EditorRoutes::move_selected_tracks (bool up) } void +EditorRoutes::update_input_active_display () +{ + TreeModel::Children rows = _model->children(); + TreeModel::Children::iterator i; + + for (i = rows.begin(); i != rows.end(); ++i) { + boost::shared_ptr<Route> route = (*i)[_columns.route]; + + if (boost::dynamic_pointer_cast<Track> (route)) { + boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (route); + + if (mt) { + (*i)[_columns.is_input_active] = mt->input_active(); + } + } + } +} + +void EditorRoutes::update_rec_display () { TreeModel::Children rows = _model->children(); diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h index c6105bb7be..2ade937eff 100644 --- a/gtk2_ardour/editor_routes.h +++ b/gtk2_ardour/editor_routes.h @@ -59,6 +59,7 @@ public: private: void initial_display (); + void on_input_active_changed (std::string const &); void on_tv_rec_enable_changed (std::string const &); void on_tv_mute_enable_toggled (std::string const &); void on_tv_solo_enable_toggled (std::string const &); @@ -77,6 +78,7 @@ private: void update_solo_display (bool); void update_solo_isolate_display (); void update_solo_safe_display (); + void update_input_active_display (); void set_all_tracks_visibility (bool); void set_all_audio_midi_visibility (int, bool); void show_all_routes (); @@ -111,9 +113,11 @@ private: add (tv); add (route); add (name_editable); + add (is_input_active); + add (is_midi); } - Gtk::TreeModelColumn<std::string> text; + Gtk::TreeModelColumn<std::string> text; Gtk::TreeModelColumn<bool> visible; Gtk::TreeModelColumn<uint32_t> rec_state; Gtk::TreeModelColumn<uint32_t> mute_state; @@ -124,12 +128,16 @@ private: Gtk::TreeModelColumn<TimeAxisView*> tv; Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> > route; Gtk::TreeModelColumn<bool> name_editable; + Gtk::TreeModelColumn<bool> is_input_active; + Gtk::TreeModelColumn<bool> is_midi; }; Gtk::ScrolledWindow _scroller; Gtkmm2ext::DnDTreeView<boost::shared_ptr<ARDOUR::Route> > _display; Glib::RefPtr<Gtk::ListStore> _model; ModelColumns _columns; + int _name_column; + int _visible_column; bool _ignore_reorder; bool _no_redisplay; diff --git a/gtk2_ardour/icons/midi_socket_small.png b/gtk2_ardour/icons/midi_socket_small.png Binary files differindex 2ed5039a8c..ab495dd761 100644 --- a/gtk2_ardour/icons/midi_socket_small.png +++ b/gtk2_ardour/icons/midi_socket_small.png diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 4211e30953..fe9ad7d1c6 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -409,10 +409,14 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt) midi_input_enable_button->set_image (*img); midi_input_enable_button->signal_toggled().connect (sigc::mem_fun (*this, &MixerStrip::midi_input_toggled)); ARDOUR_UI::instance()->set_tip (midi_input_enable_button, _("Enable/Disable MIDI input")); + } else { + input_button_box.remove (*midi_input_enable_button); } /* get current state */ midi_input_status_changed (); input_button_box.pack_start (*midi_input_enable_button, false, false); + /* follow changes */ + midi_track()->InputActiveChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::midi_input_status_changed, this), gui_context()); } else { if (midi_input_enable_button) { /* removal from the container will delete it */ @@ -1807,7 +1811,6 @@ MixerStrip::on_key_press_event (GdkEventKey* ev) break; case GDK_r: - cerr << "Stole that r\n"; rec_enable_press (&fake); return true; break; @@ -1860,7 +1863,6 @@ MixerStrip::on_key_release_event (GdkEventKey* ev) break; case GDK_r: - cerr << "Stole that r\n"; rec_enable_release (&fake); return true; break; @@ -1931,7 +1933,6 @@ MixerStrip::midi_input_status_changed () if (midi_input_enable_button) { boost::shared_ptr<MidiTrack> mt = midi_track (); assert (mt); - cerr << "track input active? " << mt->input_active() << endl; midi_input_enable_button->set_active (mt->input_active ()); } } |