+/*
+ Copyright (C) 2000-2003 Paul Davis
+ Written by Colin Law, CMT, Glasgow
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+ $Id$
+*/
+
#include "imageframe_view.h"
#include "imageframe_time_axis.h"
#include "imageframe_time_axis_view.h"
#include "marker_view.h"
#include "editor.h"
#include "i18n.h"
-#include <gtkmmext/gtk_ui.h>
+#include "canvas_impl.h"
+
+#include <gtkmm2ext/gtk_ui.h>
#include <pbd/error.h>
#include <sys/types.h>
#include "ardour_image_compositor_socket.h"
#include "public_editor.h"
+using namespace Gtk;
+
/* <CMT Additions file="editor.cc"> */
void
}
else
{
- Gtkmmext::UI::instance()->call_slot(bind(slot(*this, &Editor::handle_new_imageframe_time_axis_view),track_name, src)) ;
+ Gtkmm2ext::UI::instance()->call_slot(bind(mem_fun(*this, &Editor::handle_new_imageframe_time_axis_view),track_name, src)) ;
}
}
void
Editor::scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item)
{
- jack_nframes_t offset = static_cast<jack_nframes_t>(frames_per_unit * (edit_hscroll_slider_width/2)) ;
-
+ // GTK2FIX
+ //jack_nframes_t offset = static_cast<jack_nframes_t>(frames_per_unit * (edit_hscroll_slider_width/2)) ;
+ jack_nframes_t offset = 0;
+
jack_nframes_t x_pos = 0 ;
if(item->get_position() < offset)
{
// Can we only bind 2 data Items?
// @todo we really want to bind the src attribute too, for the moment tracks can only be added remotely,
// so this is not too much of an issue, however will need to be looked at again
- Gtkmmext::UI::instance()->call_slot(SigC::bind(slot(*this, &Editor::handle_new_imageframe_marker_time_axis_view),track_name, marked_track)) ;
+ Gtkmm2ext::UI::instance()->call_slot(sigc::bind(mem_fun(*this, &Editor::handle_new_imageframe_marker_time_axis_view),track_name, marked_track)) ;
}
void
-Editor::popup_imageframe_edit_menu(int button, int32_t time, GtkCanvasItem* ifv, bool with_item)
+Editor::popup_imageframe_edit_menu(int button, int32_t time, ArdourCanvas::Item* ifv, bool with_item)
{
ImageFrameTimeAxis* ifta = dynamic_cast<ImageFrameTimeAxis*>(clicked_trackview) ;
}
void
-Editor::popup_marker_time_axis_edit_menu(int button, int32_t time, GtkCanvasItem* ifv, bool with_item)
+Editor::popup_marker_time_axis_edit_menu(int button, int32_t time, ArdourCanvas::Item* ifv, bool with_item)
{
MarkerTimeAxis* mta = dynamic_cast<MarkerTimeAxis*>(clicked_trackview) ;
/* <CMT Additions file="editor_canvas_events.cc"> */
-
-/**
- * ---------------------------------------------------------------------------------------------------
- * Static event handlers
- * These handlers deal with events from the GtkCanvas, a c-based component
- */
-
-
-gint
-Editor::_canvas_imageframe_start_handle_event(GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
- ImageFrameView* ifv = (ImageFrameView*) data ;
- Editor* editor = dynamic_cast<Editor*> (&ifv->get_time_axis_view().editor);
- return editor->canvas_imageframe_start_handle_event(item,event,ifv);
-}
-
-gint
-Editor::_canvas_imageframe_end_handle_event(GtkCanvasItem *item, GdkEvent *event, gpointer data)
-{
- ImageFrameView* ifv = (ImageFrameView*) data ;
- Editor* editor = dynamic_cast<Editor*> (&ifv->get_time_axis_view().editor);
- return editor->canvas_imageframe_end_handle_event(item,event,ifv);
-}
-
-
-gint
-Editor::_canvas_imageframe_item_view_event(GtkCanvasItem *item, GdkEvent* event, gpointer data)
-{
- ImageFrameView *ifv = (ImageFrameView *) data ;
- Editor* editor = dynamic_cast<Editor*> (&ifv->get_time_axis_view().editor);
- return editor->canvas_imageframe_item_view_event (item, event, ifv) ;
-}
-
-gint
-Editor::_canvas_imageframe_view_event(GtkCanvasItem *item, GdkEvent* event, gpointer data)
-{
- ImageFrameTimeAxis *ifta = (ImageFrameTimeAxis*) data ;
- Editor* editor = dynamic_cast<Editor*> (&ifta->editor);
- return editor->canvas_imageframe_view_event (item, event, ifta);
-}
-
-gint
-Editor::_canvas_marker_time_axis_view_event(GtkCanvasItem* item, GdkEvent* event, gpointer data)
-{
- MarkerTimeAxis* mta = (MarkerTimeAxis*)data ;
- Editor* editor = dynamic_cast<Editor*> (&mta->editor);
- return editor->canvas_marker_time_axis_view_event(item,event,mta);
-}
-
-gint
-Editor::_canvas_markerview_item_view_event(GtkCanvasItem *item, GdkEvent* event, gpointer data)
-{
- MarkerView* mv = (MarkerView*) data ;
- Editor* editor = dynamic_cast<Editor*> (&mv->get_time_axis_view().editor);
- return editor->canvas_markerview_item_view_event(item,event,mv);
-}
-
-gint
-Editor::_canvas_markerview_start_handle_event(GtkCanvasItem* item, GdkEvent* event, gpointer data)
-{
- MarkerView* mv = (MarkerView*)data ;
- Editor* editor = dynamic_cast<Editor*> (&mv->get_time_axis_view().editor);
- return editor->canvas_markerview_start_handle_event(item,event,mv);
-}
-
-gint
-Editor::_canvas_markerview_end_handle_event(GtkCanvasItem* item, GdkEvent* event, gpointer data)
-{
- MarkerView* mv = (MarkerView*)data ;
- Editor* editor = dynamic_cast<Editor*> (&mv->get_time_axis_view().editor);
- return editor->canvas_markerview_end_handle_event(item,event,mv);
-}
-
-/**
- * ---------------------------------------------------------------------------------------------------
- * End of Static event handlers
- */
-
-gint
-Editor::canvas_imageframe_item_view_event(GtkCanvasItem *item, GdkEvent *event, ImageFrameView *ifv)
+bool
+Editor::canvas_imageframe_item_view_event (GdkEvent *event, ArdourCanvas::Item* item, ImageFrameView *ifv)
{
gint ret = FALSE ;
ImageFrameTimeAxisGroup* iftag = 0 ;
return(ret) ;
}
-gint
-Editor::canvas_imageframe_start_handle_event(GtkCanvasItem *item, GdkEvent *event, ImageFrameView *ifv)
+bool
+Editor::canvas_imageframe_start_handle_event (GdkEvent *event, ArdourCanvas::Item* item, ImageFrameView *ifv)
{
gint ret = FALSE ;
ImageFrameTimeAxisGroup* iftag = 0 ;
return(ret) ;
}
-gint
-Editor::canvas_imageframe_end_handle_event(GtkCanvasItem *item, GdkEvent *event, ImageFrameView *ifv)
+bool
+Editor::canvas_imageframe_end_handle_event (GdkEvent *event, ArdourCanvas::Item* item, ImageFrameView *ifv)
{
gint ret = FALSE ;
ImageFrameTimeAxisGroup* iftag = 0 ;
return(ret) ;
}
-gint
-Editor::canvas_imageframe_view_event(GtkCanvasItem* item, GdkEvent* event, ImageFrameTimeAxis* ifta)
+bool
+Editor::canvas_imageframe_view_event (GdkEvent* event, ArdourCanvas::Item* item, ImageFrameTimeAxis* ifta)
{
gint ret = FALSE ;
switch (event->type)
return(ret) ;
}
-gint
-Editor::canvas_marker_time_axis_view_event(GtkCanvasItem *item, GdkEvent* event, MarkerTimeAxis* mta)
+bool
+Editor::canvas_marker_time_axis_view_event (GdkEvent* event, ArdourCanvas::Item* item, MarkerTimeAxis* mta)
{
gint ret = FALSE ;
switch (event->type)
}
-gint
-Editor::canvas_markerview_item_view_event(GtkCanvasItem *item, GdkEvent* event, MarkerView* mta)
+bool
+Editor::canvas_markerview_item_view_event (GdkEvent* event, ArdourCanvas::Item* item, MarkerView* mta)
{
gint ret = FALSE ;
switch (event->type)
return(ret) ;
}
-gint
-Editor::canvas_markerview_start_handle_event(GtkCanvasItem* item, GdkEvent* event, MarkerView* mta)
+bool
+Editor::canvas_markerview_start_handle_event (GdkEvent* event, ArdourCanvas::Item* item, MarkerView* mta)
{
gint ret = FALSE ;
switch (event->type)
return(ret) ;
}
-gint
-Editor::canvas_markerview_end_handle_event(GtkCanvasItem* item, GdkEvent* event, MarkerView* mta)
+bool
+Editor::canvas_markerview_end_handle_event (GdkEvent* event, ArdourCanvas::Item* item, MarkerView* mta)
{
gint ret = FALSE ;
switch (event->type)
/* <CMT Additions file="editor_mouse.cc"> */
void
-Editor::start_imageframe_grab(GtkCanvasItem* item, GdkEvent* event)
+Editor::start_imageframe_grab(ArdourCanvas::Item* item, GdkEvent* event)
{
ImageFrameView* ifv = ((ImageFrameTimeAxis*)clicked_trackview)->get_view()->get_selected_imageframe_view() ;
drag_info.copy = false ;
so move them to the top afterwards.
*/
- gtk_canvas_item_raise_to_top(drag_info.item) ;
- gtk_canvas_item_raise_to_top(drag_info.last_trackview->canvas_display) ;
- //gtk_canvas_item_raise_to_top(time_line_group) ;
- gtk_canvas_item_raise_to_top (cursor_group);
+ drag_info.item->raise_to_top();
+ drag_info.last_trackview->canvas_display->raise_to_top();
+ //time_line_group->raise_to_top();
+ cursor_group->raise_to_top ();
start_grab(event) ;
void
-Editor::start_markerview_grab(GtkCanvasItem* item, GdkEvent* event)
+Editor::start_markerview_grab(ArdourCanvas::Item* item, GdkEvent* event)
{
MarkerView* mv = ((MarkerTimeAxis*)clicked_trackview)->get_view()->get_selected_time_axis_item() ;
drag_info.copy = false ;
so move them to the top afterwards.
*/
- gtk_canvas_item_raise_to_top(drag_info.item) ;
- gtk_canvas_item_raise_to_top(drag_info.last_trackview->canvas_display) ;
- //gtk_canvas_item_raise_to_top(time_line_group) ;
- gtk_canvas_item_raise_to_top (cursor_group);
+ drag_info.item->raise_to_top();
+ drag_info.last_trackview->canvas_display->raise_to_top();
+ //time_line_group->raise_to_top();
+ cursor_group->raise_to_top ();
start_grab(event) ;
void
-Editor::markerview_drag_motion_callback(GtkCanvasItem*, GdkEvent* event)
+Editor::markerview_drag_motion_callback(ArdourCanvas::Item*, GdkEvent* event)
{
double cx, cy ;
}
void
-Editor::imageframe_drag_motion_callback(GtkCanvasItem*, GdkEvent* event)
+Editor::imageframe_drag_motion_callback(ArdourCanvas::Item*, GdkEvent* event)
{
double cx, cy ;
}
void
-Editor::timeaxis_item_drag_finished_callback(GtkCanvasItem*, GdkEvent* event)
+Editor::timeaxis_item_drag_finished_callback(ArdourCanvas::Item*, GdkEvent* event)
{
jack_nframes_t where ;
TimeAxisViewItem* tavi = reinterpret_cast<TimeAxisViewItem*>(drag_info.data) ;
void
-Editor::imageframe_start_handle_op(GtkCanvasItem* item, GdkEvent* event)
+Editor::imageframe_start_handle_op(ArdourCanvas::Item* item, GdkEvent* event)
{
// get the selected item from the parent time axis
ImageFrameTimeAxis* ifta = dynamic_cast<ImageFrameTimeAxis*>(clicked_trackview) ;
}
void
-Editor::imageframe_end_handle_op(GtkCanvasItem* item, GdkEvent* event)
+Editor::imageframe_end_handle_op(ArdourCanvas::Item* item, GdkEvent* event)
{
// get the selected item from the parent time axis
ImageFrameTimeAxis* ifta = dynamic_cast<ImageFrameTimeAxis*>(clicked_trackview) ;
}
void
-Editor::imageframe_start_handle_trim_motion(GtkCanvasItem* item, GdkEvent* event)
+Editor::imageframe_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event)
{
ImageFrameView* ifv = reinterpret_cast<ImageFrameView*> (drag_info.data) ;
}
void
-Editor::imageframe_start_handle_end_trim(GtkCanvasItem* item, GdkEvent* event)
+Editor::imageframe_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* event)
{
ImageFrameView* ifv = reinterpret_cast<ImageFrameView *> (drag_info.data) ;
}
void
-Editor::imageframe_end_handle_trim_motion(GtkCanvasItem* item, GdkEvent* event)
+Editor::imageframe_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event)
{
ImageFrameView* ifv = reinterpret_cast<ImageFrameView *> (drag_info.data) ;
void
-Editor::imageframe_end_handle_end_trim (GtkCanvasItem* item, GdkEvent* event)
+Editor::imageframe_end_handle_end_trim (ArdourCanvas::Item* item, GdkEvent* event)
{
ImageFrameView* ifv = reinterpret_cast<ImageFrameView *> (drag_info.data) ;
void
-Editor::markerview_item_start_handle_op(GtkCanvasItem* item, GdkEvent* event)
+Editor::markerview_item_start_handle_op(ArdourCanvas::Item* item, GdkEvent* event)
{
MarkerView* mv = reinterpret_cast<MarkerTimeAxis*>(clicked_trackview)->get_view()->get_selected_time_axis_item() ;
}
void
-Editor::markerview_item_end_handle_op(GtkCanvasItem* item, GdkEvent* event)
+Editor::markerview_item_end_handle_op(ArdourCanvas::Item* item, GdkEvent* event)
{
MarkerView* mv = reinterpret_cast<MarkerTimeAxis*>(clicked_trackview)->get_view()->get_selected_time_axis_item() ;
if (mv == 0)
void
-Editor::markerview_start_handle_trim_motion(GtkCanvasItem* item, GdkEvent* event)
+Editor::markerview_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event)
{
MarkerView* mv = reinterpret_cast<MarkerView*> (drag_info.data) ;
}
void
-Editor::markerview_start_handle_end_trim(GtkCanvasItem* item, GdkEvent* event)
+Editor::markerview_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* event)
{
MarkerView* mv = reinterpret_cast<MarkerView*> (drag_info.data) ;
}
void
-Editor::markerview_end_handle_trim_motion(GtkCanvasItem* item, GdkEvent* event)
+Editor::markerview_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event)
{
MarkerView* mv = reinterpret_cast<MarkerView*> (drag_info.data) ;
void
-Editor::markerview_end_handle_end_trim (GtkCanvasItem* item, GdkEvent* event)
+Editor::markerview_end_handle_end_trim (ArdourCanvas::Item* item, GdkEvent* event)
{
MarkerView* mv = reinterpret_cast<MarkerView*> (drag_info.data) ;
iftav = new ImageFrameTimeAxis(track_name, *this, *session, track_canvas) ;
iftav->set_time_axis_name(track_name, this) ;
track_views.push_back(iftav) ;
- const gchar *rowdata[1] ;
- rowdata[0] = iftav->name().c_str() ;
- route_list.rows().push_back(rowdata) ;
- route_list.rows().back().set_data(iftav) ;
- route_list.rows().back().select() ;
- iftav->GoingAway.connect(bind(slot(*this, &Editor::remove_route), (TimeAxisView*)iftav)) ;
- iftav->gui_changed.connect(slot(*this, &Editor::handle_gui_changes)) ;
+
+ TreeModel::Row row = *(route_display_model->append());
+
+ row[route_display_columns.text] = iftav->name();
+ row[route_display_columns.tv] = iftav;
+ route_list.get_selection()->select (row);
+
+ iftav->GoingAway.connect(bind(mem_fun(*this, &Editor::remove_route), (TimeAxisView*)iftav)) ;
+ iftav->gui_changed.connect(mem_fun(*this, &Editor::handle_gui_changes)) ;
}
void
MarkerTimeAxis* mta = new MarkerTimeAxis (*this, *this->current_session(), track_canvas, track_name, marked_track) ;
((ImageFrameTimeAxis*)marked_track)->add_marker_time_axis(mta, this) ;
track_views.push_back(mta) ;
- const gchar *rowdata[1] ;
- rowdata[0] = mta->name().c_str() ;
- route_list.rows().push_back(rowdata) ;
- route_list.rows().back().set_data (mta) ;
- route_list.rows().back().select() ;
- mta->GoingAway.connect(bind(slot (*this, &Editor::remove_route), (TimeAxisView*)mta)) ;
+
+ TreeModel::Row row = *(route_display_model->append());
+
+ row[route_display_columns.text] = mta->name();
+ row[route_display_columns.tv] = mta;
+ route_list.get_selection()->select (row);
+
+ mta->GoingAway.connect(bind(mem_fun(*this, &Editor::remove_route), (TimeAxisView*)mta)) ;
}
projects / ardour.git / blobdiff