X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_view.cc;h=2edad1cd1612b21a00e6086273c50a1a2de1cb11;hb=56652276698f966134b27a29edda4d0bb8520c5a;hp=a0fd276d12a55af1a53962ff148d1cc42067b317;hpb=8ef8bfc64ffba6d87cdb8ffcd6ecd535e2391641;p=ardour.git diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index a0fd276d12..2edad1cd16 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -26,21 +26,20 @@ #include #include "ardour/playlist.h" -#include "ardour/audioregion.h" -#include "ardour/audiosource.h" #include "ardour/session.h" +#include "canvas/polygon.h" +#include "canvas/debug.h" +#include "canvas/pixbuf.h" +#include "canvas/text.h" +#include "canvas/line.h" + #include "ardour_ui.h" #include "global_signals.h" -#include "canvas-noevent-text.h" -#include "canvas-noevent-rect.h" #include "streamview.h" #include "region_view.h" #include "automation_region_view.h" #include "route_time_axis.h" -#include "simplerect.h" -#include "simpleline.h" -#include "waveview.h" #include "public_editor.h" #include "region_editor.h" #include "ghostregion.h" @@ -86,7 +85,7 @@ RegionView::RegionView (ArdourCanvas::Group* parent, , _region_relative_time_converter(r->session().tempo_map(), r->position()) , _source_relative_time_converter(r->session().tempo_map(), r->position() - r->start()) { - GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); + GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context()); } RegionView::RegionView (const RegionView& other) @@ -103,7 +102,7 @@ RegionView::RegionView (const RegionView& other) valid = false; _pixel_width = other._pixel_width; - GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); + GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context()); } RegionView::RegionView (const RegionView& other, boost::shared_ptr other_region) @@ -124,7 +123,7 @@ RegionView::RegionView (const RegionView& other, boost::shared_ptr other valid = false; _pixel_width = other._pixel_width; - GhostRegion::CatchDeletion.connect (*this, invalidator (*this), ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); + GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RegionView::remove_ghost, this, _1), gui_context()); } RegionView::RegionView (ArdourCanvas::Group* parent, @@ -167,26 +166,26 @@ RegionView::init (Gdk::Color const & basic_color, bool wfd) if (name_highlight) { name_highlight->set_data ("regionview", this); - name_highlight->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this)); + name_highlight->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this)); if (frame_handle_start) { frame_handle_start->set_data ("regionview", this); frame_handle_start->set_data ("isleft", (void*) 1); - frame_handle_start->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, this)); + frame_handle_start->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, this)); frame_handle_start->raise_to_top(); } if (frame_handle_end) { frame_handle_end->set_data ("regionview", this); frame_handle_end->set_data ("isleft", (void*) 0); - frame_handle_end->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this)); + frame_handle_end->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this)); frame_handle_end->raise_to_top(); } } - if (name_pixbuf) { - name_pixbuf->set_data ("regionview", this); - name_pixbuf->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_event), name_pixbuf, this)); + if (name_text) { + name_text->set_data ("regionview", this); + name_text->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_event), name_text, this)); } if (wfd) { @@ -195,9 +194,9 @@ RegionView::init (Gdk::Color const & basic_color, bool wfd) set_height (trackview.current_height()); - _region->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RegionView::region_changed, this, _1), gui_context()); + _region->PropertyChanged.connect (*this, invalidator (*this), boost::bind (&RegionView::region_changed, this, _1), gui_context()); - group->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_event), group, this)); + group->Event.connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_event), group, this)); set_colors (); @@ -214,7 +213,7 @@ RegionView::~RegionView () delete *g; } - for (list::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) { + for (list::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) { delete *i; } @@ -239,17 +238,18 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr for (AudioIntervalResult::const_iterator i = silences.begin(); i != silences.end(); ++i) { - ArdourCanvas::SimpleRect* cr = new ArdourCanvas::NoEventSimpleRect (*group); + ArdourCanvas::Rectangle* cr = new ArdourCanvas::Rectangle (group); + cr->set_ignore_events (true); _silent_frames.push_back (cr); /* coordinates for the rect are relative to the regionview origin */ - cr->property_x1() = trackview.editor().frame_to_pixel (i->first - _region->start()); - cr->property_x2() = trackview.editor().frame_to_pixel (i->second - _region->start()); - cr->property_y1() = 1; - cr->property_y2() = _height - 2; - cr->property_outline_pixels() = 0; - cr->property_fill_color_rgba () = color; + cr->set_x0 (trackview.editor().sample_to_pixel (i->first - _region->start())); + cr->set_x1 (trackview.editor().sample_to_pixel (i->second - _region->start())); + cr->set_y0 (1); + cr->set_y1 (_height - 2); + cr->set_outline (false); + cr->set_fill_color (color); shortest = min (shortest, i->second - i->first); } @@ -272,15 +272,15 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr shortest_audible = min (shortest_audible, dur); } - _silence_text = new ArdourCanvas::NoEventText (*group); - _silence_text->property_font_desc() = get_font_for_style (N_("SilenceText")); - _silence_text->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SilenceText.get(); - _silence_text->property_anchor() = ANCHOR_NW; + _silence_text = new ArdourCanvas::Text (group); + _silence_text->set_ignore_events (true); + _silence_text->set_font_description (get_font_for_style (N_("SilenceText"))); + _silence_text->set_color (ARDOUR_UI::config()->canvasvar_SilenceText.get()); /* both positions are relative to the region start offset in source */ - _silence_text->property_x() = trackview.editor().frame_to_pixel (silences.front().first - _region->start()) + 10.0; - _silence_text->property_y() = 20.0; + _silence_text->set_x_position (trackview.editor().sample_to_pixel (silences.front().first - _region->start()) + 10.0); + _silence_text->set_y_position (20.0); double ms = (float) shortest/_region->session().frame_rate(); @@ -320,13 +320,13 @@ RegionView::set_silent_frames (const AudioIntervalResult& silences, double /*thr text += string_compose (_("\n (shortest audible segment = %1 %2)"), ma, aunits); } - _silence_text->property_text() = text.c_str (); + _silence_text->set (text); } void RegionView::hide_silent_frames () { - for (list::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) { + for (list::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) { (*i)->hide (); } _silence_text->hide(); @@ -335,7 +335,7 @@ RegionView::hide_silent_frames () void RegionView::drop_silent_frames () { - for (list::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) { + for (list::iterator i = _silent_frames.begin (); i != _silent_frames.end (); ++i) { delete *i; } _silent_frames.clear (); @@ -388,6 +388,10 @@ RegionView::region_changed (const PropertyChange& what_changed) if (what_changed.contains (ARDOUR::Properties::locked)) { region_locked (); } + if (what_changed.contains (ARDOUR::Properties::locked)) { + /* name will show locked status */ + region_renamed (); + } } void @@ -419,7 +423,7 @@ RegionView::region_resized (const PropertyChange& what_changed) set_duration (_region->length(), 0); - unit_length = _region->length() / samples_per_unit; + unit_length = _region->length() / samples_per_pixel; for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { @@ -477,7 +481,7 @@ RegionView::set_position (framepos_t pos, void* /*src*/, double* ignored) if (delta) { for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - (*i)->group->move (delta, 0.0); + (*i)->group->move (ArdourCanvas::Duple (delta, 0.0)); } } @@ -485,13 +489,13 @@ RegionView::set_position (framepos_t pos, void* /*src*/, double* ignored) } void -RegionView::set_samples_per_unit (gdouble spu) +RegionView::set_samples_per_pixel (double fpp) { - TimeAxisViewItem::set_samples_per_unit (spu); + TimeAxisViewItem::set_samples_per_pixel (fpp); for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - (*i)->set_samples_per_unit (spu); - (*i)->set_duration (_region->length() / samples_per_unit); + (*i)->set_samples_per_pixel (fpp); + (*i)->set_duration (_region->length() / fpp); } region_sync_changed (); @@ -505,7 +509,7 @@ RegionView::set_duration (framecnt_t frames, void *src) } for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - (*i)->set_duration (_region->length() / samples_per_unit); + (*i)->set_duration (_region->length() / samples_per_pixel); } return true; @@ -517,8 +521,9 @@ RegionView::set_colors () TimeAxisViewItem::set_colors (); if (sync_mark) { - sync_mark->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255); // fill_color; // FIXME make a themeable colour - sync_line->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255); // fill_color; // FIXME make a themeable colour + /* XXX: make these colours themable */ + sync_mark->set_fill_color (RGBA_TO_UINT (0, 255, 0, 255)); + sync_line->set_outline_color (RGBA_TO_UINT (0, 255, 0, 255)); } } @@ -580,6 +585,10 @@ RegionView::make_name () const str += '{'; str += _region->name(); str += '}'; + } else if (_region->video_locked()) { + str += '['; + str += _region->name(); + str += ']'; } else { str = _region->name(); } @@ -622,15 +631,15 @@ RegionView::region_sync_changed () /* points set below */ - sync_mark = new ArdourCanvas::Polygon (*group); - sync_mark->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255); // fill_color; // FIXME make a themeable colour + sync_mark = new ArdourCanvas::Polygon (group); + sync_mark->set_fill_color (RGBA_TO_UINT(0,255,0,255)); // FIXME make a themeable colour - sync_line = new ArdourCanvas::Line (*group); - sync_line->property_fill_color_rgba() = RGBA_TO_UINT(0,255,0,255); // fill_color; // FIXME make a themeable colour - sync_line->property_width_pixels() = 1; + sync_line = new ArdourCanvas::Line (group); + sync_line->set_outline_color (RGBA_TO_UINT(0,255,0,255)); // FIXME make a themeable colour + sync_line->set_outline_width (1); } - /* this has to handle both a genuine change of position, a change of samples_per_unit, + /* this has to handle both a genuine change of position, a change of samples_per_pixel and a change in the bounds of the _region-> */ @@ -658,19 +667,15 @@ RegionView::region_sync_changed () //points = sync_mark->property_points().get_value(); - double offset = sync_offset / samples_per_unit; - points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1)); - points.push_back (Gnome::Art::Point (offset + ((sync_mark_width-1)/2), 1)); - points.push_back (Gnome::Art::Point (offset, sync_mark_width - 1)); - points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1)); - sync_mark->property_points().set_value (points); + double offset = sync_offset / samples_per_pixel; + points.push_back (ArdourCanvas::Duple (offset - ((sync_mark_width-1)/2), 1)); + points.push_back (ArdourCanvas::Duple (offset + ((sync_mark_width-1)/2), 1)); + points.push_back (ArdourCanvas::Duple (offset, sync_mark_width - 1)); + points.push_back (ArdourCanvas::Duple (offset - ((sync_mark_width-1)/2), 1)); + sync_mark->set (points); sync_mark->show (); - points.clear (); - points.push_back (Gnome::Art::Point (offset, 0)); - points.push_back (Gnome::Art::Point (offset, trackview.current_height() - NAME_HIGHLIGHT_SIZE)); - - sync_line->property_points().set_value (points); + sync_line->set (ArdourCanvas::Duple (offset, 0), ArdourCanvas::Duple (offset, trackview.current_height() - NAME_HIGHLIGHT_SIZE)); sync_line->show (); } } @@ -683,12 +688,12 @@ RegionView::move (double x_delta, double y_delta) return; } - get_canvas_group()->move (x_delta, y_delta); + get_canvas_group()->move (ArdourCanvas::Duple (x_delta, y_delta)); /* note: ghosts never leave their tracks so y_delta for them is always zero */ for (vector::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { - (*i)->group->move (x_delta, 0.0); + (*i)->group->move (ArdourCanvas::Duple (x_delta, 0.0)); } } @@ -734,19 +739,20 @@ RegionView::set_height (double h) int sync_dir; framecnt_t sync_offset; sync_offset = _region->sync_offset (sync_dir); - double offset = sync_offset / samples_per_unit; + double offset = sync_offset / samples_per_pixel; - points.push_back (Gnome::Art::Point (offset, 0)); - points.push_back (Gnome::Art::Point (offset, h - NAME_HIGHLIGHT_SIZE)); - sync_line->property_points().set_value (points); + sync_line->set ( + ArdourCanvas::Duple (offset, 0), + ArdourCanvas::Duple (offset, h - NAME_HIGHLIGHT_SIZE) + ); } - for (list::iterator i = _coverage_frames.begin(); i != _coverage_frames.end(); ++i) { - (*i)->property_y2() = h + 1; + for (list::iterator i = _coverage_frames.begin(); i != _coverage_frames.end(); ++i) { + (*i)->set_y1 (h + 1); } - for (list::iterator i = _silent_frames.begin(); i != _silent_frames.end(); ++i) { - (*i)->property_y2() = h + 1; + for (list::iterator i = _silent_frames.begin(); i != _silent_frames.end(); ++i) { + (*i)->set_y1 (h + 1); } } @@ -757,7 +763,7 @@ void RegionView::update_coverage_frames (LayerDisplay d) { /* remove old coverage frames */ - for (list::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) { + for (list::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) { delete *i; } @@ -777,11 +783,11 @@ RegionView::update_coverage_frames (LayerDisplay d) framepos_t t = position; framepos_t const end = _region->last_frame (); - ArdourCanvas::SimpleRect* cr = 0; + ArdourCanvas::Rectangle* cr = 0; bool me = false; /* the color that will be used to show parts of regions that will not be heard */ - uint32_t non_playing_color = RGBA_TO_UINT (32, 32, 32, 192); + uint32_t const non_playing_color = ARDOUR_UI::config()->canvasvar_CoveredRegion.get (); while (t < end) { @@ -792,21 +798,22 @@ RegionView::update_coverage_frames (LayerDisplay d) /* finish off any old rect, if required */ if (cr && me != new_me) { - cr->property_x2() = trackview.editor().frame_to_pixel (t - position); + cr->set_x1 (trackview.editor().sample_to_pixel (t - position)); } /* start off any new rect, if required */ if (cr == 0 || me != new_me) { - cr = new ArdourCanvas::NoEventSimpleRect (*group); + cr = new ArdourCanvas::Rectangle (group); _coverage_frames.push_back (cr); - cr->property_x1() = trackview.editor().frame_to_pixel (t - position); - cr->property_y1() = 1; - cr->property_y2() = _height + 1; - cr->property_outline_pixels() = 0; + cr->set_x0 (trackview.editor().sample_to_pixel (t - position)); + cr->set_y0 (1); + cr->set_y1 (_height + 1); + cr->set_outline (false); + cr->set_ignore_events (true); if (new_me) { - cr->property_fill_color_rgba () = UINT_RGBA_CHANGE_A (non_playing_color, 0); + cr->set_fill_color (UINT_RGBA_CHANGE_A (non_playing_color, 0)); } else { - cr->property_fill_color_rgba () = non_playing_color; + cr->set_fill_color (non_playing_color); } } @@ -816,7 +823,7 @@ RegionView::update_coverage_frames (LayerDisplay d) if (cr) { /* finish off the last rectangle */ - cr->property_x2() = trackview.editor().frame_to_pixel (end - position); + cr->set_x1 (trackview.editor().sample_to_pixel (end - position)); } if (frame_handle_start) { @@ -831,16 +838,16 @@ RegionView::update_coverage_frames (LayerDisplay d) name_highlight->raise_to_top (); } - if (name_pixbuf) { - name_pixbuf->raise_to_top (); + if (name_text) { + name_text->raise_to_top (); } } -void +bool RegionView::trim_front (framepos_t new_bound, bool no_overlap) { if (_region->locked()) { - return; + return false; } RouteTimeAxisView& rtv = dynamic_cast (trackview); @@ -868,13 +875,15 @@ RegionView::trim_front (framepos_t new_bound, bool no_overlap) } region_changed (ARDOUR::bounds_change); + + return (pre_trim_first_frame != _region->first_frame()); //return true if we actually changed something } -void +bool RegionView::trim_end (framepos_t new_bound, bool no_overlap) { if (_region->locked()) { - return; + return false; } RouteTimeAxisView& rtv = dynamic_cast (trackview); @@ -905,6 +914,8 @@ RegionView::trim_end (framepos_t new_bound, bool no_overlap) } else { region_changed (PropertyChange (ARDOUR::Properties::length)); } + + return (pre_trim_last_frame != _region->last_frame()); //return true if we actually changed something }