along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <algorithm>
region_color = _trackview.color();
stream_base_color = color_map[cMarkerTrackBase];
- //GTK2FIX -- how to get the group? is the canvas display really a group?
- //canvas_group = gnome_canvas_item_new (GNOME_CANVAS_GROUP(_trackview.canvas_display), gnome_canvas_group_get_type (), 0);
canvas_group = new ArdourCanvas::Group (*_trackview.canvas_display);
canvas_rect = new ArdourCanvas::SimpleRect (*canvas_group);
- canvas_rect->set_property ("x1", 0.0);
- canvas_rect->set_property ("y1", 0.0);
- canvas_rect->set_property ("x2", 1000000.0);
- canvas_rect->set_property ("y2", (double)20);
- canvas_rect->set_property ("outline_color_rgba", color_map[cMarkerTrackOutline]);
- canvas_rect->set_property ("fill_color_rgba", stream_base_color);
+ canvas_rect->property_x1() = 0.0;
+ canvas_rect->property_y1() = 0.0;
+ canvas_rect->property_x2() = max_frames;
+ canvas_rect->property_y2() = (double)20;
+ canvas_rect->property_outline_color_rgba() = color_map[cMarkerTrackOutline];
+ canvas_rect->property_fill_color_rgba() = stream_base_color;
canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_marker_time_axis_view_event), canvas_rect, &_trackview));
if(canvas_rect)
{
- gtk_object_destroy(GTK_OBJECT(canvas_rect)) ;
+ delete canvas_rect;
canvas_rect = 0 ;
}
if(canvas_group)
{
- gtk_object_destroy(GTK_OBJECT(canvas_group)) ;
+ delete canvas_group;
canvas_group = 0 ;
}
}
return -1 ;
}
- gtk_object_set (GTK_OBJECT(canvas_rect), "y2", h, NULL);
+ canvas_rect->property_y2() = h;
for (MarkerViewList::iterator i = marker_view_list.begin(); i != marker_view_list.end(); ++i)
{
int
MarkerTimeAxisView::set_position(gdouble x, gdouble y)
{
- canvas_group->set_property ("x", x);
- canvas_group->set_property ("y", y);
+ canvas_group->property_x() = x;
+ canvas_group->property_y() = y;
return 0;
}
* @param src the identity of the object that initiated the change
*/
MarkerView*
-MarkerTimeAxisView::add_marker_view(ImageFrameView* ifv, std::string mark_type, std::string mark_id, jack_nframes_t start, jack_nframes_t dur, void* src)
+MarkerTimeAxisView::add_marker_view(ImageFrameView* ifv, std::string mark_type, std::string mark_id, nframes_t start, nframes_t dur, void* src)
{
if(ifv->has_marker_view_item(mark_id))
{
{
if(get_selected_time_axis_item() != 0)
{
- get_selected_time_axis_item()->set_duration((jack_nframes_t) (sec * _trackview.editor.current_session()->frame_rate()), this) ;
+ get_selected_time_axis_item()->set_duration((nframes_t) (sec * _trackview.editor.current_session()->frame_rate()), this) ;
}
}