diff options
| author | David Robillard <d@drobilla.net> | 2006-10-21 19:01:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-10-21 19:01:50 +0000 |
| commit | fedf3d34f32264ac57c6a222b678dc90f2bb1a88 (patch) | |
| tree | e816c676d12ccc32b7e666792b9a01ab5b5a0367 /gtk2_ardour/region_view.cc | |
| parent | 7bd41538d951c3e476655df741adfbebbb990bde (diff) | |
Merged with trunk R992.
Completely untested other than it compiles, runs, and records somewhat (need to merge again).
git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/region_view.cc')
| -rw-r--r-- | gtk2_ardour/region_view.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 702c328ecd..3fe7563602 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -133,11 +133,6 @@ RegionView::init (Gdk::Color& basic_color, bool wfd) set_height (trackview.height); - region_muted (); - region_sync_changed (); - region_resized (BoundsChanged); - region_locked (); - _region->StateChanged.connect (mem_fun(*this, &RegionView::region_changed)); group->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_event), group, this)); @@ -236,8 +231,6 @@ RegionView::region_resized (Change what_changed) unit_length = _region->length() / samples_per_unit; - reset_width_dependent_items (unit_length); - for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { (*i)->set_duration (unit_length); @@ -307,7 +300,7 @@ RegionView::lower_to_bottom () } bool -RegionView::set_position (jack_nframes_t pos, void* src, double* ignored) +RegionView::set_position (nframes_t pos, void* src, double* ignored) { double delta; bool ret; @@ -343,7 +336,7 @@ RegionView::set_samples_per_unit (gdouble spu) } bool -RegionView::set_duration (jack_nframes_t frames, void *src) +RegionView::set_duration (nframes_t frames, void *src) { if (!TimeAxisViewItem::set_duration (frames, src)) { return false; @@ -424,7 +417,7 @@ RegionView::region_sync_changed () } int sync_dir; - jack_nframes_t sync_offset; + nframes_t sync_offset; sync_offset = _region->sync_offset (sync_dir); |