X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_view.cc;h=2a419ee2752c3b2910e34e9e515ffaab58cd980b;hb=73a6b8ef25bb90ad6c66b25b17da5962a38291d2;hp=f3a8b48a8c2585261892b2dee590fc68f52552dc;hpb=54a80321064aa543023cd0b224ba9d433520983f;p=ardour.git diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc index f3a8b48a8c..2a419ee275 100644 --- a/gtk2_ardour/imageframe_view.cc +++ b/gtk2_ardour/imageframe_view.cc @@ -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,14 +55,14 @@ 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, +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, @@ -90,23 +91,14 @@ ImageFrameView::ImageFrameView(std::string item_id, //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) ; + double im_width = ((double)(trackview.current_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)); + 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(); @@ -160,11 +152,8 @@ ImageFrameView::~ImageFrameView() } } - if(imageframe) - { - gtk_object_destroy(GTK_OBJECT(imageframe)) ; - imageframe = 0 ; - } + delete imageframe; + imageframe = 0 ; } @@ -179,22 +168,21 @@ 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(nframes_t pos, void* src, double* delta) { - jack_nframes_t old_pos = frame_position ; + nframes_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() ; + nframes_t marker_old_pos = mv->get_position() ; mv->set_position(pos + (marker_old_pos - old_pos), src) ; } @@ -211,7 +199,7 @@ 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(nframes_t dur, void* src) { /* do the standard stuff */ bool ret = TimeAxisViewItem::set_duration(dur, src) ; @@ -220,7 +208,7 @@ ImageFrameView::set_duration(jack_nframes_t dur, void* src) 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) ; @@ -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_pixbuf->property_y() = h - TimeAxisViewItem::NAME_Y_OFFSET; + frame->property_y2() = h; - name_highlight->set_property ("y1", (gdouble) h - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE); - name_highlight->set_property ("y2", (gdouble) h - 1.0); + name_highlight->property_y1() = (gdouble) h - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE; + name_highlight->property_y2() = (gdouble) h - 1.0; } @@ -315,7 +302,7 @@ 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() ; @@ -367,11 +354,11 @@ ImageFrameView::remove_marker_view_item(MarkerView* mv, void* src) * @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) {