Display length & check digit of entered EAN-13 in metadata dialogue

[ardour.git] / gtk2_ardour / midi_streamview.cc

diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 8a5fd53150955cb5bbd2ac6b9f3351492a220c38..5175cb35a8152166e28dbbc9d19045faa19f1e7b 100644 (file)
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -153,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);
 
@@ -449,7 +443,7 @@ MidiStreamView::setup_rec_box ()
                    _trackview.session()->record_status() == Session::Recording &&
                    _trackview.track()->record_enabled()) {
 
-                       if (Config->get_show_waveforms_while_recording() && rec_regions.size() == rec_rects.size()) {
+                       if (ARDOUR_UI::config()->get_show_waveforms_while_recording() && rec_regions.size() == rec_rects.size()) {
 
                                /* add a new region, but don't bother if they set show-waveforms-while-recording mid-record */
 
@@ -497,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());
+                                       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));
 
@@ -515,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 ("recording rect");
-
-                       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 ("recording rect"));
-                       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 ||
@@ -559,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;
 
@@ -687,14 +655,40 @@ MidiStreamView::resume_updates ()
        _canvas_group->redraw ();
 }
 
-void
-MidiStreamView::leave_internal_edit_mode ()
+struct RegionPositionSorter {
+       bool operator() (RegionView* a, RegionView* b) {
+               return a->region()->position() < b->region()->position();
+       }
+};
+
+bool
+MidiStreamView::paste (ARDOUR::framepos_t pos, const Selection& selection, PasteContext& ctx)
 {
-       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 ();
+       /* Paste into the first region which starts on or before pos.  Only called when
+          using an internal editing tool. */
+
+       if (region_views.empty()) {
+               return false;
+       }
+
+       region_views.sort (RegionView::PositionOrder());
+
+       list<RegionView*>::const_iterator prev = region_views.begin ();
+
+       for (list<RegionView*>::const_iterator i = region_views.begin(); i != region_views.end(); ++i) {
+               if ((*i)->region()->position() > pos) {
+                       break;
                }
+               prev = i;
+       }
+
+       boost::shared_ptr<Region> r = (*prev)->region ();
+
+       /* If *prev doesn't cover pos, it's no good */
+       if (r->position() > pos || ((r->position() + r->length()) < pos)) {
+               return false;
        }
+
+       MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (*prev);
+       return mrv ? mrv->paste(pos, selection, ctx) : false;
 }