Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / midi_streamview.cc

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index f3087a8cca3fc5c0eaee21c1bcd04ca1d1448254..f47091b3a6e7727dea27d197f34043b903c633da 100644 (file)
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -100,7 +100,7 @@ MidiStreamView::~MidiStreamView ()
 }
 
 RegionView*
-MidiStreamView::create_region_view (boost::shared_ptr<Region> r, bool /*wfd*/, bool)
+MidiStreamView::create_region_view (boost::shared_ptr<Region> r, bool /*wfd*/, bool recording)
 {
        boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion> (r);
 
@@ -108,8 +108,16 @@ MidiStreamView::create_region_view (boost::shared_ptr<Region> r, bool /*wfd*/, b
                return 0;
        }
 
-       RegionView* region_view = new MidiRegionView (_canvas_group, _trackview, region,
-                                                     _samples_per_pixel, region_color);
+       RegionView* region_view = NULL;
+       if (recording) {
+               region_view = new MidiRegionView (
+                       _canvas_group, _trackview, region,
+                       _samples_per_pixel, region_color, recording,
+                       TimeAxisViewItem::Visibility(TimeAxisViewItem::ShowFrame));
+       } else {
+               region_view = new MidiRegionView (_canvas_group, _trackview, region,
+                                                 _samples_per_pixel, region_color);
+       }
 
        region_view->init (false);
 
@@ -145,12 +153,6 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wait
 
        region_views.push_front (region_view);
 
-       if (_trackview.editor().internal_editing()) {
-               region_view->hide_rect ();
-       } else {
-               region_view->show_rect ();
-       }
-
        /* display events and find note range */
        display_region (region_view, wait_for_data);
 
@@ -185,7 +187,8 @@ MidiStreamView::display_region(MidiRegionView* region_view, bool load_model)
        }
 
        if (load_model) {
-               source->load_model();
+               Glib::Threads::Mutex::Lock lm(source->mutex());
+               source->load_model(lm);
        }
 
        if (!source->model()) {
@@ -217,7 +220,8 @@ MidiStreamView::update_contents_metrics(boost::shared_ptr<Region> r)
 {
        boost::shared_ptr<MidiRegion> mr = boost::dynamic_pointer_cast<MidiRegion>(r);
        if (mr) {
-               mr->midi_source(0)->load_model();
+               Glib::Threads::Mutex::Lock lm(mr->midi_source(0)->mutex());
+               mr->midi_source(0)->load_model(lm);
                _range_dirty = update_data_note_range(
                        mr->model()->lowest_note(),
                        mr->model()->highest_note());
@@ -320,7 +324,7 @@ MidiStreamView::draw_note_lines()
                 */
 
                if (i <= highest_note()) {
-                       _note_lines->add (y, 1.0, ARDOUR_UI::config()->color ("PianoRollBlackOutline"));
+                       _note_lines->add (y, 1.0, ARDOUR_UI::config()->color ("piano roll black outline"));
                }
 
                /* now add a thicker line/bar which covers the entire vertical
@@ -333,10 +337,10 @@ MidiStreamView::draw_note_lines()
                case 6:
                case 8:
                case 10:
-                       color = ARDOUR_UI::config()->color ("PianoRollBlack");
+                       color = ARDOUR_UI::config()->color_mod ("piano roll black", "piano roll black");
                        break;
                default:
-                       color = ARDOUR_UI::config()->color ("PianoRollWhite");
+                       color = ARDOUR_UI::config()->color_mod ("piano roll white", "piano roll white");
                        break;
                }
 
@@ -487,12 +491,12 @@ MidiStreamView::setup_rec_box ()
                                if (region) {
                                        region->set_start (_trackview.track()->current_capture_start()
                                                           - _trackview.track()->get_capture_start_frame (0));
-                                       region->set_position (_trackview.track()->current_capture_start());
-                                       RegionView* rv = add_region_view_internal (region, false);
+                                       region->set_position (_trackview.session()->transport_frame());
+
+                                       RegionView* rv = add_region_view_internal (region, false, true);
                                        MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (rv);
                                        mrv->begin_write ();
 
-                               
                                        /* rec region will be destroyed in setup_rec_box */
                                        rec_regions.push_back (make_pair (region, rv));
 
@@ -505,32 +509,7 @@ MidiStreamView::setup_rec_box ()
 
                        /* start a new rec box */
 
-                       boost::shared_ptr<MidiTrack> mt = _trackview.midi_track(); /* we know what it is already */
-                       framepos_t const frame_pos = mt->current_capture_start ();
-                       gdouble const xstart = _trackview.editor().sample_to_pixel (frame_pos);
-                       gdouble const xend = xstart;
-                       uint32_t fill_color;
-
-                       fill_color = ARDOUR_UI::config()->color ("RecordingRect");
-
-                       ArdourCanvas::Rectangle * rec_rect = new ArdourCanvas::Rectangle (_canvas_group);
-                       rec_rect->set (ArdourCanvas::Rect (xstart, 1, xend, _trackview.current_height() - 1));
-                       rec_rect->set_outline_color (ARDOUR_UI::config()->color ("RecordingRect"));
-                       rec_rect->set_fill_color (fill_color);
-                       rec_rect->lower_to_bottom();
-
-                       RecBoxInfo recbox;
-                       recbox.rectangle = rec_rect;
-                       recbox.start = _trackview.session()->transport_frame();
-                       recbox.length = 0;
-
-                       rec_rects.push_back (recbox);
-
-                       screen_update_connection.disconnect();
-                       screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (
-                               sigc::mem_fun (*this, &MidiStreamView::update_rec_box));
-                       rec_updating = true;
-                       rec_active = true;
+                       create_rec_box(_trackview.midi_track()->current_capture_start(), 0);
 
                } else if (rec_active &&
                           (_trackview.session()->record_status() != Session::Recording ||
@@ -549,7 +528,6 @@ MidiStreamView::setup_rec_box ()
                        /* disconnect rapid update */
                        screen_update_connection.disconnect();
                        rec_data_ready_connections.drop_connections ();
-
                        rec_updating = false;
                        rec_active = false;
 
@@ -588,9 +566,9 @@ MidiStreamView::color_handler ()
        draw_note_lines ();
 
        if (_trackview.is_midi_track()) {
-               canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("MidiTrackBase"));
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("midi track base", "midi track base"));
        } else {
-               canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("MidiBusBase"));
+               canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("midi bus base"));
        }
 }
 
@@ -676,15 +654,3 @@ MidiStreamView::resume_updates ()
 
        _canvas_group->redraw ();
 }
-
-void
-MidiStreamView::leave_internal_edit_mode ()
-{
-       StreamView::leave_internal_edit_mode ();
-       for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-               MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (*i);
-               if (mrv) {
-                       mrv->clear_selection ();
-               }
-       }
-}