/*
- Copyright (C) 2001-2006 Paul Davis
+ Copyright (C) 2001-2006 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "ardour/audioregion.h"
#include "ardour/audiosource.h"
#include "ardour/audio_diskstream.h"
+#include "ardour/session.h"
#include "ardour_ui.h"
#include "streamview.h"
#include "i18n.h"
using namespace std;
-using namespace sigc;
using namespace ARDOUR;
using namespace PBD;
using namespace Editing;
static const int32_t sync_mark_width = 9;
-sigc::signal<void,RegionView*> RegionView::RegionViewGoingAway;
+PBD::Signal1<void,RegionView*> RegionView::RegionViewGoingAway;
-RegionView::RegionView (ArdourCanvas::Group* parent,
- TimeAxisViewPtr tv,
+RegionView::RegionView (ArdourCanvas::Group* parent,
+ TimeAxisView& tv,
boost::shared_ptr<ARDOUR::Region> r,
double spu,
Gdk::Color const & basic_color)
, _pixel_width(1.0)
, in_destructor(false)
, wait_for_data(false)
- , _time_converter(r->session(), r->position())
+ , _time_converter(r->session().tempo_map(), r->position())
{
+ cerr << "RV " << this << " has ref on region " << _region->name() << endl;
}
RegionView::RegionView (const RegionView& other)
valid = false;
_pixel_width = other._pixel_width;
_height = other._height;
+ cerr << "RV " << this << " has ref on region " << _region->name() << endl;
}
RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other_region)
, TimeAxisViewItem (other)
, _time_converter(other._time_converter)
{
- /* this is a pseudo-copy constructor used when dragging regions
+ /* this is a pseudo-copy constructor used when dragging regions
around on the canvas.
*/
valid = false;
_pixel_width = other._pixel_width;
_height = other._height;
+ cerr << "RV " << this << " has ref on region " << _region->name() << endl;
}
-RegionView::RegionView (ArdourCanvas::Group* parent,
- TimeAxisViewPtr tv,
+RegionView::RegionView (ArdourCanvas::Group* parent,
+ TimeAxisView& tv,
boost::shared_ptr<ARDOUR::Region> r,
double spu,
Gdk::Color const & basic_color,
, _pixel_width(1.0)
, in_destructor(false)
, wait_for_data(false)
- , _time_converter(r->session(), r->position())
+ , _time_converter(r->session().tempo_map(), r->position())
{
+ cerr << "RV " << this << " has ref on region " << _region->name() << endl;
}
void
if (name_highlight) {
name_highlight->set_data ("regionview", this);
- name_highlight->signal_event().connect (bind (mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this));
+ name_highlight->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_region_view_name_highlight_event), name_highlight, this));
+
+ frame_handle_start->set_data ("regionview", this);
+ frame_handle_start->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_start, this));
+
+ frame_handle_end->set_data ("regionview", this);
+ frame_handle_end->signal_event().connect (sigc::bind (sigc::mem_fun (PublicEditor::instance(), &PublicEditor::canvas_frame_handle_event), frame_handle_end, this));
+
+ frame_handle_start->raise_to_top();
+ frame_handle_end->raise_to_top();
}
if (name_pixbuf) {
if (wfd)
_enable_display = true;
- set_height (trackview->current_height());
+ set_height (trackview.current_height());
- _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));
+ _region->StateChanged.connect (*this, ui_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));
set_colors ();
- ColorsChanged.connect (mem_fun (*this, &RegionView::color_handler));
+ ColorsChanged.connect (sigc::mem_fun (*this, &RegionView::color_handler));
/* XXX sync mark drag? */
}
delete *g;
}
- for (
std::list<ArdourCanvas::SimpleRect*>::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) {
+ for (list<ArdourCanvas::SimpleRect*>::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) {
delete *i;
}
}
gint
-RegionView::_lock_toggle (ArdourCanvas::Item* item, GdkEvent* ev, void* arg)
+RegionView::_lock_toggle (ArdourCanvas::Item*, GdkEvent* ev, void* arg)
{
switch (ev->type) {
case GDK_BUTTON_RELEASE:
break;
default:
break;
- }
+ }
return FALSE;
}
void
RegionView::region_changed (Change what_changed)
{
- ENSURE_GUI_THREAD (bind (mem_fun(*this, &RegionView::region_changed), what_changed));
+ ENSURE_GUI_THREAD (*this, &RegionView::region_changed, what_changed)
if (what_changed & BoundsChanged) {
region_resized (what_changed);
set_duration (_region->length(), 0);
unit_length = _region->length() / samples_per_unit;
-
+
for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
(*i)->set_duration (unit_length);
}
bool
-RegionView::set_position (nframes_t pos, void* src, double* ignored)
+RegionView::set_position (nframes64_t pos, void* /*src*/, double* ignored)
{
double delta;
bool ret;
}
bool
-RegionView::set_duration (nframes_t frames, void *src)
+RegionView::set_duration (nframes64_t frames, void *src)
{
if (!TimeAxisViewItem::set_duration (frames, src)) {
return false;
}
-
+
for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
(*i)->set_duration (_region->length() / samples_per_unit);
}
RegionView::set_colors ()
{
TimeAxisViewItem::set_colors ();
-
+
if (sync_mark) {
sync_mark->property_fill_color_rgba() = fill_color;
sync_line->property_fill_color_rgba() = fill_color;
} else {
fill_opacity = 60;
}
-
+
set_frame_color ();
}
if (!sync_mark) {
/* points set below */
-
- sync_mark = new ArdourCanvas::Polygon (*group);
+
+ sync_mark = new ArdourCanvas::Polygon (*group);
sync_mark->property_fill_color_rgba() = fill_color;
sync_line = new ArdourCanvas::Line (*group);
if (sync_offset == 0) {
/* no sync mark - its the start of the region */
-
+
sync_mark->hide();
sync_line->hide ();
} else {
- if ((sync_dir < 0) || ((sync_dir > 0) && (sync_offset > _region->length()))) {
+ if ((sync_dir < 0) || ((sync_dir > 0) && (sync_offset > _region->length()))) {
/* no sync mark - its out of the bounds of the region */
/* lets do it */
Points points;
-
+
//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));
+ points.push_back (Gnome::Art::Point (offset - ((sync_mark_width-1)/2), 1));
sync_mark->property_points().set_value (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));
+ points.push_back (Gnome::Art::Point (offset, trackview.current_height() - NAME_HIGHLIGHT_SIZE));
sync_line->property_points().set_value (points);
sync_line->show ();
}
void
-RegionView::remove_ghost_in (TimeAxisViewPtr tv)
+RegionView::remove_ghost_in (TimeAxisView& tv)
{
for (vector<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
- if ((*i)->trackview == tv) {
+ if (&(*i)->trackview == &tv) {
delete *i;
break;
}
points.push_back (Gnome::Art::Point (offset, h - NAME_HIGHLIGHT_SIZE));
sync_line->property_points().set_value (points);
}
+
+ for (list<ArdourCanvas::SimpleRect*>::iterator i = _coverage_frames.begin(); i != _coverage_frames.end(); ++i) {
+ (*i)->property_y2() = h + 1;
+ }
}
/** Remove old coverage frames and make new ones, if we're in a LayerDisplay mode
RegionView::update_coverage_frames (LayerDisplay d)
{
/* remove old coverage frames */
- for (
std::list<ArdourCanvas::SimpleRect*>::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) {
+ for (list<ArdourCanvas::SimpleRect*>::iterator i = _coverage_frames.begin (); i != _coverage_frames.end (); ++i) {
delete *i;
}
uint32_t const color = frame->property_fill_color_rgba ();
uint32_t const base_alpha = UINT_RGBA_A (color);
-
+
while (t < end) {
t++;
/* is this region is on top at time t? */
- bool const new_me = (pl->top_region_at (t) == _region);
+ bool const new_me = (pl->top_unmuted_region_at (t) == _region);
/* finish off any old rect, if required */
if (cr && me != new_me) {
- cr->property_x2() = trackview->editor().frame_to_pixel (t - position);
+ cr->property_x2() = trackview.editor().frame_to_pixel (t - position);
}
/* start off any new rect, if required */
if (cr == 0 || me != new_me) {
cr = new ArdourCanvas::SimpleRect (*group);
_coverage_frames.push_back (cr);
- cr->property_x1() = trackview->editor().frame_to_pixel (t - position);
+ cr->property_x1() = trackview.editor().frame_to_pixel (t - position);
cr->property_y1() = 1;
cr->property_y2() = _height + 1;
cr->property_outline_pixels() = 0;
if (cr) {
/* finish off the last rectangle */
- cr->property_x2() = trackview->editor().frame_to_pixel (end - position);
+ cr->property_x2() = trackview.editor().frame_to_pixel (end - position);
}
+
+ frame_handle_start->raise_to_top ();
+ frame_handle_end->raise_to_top ();
}
projects / ardour.git / blobdiff