#include "imageframe_socket_handler.h"
#include "ardour_image_compositor_socket.h"
#include "public_editor.h"
+#include "gui_thread.h"
using namespace Gtk;
using namespace PBD;
}
else
{
- Gtkmm2ext::UI::instance()->call_slot(bind(mem_fun(*this, &Editor::handle_new_imageframe_time_axis_view),track_name, src)) ;
+ Gtkmm2ext::UI::instance()->call_slot (boost::bind (&Editor::handle_new_imageframe_time_axis_view, this,track_name, src));
}
}
Editor::scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item)
{
// GTK2FIX
- //nframes64_t offset = static_cast<nframes64_t>(frames_per_unit * (edit_hscroll_slider_width/2)) ;
- nframes64_t offset = 0;
+ //framepos_t offset = static_cast<framepos_t>(frames_per_unit * (edit_hscroll_slider_width/2)) ;
+ framepos_t offset = 0;
- nframes64_t x_pos = 0 ;
+ framepos_t x_pos = 0 ;
if (item->get_position() < offset) {
x_pos = 0 ;
void
Editor::add_imageframe_marker_time_axis(const string & track_name, TimeAxisView* marked_track, void* src)
{
- // 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,
+ // Can we only sigc::bind 2 data Items?
+ // @todo we really want to sigc::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
- Gtkmm2ext::UI::instance()->call_slot(sigc::bind(mem_fun(*this, &Editor::handle_new_imageframe_marker_time_axis_view),track_name, marked_track)) ;
+ Gtkmm2ext::UI::instance()->call_slot (boost::bind (&Editor::handle_new_imageframe_marker_time_axis_view, this, track_name, marked_track));
}
void
}
/* </CMT Additions file="editor.cc"> */
-
-
-
-
-
/* <CMT Additions file="editor_canvas_events.cc"> */
bool
Editor::canvas_imageframe_item_view_event (GdkEvent *event, ArdourCanvas::Item* item, ImageFrameView *ifv)
double cx, cy ;
MarkerView* mv = reinterpret_cast<MarkerView*>(drag_info.data) ;
- nframes64_t pending_region_position ;
- nframes64_t pointer_frame ;
+ framepos_t pending_region_position ;
+ framepos_t pointer_frame ;
pointer_frame = event_frame(event, &cx, &cy) ;
snap_to(pointer_frame) ;
- if (pointer_frame > (nframes64_t) drag_info.pointer_frame_offset)
+ if (pointer_frame > (framepos_t) drag_info.pointer_frame_offset)
{
pending_region_position = pointer_frame - drag_info.pointer_frame_offset ;
snap_to(pending_region_position) ;
ImageFrameView* ifv = reinterpret_cast<ImageFrameView*>(drag_info.data) ;
- nframes64_t pending_region_position;
- nframes64_t pointer_frame;
+ framepos_t pending_region_position;
+ framepos_t pointer_frame;
pointer_frame = event_frame(event, &cx, &cy) ;
snap_to(pointer_frame) ;
- if (pointer_frame > (nframes64_t) drag_info.pointer_frame_offset)
+ if (pointer_frame > (framepos_t) drag_info.pointer_frame_offset)
{
pending_region_position = pointer_frame - drag_info.pointer_frame_offset ;
snap_to(pending_region_position) ;
void
Editor::timeaxis_item_drag_finished_callback(ArdourCanvas::Item*, GdkEvent* event)
{
- nframes64_t where ;
+ framepos_t where ;
TimeAxisViewItem* tavi = reinterpret_cast<TimeAxisViewItem*>(drag_info.data) ;
bool item_x_movement = (drag_info.last_frame_position != tavi->get_position()) ;
{
ImageFrameView* ifv = reinterpret_cast<ImageFrameView*> (drag_info.data) ;
- nframes64_t start = 0 ;
- nframes64_t end = 0 ;
- nframes64_t pointer_frame = event_frame(event) ;
+ framepos_t start = 0 ;
+ framepos_t end = 0 ;
+ framepos_t pointer_frame = event_frame(event) ;
// chekc th eposition of the item is not locked
if(!ifv->get_position_locked()) {
}
// are we getting bigger or smaller?
- nframes64_t new_dur_val = end - start ;
+ framepos_t new_dur_val = end - start ;
// start handle, so a smaller pointer frame increases our component size
if(pointer_frame <= drag_info.grab_frame)
}
else
{
- nframes64_t temp = ifv->get_position() + ifv->get_duration() ;
+ framepos_t temp = ifv->get_position() + ifv->get_duration() ;
- ifv->set_position((nframes64_t) (temp - drag_info.cumulative_x_drag), this) ;
- ifv->set_duration((nframes64_t) drag_info.cumulative_x_drag, this) ;
+ ifv->set_position((framepos_t) (temp - drag_info.cumulative_x_drag), this) ;
+ ifv->set_duration((framepos_t) drag_info.cumulative_x_drag, this) ;
}
}
{
ImageFrameView* ifv = reinterpret_cast<ImageFrameView *> (drag_info.data) ;
- nframes64_t start = 0 ;
- nframes64_t end = 0 ;
- nframes64_t pointer_frame = event_frame(event) ;
- nframes64_t new_dur_val = 0 ;
+ framepos_t start = 0 ;
+ framepos_t end = 0 ;
+ framepos_t pointer_frame = event_frame(event) ;
+ framepos_t new_dur_val = 0 ;
snap_to(pointer_frame) ;
}
else
{
- nframes64_t new_duration = (nframes64_t)drag_info.cumulative_x_drag ;
+ framepos_t new_duration = (framepos_t)drag_info.cumulative_x_drag ;
if((new_duration <= ifv->get_max_duration()) && (new_duration >= ifv->get_min_duration()))
{
ifv->set_duration(new_duration, this) ;
{
MarkerView* mv = reinterpret_cast<MarkerView*> (drag_info.data) ;
- nframes64_t start = 0 ;
- nframes64_t end = 0 ;
- nframes64_t pointer_frame = event_frame(event) ;
+ framepos_t start = 0 ;
+ framepos_t end = 0 ;
+ framepos_t pointer_frame = event_frame(event) ;
// chekc th eposition of the item is not locked
if(!mv->get_position_locked())
}
// are we getting bigger or smaller?
- nframes64_t new_dur_val = end - start ;
+ framepos_t new_dur_val = end - start ;
if(pointer_frame <= drag_info.grab_frame)
{
}
else
{
- nframes64_t temp = mv->get_position() + mv->get_duration() ;
+ framepos_t temp = mv->get_position() + mv->get_duration() ;
- mv->set_position((nframes64_t) (temp - drag_info.cumulative_x_drag), this) ;
- mv->set_duration((nframes64_t) drag_info.cumulative_x_drag, this) ;
+ mv->set_position((framepos_t) (temp - drag_info.cumulative_x_drag), this) ;
+ mv->set_duration((framepos_t) drag_info.cumulative_x_drag, this) ;
}
}
{
MarkerView* mv = reinterpret_cast<MarkerView*> (drag_info.data) ;
- nframes64_t start = 0 ;
- nframes64_t end = 0 ;
- nframes64_t pointer_frame = event_frame(event) ;
- nframes64_t new_dur_val = 0 ;
+ framepos_t start = 0 ;
+ framepos_t end = 0 ;
+ framepos_t pointer_frame = event_frame(event) ;
+ framepos_t new_dur_val = 0 ;
snap_to(pointer_frame) ;
{
// we cant extend beyond the item we are marking
ImageFrameView* marked_item = mv->get_marked_item() ;
- nframes64_t marked_end = marked_item->get_position() + marked_item->get_duration() ;
+ framepos_t marked_end = marked_item->get_position() + marked_item->get_duration() ;
if(mv->get_max_duration_active() && (new_dur_val > mv->get_max_duration()))
{
}
else
{
- nframes64_t new_duration = (nframes64_t)drag_info.cumulative_x_drag ;
+ framepos_t new_duration = (framepos_t)drag_info.cumulative_x_drag ;
mv->set_duration(new_duration, this) ;
}
}
row[route_display_columns.tv] = iftav;
route_list_display.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)) ;
+ iftav->gui_changed.connect(sigc::mem_fun(*this, &Editor::handle_gui_changes)) ;
}
void
Editor::handle_new_imageframe_marker_time_axis_view(const string & track_name, TimeAxisView* marked_track)
{
- MarkerTimeAxis* mta = new MarkerTimeAxis (*this, *this->current_session(), *track_canvas, track_name, marked_track) ;
+ MarkerTimeAxis* mta = new MarkerTimeAxis (*this, *this->session(), *track_canvas, track_name, marked_track) ;
((ImageFrameTimeAxis*)marked_track)->add_marker_time_axis(mta, this) ;
track_views.push_back(mta) ;
row[route_display_columns.text] = mta->name();
row[route_display_columns.tv] = mta;
route_list_display.get_selection()->select (row);
-
- mta->GoingAway.connect(bind(mem_fun(*this, &Editor::remove_route), (TimeAxisView*)mta)) ;
- }
+}
/* </CMT Additions file="editor_route_list.cc"> */