X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_view.cc;h=5ce4c4577b26a499c6198e9458aa0cbb8885de20;hb=3b4beb03b2a92ebfd1a9610b822360135c18038d;hp=865c286fde917fa7c020292b70d8c9845ad2430f;hpb=adacfd9b24fb0ac7c4029cd659d21107eb7a2208;p=ardour.git diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc index 865c286fde..5ce4c4577b 100644 --- a/gtk2_ardour/imageframe_view.cc +++ b/gtk2_ardour/imageframe_view.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Paul Davis + Copyright (C) 2003 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 @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include @@ -31,11 +30,13 @@ #include "public_editor.h" #include "utils.h" #include "imageframe_view.h" -#include "canvas-imageframe.h" +#include "imageframe.h" +#include "canvas_impl.h" #include "gui_thread.h" using namespace sigc ; using namespace ARDOUR ; +using namespace Gtk; sigc::signal ImageFrameView::GoingAway; @@ -54,19 +55,19 @@ sigc::signal ImageFrameView::GoingAway; * @param height the width of the origianl rgb_data image data * @param num_channels the number of color channels within rgb_data */ -ImageFrameView::ImageFrameView(std::string item_id, - Gnome::Canvas::Group *parent, +ImageFrameView::ImageFrameView(const string & item_id, + ArdourCanvas::Group *parent, ImageFrameTimeAxis* tv, ImageFrameTimeAxisGroup* item_group, double spu, Gdk::Color& basic_color, - jack_nframes_t start, - jack_nframes_t duration, + nframes_t start, + nframes_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels) - : TimeAxisViewItem(item_id, parent, *tv, spu, basic_color, start, duration, + : TimeAxisViewItem(item_id, *parent, *tv, spu, basic_color, start, duration, TimeAxisViewItem::Visibility (TimeAxisViewItem::ShowNameText| TimeAxisViewItem::ShowNameHighlight| TimeAxisViewItem::ShowFrame| @@ -75,11 +76,11 @@ ImageFrameView::ImageFrameView(std::string item_id, { the_parent_group = item_group ; set_name_text(item_id) ; - + image_data_width = width ; image_data_height = height ; image_data_num_channels = num_channels ; - + //This should be art_free'd once the ArtPixBuf is destroyed - this should happen when we destroy the imageframe canvas item unsigned char* the_rgb_data = (unsigned char*) art_alloc(width*height*num_channels) ; memcpy(the_rgb_data, rgb_data, (width*height*num_channels)) ; @@ -87,29 +88,20 @@ ImageFrameView::ImageFrameView(std::string item_id, ArtPixBuf* pbuf ; pbuf = art_pixbuf_new_rgba(the_rgb_data, width, height, (num_channels * width)); imageframe = 0 ; - + //calculate our image width based on the track height double im_ratio = (double)width/(double)height ; - int im_width = (int)((double)(trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE) * im_ratio) ; - - imageframe = gnome_canvas_item_new(GNOME_CANVAS_GROUP(group), - gnome_canvas_imageframe_get_type(), - "pixbuf", pbuf, - "x", (gdouble) 1.0, - "y", (gdouble) 1.0, - "anchor", GTK_ANCHOR_NW, - "width", (gdouble) im_width, - "height", (gdouble) (trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE), - NULL) ; - - frame_handle_start->signal_event().connect() (bind (mem_fun (editor, &PublicEditor::canvas_imageframe_start_handle_event), frame_handle_start)); - frame_handle_end->signal_event().connect() (bind (mem_fun (editor, &PublicEditor::canvas_imageframe_end_handle_event), frame_handle_end)); - group->signal_event().connect() (bind (mem_fun (editor, &PublicEditor::canvas_imageframe_item_view_event, this);), group)); - - + double im_width = ((double)(trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE) * im_ratio) ; + + imageframe = new ImageFrame (*group, pbuf, 1.0, 1.0, ANCHOR_NW, im_width, (trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE)); + + frame_handle_start->signal_event().connect (bind (mem_fun (trackview.editor, &PublicEditor::canvas_imageframe_start_handle_event), frame_handle_start, this)); + frame_handle_end->signal_event().connect (bind (mem_fun (trackview.editor, &PublicEditor::canvas_imageframe_end_handle_event), frame_handle_end, this)); + group->signal_event().connect (bind (mem_fun (trackview.editor, &PublicEditor::canvas_imageframe_item_view_event), imageframe, this)); + frame_handle_start->raise_to_top(); frame_handle_end->raise_to_top(); - + set_position(start, this) ; set_duration(duration, this) ; } @@ -123,11 +115,11 @@ ImageFrameView::~ImageFrameView() GoingAway (this); // destroy any marker items we have associated with this item - + for(MarkerViewList::iterator iter = marker_view_list.begin(); iter != marker_view_list.end(); ++iter) { MarkerView* mv = (*iter) ; - + MarkerViewList::iterator next = iter ; next++ ; @@ -146,11 +138,11 @@ ImageFrameView::~ImageFrameView() mv->set_marked_item(0) ; delete mv ; mv = 0 ; - - // set our iterator to next, as we have invalided the current iterator with the call to erase + + // set our iterator to next, as we have invalided the current iterator with the call to erase iter = next ; } - + // if we are the currently selected item withi the parent track, we need to se-select if(the_parent_group) { @@ -160,11 +152,8 @@ ImageFrameView::~ImageFrameView() } } - if(imageframe) - { - gtk_object_destroy(GTK_OBJECT(imageframe)) ; - imageframe = 0 ; - } + delete imageframe; + imageframe = 0 ; } @@ -179,30 +168,29 @@ ImageFrameView::~ImageFrameView() * @return true if the position change was a success, false otherwise */ bool -ImageFrameView::set_position(jack_nframes_t pos, void* src) +ImageFrameView::set_position(nframes64_t pos, void* src, double* delta) { - jack_nframes_t old_pos = frame_position ; - + nframes64_t old_pos = frame_position ; + // do the standard stuff - bool ret = TimeAxisViewItem::set_position(pos, src) ; + bool ret = TimeAxisViewItem::set_position(pos, src, delta) ; // everything went ok with the standard stuff? - if(ret) - { + if (ret) { /* move each of our associated markers with this ImageFrameView */ for (MarkerViewList::iterator i = marker_view_list.begin(); i != marker_view_list.end(); ++i) { // calculate the offset of the marker MarkerView* mv = (MarkerView*)*i ; - jack_nframes_t marker_old_pos = mv->get_position() ; - + nframes64_t marker_old_pos = mv->get_position() ; + mv->set_position(pos + (marker_old_pos - old_pos), src) ; } } - + return(ret) ; } - + /** * Sets the duration of this item * @@ -211,24 +199,24 @@ ImageFrameView::set_position(jack_nframes_t pos, void* src) * @return true if the duration change was succesful, false otherwise */ bool -ImageFrameView::set_duration(jack_nframes_t dur, void* src) +ImageFrameView::set_duration(nframes64_t dur, void* src) { /* do the standard stuff */ bool ret = TimeAxisViewItem::set_duration(dur, src) ; - + // eveything went ok with the standard stuff? if(ret) { /* handle setting the sizes of our canvas itesm based on the new duration */ - gnome_canvas_item_set(imageframe, "drawwidth", (gdouble) trackview.editor.frame_to_pixel(get_duration()), NULL) ; + imageframe->property_drawwidth() = trackview.editor.frame_to_pixel(get_duration()); } - + return(ret) ; } //---------------------------------------------------------------------------------------// // Parent Component Methods - + /** * Sets the parent ImageFrameTimeAxisGroup of thie item * each Item must be part of exactly one group (or 'scene') upon the timeline @@ -240,7 +228,7 @@ ImageFrameView::set_time_axis_group(ImageFrameTimeAxisGroup* group) { the_parent_group = group ; } - + /** * Returns the parent group of this item * @@ -255,7 +243,7 @@ ImageFrameView::get_time_axis_group() //---------------------------------------------------------------------------------------// // ui methods - + /** * Set the height of this item * @@ -267,23 +255,22 @@ ImageFrameView::set_height (gdouble h) // set the image size // @todo might have to re-get the image data, for a large height...hmmm. double im_ratio = (double)image_data_width/(double)image_data_height ; - int im_width = (int)((double)(h - TimeAxisViewItem::NAME_Y_OFFSET) * im_ratio) ; - gnome_canvas_item_set(imageframe, "width", (gdouble)im_width, NULL) ; - gnome_canvas_item_set(imageframe, "height",(gdouble) (h - TimeAxisViewItem::NAME_Y_OFFSET), NULL) ; + + imageframe->property_width() = (h - TimeAxisViewItem::NAME_Y_OFFSET) * im_ratio; + imageframe->property_height() = h - TimeAxisViewItem::NAME_Y_OFFSET; frame->raise_to_top(); - gnome_canvas_item_raise_to_top(imageframe) ; - //imageframe->raise_to_top(); + imageframe->raise_to_top(); name_highlight->raise_to_top(); - name_text->raise_to_top(); + name_pixbuf->raise_to_top(); frame_handle_start->raise_to_top(); frame_handle_end->raise_to_top(); - - name_text->set_property ("y", h - TimeAxisViewItem::NAME_Y_OFFSET); - frame->set_property ("y2", h); - name_highlight->set_property ("y1", (gdouble) h - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE); - name_highlight->set_property ("y2", (gdouble) h - 1.0); + name_pixbuf->property_y() = h - TimeAxisViewItem::NAME_Y_OFFSET; + frame->property_y2() = h; + + name_highlight->property_y1() = (gdouble) h - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE; + name_highlight->property_y2() = (gdouble) h - 1.0; } @@ -300,12 +287,12 @@ void ImageFrameView::add_marker_view_item(MarkerView* item, void* src) { marker_view_list.push_back(item) ; - + item->GoingAway.connect(bind(mem_fun(*this, &ImageFrameView::remove_marker_view_item), (void*)this)); - + MarkerViewAdded(item, src) ; /* EMIT_SIGNAL */ } - + /** * Removes the named marker view from the list of marker view associated with this item * The Marker view is not destroyed on removal, so the caller must handle the item themself @@ -315,11 +302,11 @@ ImageFrameView::add_marker_view_item(MarkerView* item, void* src) * @return the removed marker item */ MarkerView* -ImageFrameView::remove_named_marker_view_item(std::string markerId, void* src) +ImageFrameView::remove_named_marker_view_item(const string & markerId, void* src) { MarkerView* mv = 0 ; MarkerViewList::iterator i = marker_view_list.begin() ; - + while(i != marker_view_list.end()) { if (((MarkerView*)*i)->get_item_name() == markerId) @@ -327,9 +314,9 @@ ImageFrameView::remove_named_marker_view_item(std::string markerId, void* src) mv = (*i) ; marker_view_list.erase(i) ; - + MarkerViewRemoved(mv,src) ; /* EMIT_SIGNAL */ - + // iterator is now invalid, but since we should only ever have // one item with the specified name, things are ok, and we can // break from the while loop @@ -337,10 +324,10 @@ ImageFrameView::remove_named_marker_view_item(std::string markerId, void* src) } i++ ; } - + return(mv) ; } - + /** * Removes item from the list of marker views assocaited with this item * This method will do nothing if item if not assiciated with this item @@ -354,33 +341,33 @@ ImageFrameView::remove_marker_view_item(MarkerView* mv, void* src) ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameView::remove_marker_view_item), mv, src)); MarkerViewList::iterator i ; - + if((i = find (marker_view_list.begin(), marker_view_list.end(), mv)) != marker_view_list.end()) { marker_view_list.erase(i) ; MarkerViewRemoved (mv, src) ; /* EMIT_SIGNAL */ } } - + /** * Determines if the named marker is one of those associated with this item * * @param markId the id/name of the item to search for */ bool -ImageFrameView::has_marker_view_item(std::string mname) +ImageFrameView::has_marker_view_item(const string & mname) { bool result = false ; - - for (MarkerViewList::iterator ci = marker_view_list.begin(); ci != marker_view_list.end(); ++ci) + + for (MarkerViewList::const_iterator ci = marker_view_list.begin(); ci != marker_view_list.end(); ++ci) { if (((MarkerView*)*ci)->get_item_name() == mname) { result = true ; - + // found the item, so we can break the for loop break ; } } - + return(result) ; }