/*
- Copyright (C) 2000-2003 Paul Davis
+ Copyright (C) 2000-2003 Paul Davis
Written by Colin Law, CMT, Glasgow
This program is free software; you can redistribute it and/or modify
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 "canvas_impl.h"
#include <gtkmm2ext/gtk_ui.h>
-#include <pbd/error.h>
+#include "pbd/error.h"
#include <sys/types.h>
#include <sys/socket.h>
#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;
+using namespace std;
+
+TimeAxisView*
+Editor::get_named_time_axis(const string & name)
+{
+ TimeAxisView* tav = 0 ;
+
+ for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i)
+ {
+ if (((TimeAxisView*)*i)->name() == name)
+ {
+ tav = ((TimeAxisView*)*i) ;
+ break ;
+ }
+ }
+ return(tav) ;
+}
/* <CMT Additions file="editor.cc"> */
}
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));
}
}
{
image_socket_listener = ImageFrameSocketHandler::create_instance(*this) ;
}
-
+
if(image_socket_listener->is_connected() == true)
{
return ;
// XXX should really put this somewhere safe
const char * host_ip = "127.0.0.1" ;
-
+
bool retcode = image_socket_listener->connect(host_ip, ardourvis::DEFAULT_PORT) ;
-
+
if(retcode == false)
{
// XXX need to get some return status here
warning << "Image Compositor Connection attempt failed" << std::endl ;
return ;
}
-
+
// add the socket to the gui loop, and keep the retuned tag value of the input
gint tag = gdk_input_add(image_socket_listener->get_socket_descriptor(), GDK_INPUT_READ,ImageFrameSocketHandler::image_socket_callback,image_socket_listener) ;
image_socket_listener->set_gdk_input_tag(tag) ;
Editor::scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item)
{
// GTK2FIX
- //nframes_t offset = static_cast<nframes_t>(frames_per_unit * (edit_hscroll_slider_width/2)) ;
- nframes_t offset = 0;
+ //framepos_t offset = static_cast<framepos_t>(frames_per_unit * (edit_hscroll_slider_width/2)) ;
+ framepos_t offset = 0;
- nframes_t x_pos = 0 ;
+ framepos_t x_pos = 0 ;
if (item->get_position() < offset) {
x_pos = 0 ;
} else {
x_pos = item->get_position() - offset + (item->get_duration() / 2);
}
-
- reposition_x_origin (x_pos);
+
+ reset_x_origin (x_pos);
}
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
Editor::popup_imageframe_edit_menu(int button, int32_t time, ArdourCanvas::Item* ifv, bool with_item)
{
ImageFrameTimeAxis* ifta = dynamic_cast<ImageFrameTimeAxis*>(clicked_axisview) ;
-
+
if(ifta)
{
ImageFrameTimeAxisGroup* iftag = ifta->get_view()->get_selected_imageframe_group() ;
-
+
if(iftag)
{
ImageFrameView* selected_ifv = ifta->get_view()->get_selected_imageframe_view() ;
Editor::popup_marker_time_axis_edit_menu(int button, int32_t time, ArdourCanvas::Item* ifv, bool with_item)
{
MarkerTimeAxis* mta = dynamic_cast<MarkerTimeAxis*>(clicked_axisview) ;
-
+
if(mta)
{
MarkerView* selected_mv = mta->get_view()->get_selected_time_axis_item() ;
}
}
}
-
-TimeAxisView*
-Editor::get_named_time_axis(const string & name)
-{
- TimeAxisView* tav = 0 ;
-
- for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i)
- {
- if (((TimeAxisView*)*i)->name() == name)
- {
- tav = ((TimeAxisView*)*i) ;
- break ;
- }
- }
- return(tav) ;
-}
-
/* </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)
{
gint ret = FALSE ;
ImageFrameTimeAxisGroup* iftag = 0 ;
-
+
switch (event->type)
{
case GDK_BUTTON_PRESS:
{
gint ret = FALSE ;
ImageFrameTimeAxisGroup* iftag = 0 ;
-
+
switch (event->type)
{
case GDK_BUTTON_PRESS:
clicked_axisview = &ifv->get_time_axis_view() ;
iftag = ifv->get_time_axis_group() ;
dynamic_cast<ImageFrameTimeAxis*>(clicked_axisview)->get_view()->set_selected_imageframe_view(iftag, ifv);
-
+
ret = button_press_handler (item, event, ImageFrameHandleStartItem) ;
break ;
case GDK_BUTTON_RELEASE:
{
gint ret = FALSE ;
ImageFrameTimeAxisGroup* iftag = 0 ;
-
+
switch (event->type)
{
case GDK_BUTTON_PRESS:
clicked_axisview = &ifv->get_time_axis_view() ;
iftag = ifv->get_time_axis_group() ;
dynamic_cast<ImageFrameTimeAxis*>(clicked_axisview)->get_view()->set_selected_imageframe_view(iftag, ifv);
-
+
ret = button_press_handler (item, event, ImageFrameHandleEndItem) ;
break ;
case GDK_BUTTON_RELEASE:
drag_info.motion_callback = &Editor::imageframe_drag_motion_callback;
drag_info.finished_callback = &Editor::timeaxis_item_drag_finished_callback;
drag_info.last_frame_position = ifv->get_position() ;
-
- drag_info.last_trackview = &ifv->get_time_axis_view() ;
-
+
+ drag_info.source_trackview = &ifv->get_time_axis_view() ;
+ drag_info.dest_trackview = drag_info.source_trackview;
+
/* this is subtle. raising the regionview itself won't help,
because raise_to_top() just puts the item on the top of
its parent's stack. so, we need to put the trackview canvas_display group
*/
drag_info.item->raise_to_top();
- drag_info.last_trackview->canvas_display->raise_to_top();
+ drag_info.source_trackview->canvas_display->raise_to_top();
//time_line_group->raise_to_top();
cursor_group->raise_to_top ();
drag_info.finished_callback = &Editor::timeaxis_item_drag_finished_callback;
drag_info.last_frame_position = mv->get_position() ;
- drag_info.last_trackview = &mv->get_time_axis_view() ;
+ drag_info.source_trackview = &mv->get_time_axis_view() ;
+ drag_info.dest_trackview = drag_info.source_trackview;
/* this is subtle. raising the regionview itself won't help,
because raise_to_top() just puts the item on the top of
*/
drag_info.item->raise_to_top();
- drag_info.last_trackview->canvas_display->raise_to_top();
+ drag_info.source_trackview->canvas_display->raise_to_top();
//time_line_group->raise_to_top();
cursor_group->raise_to_top ();
start_grab(event) ;
-
+
drag_info.pointer_frame_offset = pixel_to_frame(drag_info.grab_x) - drag_info.last_frame_position ;
}
double cx, cy ;
MarkerView* mv = reinterpret_cast<MarkerView*>(drag_info.data) ;
- nframes_t pending_region_position ;
- nframes_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 > (nframes_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) ;
-
+
// we dont allow marker items to extend beyond, or in front of the marked items so
// cap the value to the marked items position and duration
- if((pending_region_position + mv->get_duration()) >= ((mv->get_marked_item()->get_position()) + (mv->get_marked_item()->get_duration())))
+ if((pending_region_position + mv->get_duration()) >= ((mv->get_marked_item()->get_position()) + (mv->get_marked_item()->get_duration())))
{
pending_region_position = (mv->get_marked_item()->get_position() + mv->get_marked_item()->get_duration()) - (mv->get_duration()) ;
}
- else if(pending_region_position <= mv->get_marked_item()->get_position())
+ else if(pending_region_position <= mv->get_marked_item()->get_position())
{
pending_region_position = mv->get_marked_item()->get_position() ;
}
}
drag_info.last_frame_position = pending_region_position ;
-
+
// we treat this as a special case, usually we want to send the identitiy of the caller
// but in this case, that would trigger our socket handler to handle the event, sending
// notification to the image compositor. This would be fine, except that we have not
Editor::imageframe_drag_motion_callback(ArdourCanvas::Item*, GdkEvent* event)
{
double cx, cy ;
-
+
ImageFrameView* ifv = reinterpret_cast<ImageFrameView*>(drag_info.data) ;
-
- nframes_t pending_region_position;
- nframes_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 > (nframes_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) ;
drag_info.grab_x = cx;
//drag_info.last_frame_position = pending_region_position ;
drag_info.current_pointer_frame = pending_region_position ;
-
+
// we treat this as a special case, usually we want to send the identitiy of the caller
// but in this case, that would trigger our socket handler to handle the event, sending
// notification to the image compositor. This would be fine, except that we have not
// completed the drag, only then do we want the image compositor notofied.
// We therefore set the caller identity to the special case of 0
ifv->set_position(pending_region_position, 0) ;
-
+
show_verbose_time_cursor(pending_region_position) ;
}
void
Editor::timeaxis_item_drag_finished_callback(ArdourCanvas::Item*, GdkEvent* event)
{
- nframes_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()) ;
{
/* base the new region position on the current position of the regionview.*/
where = drag_info.current_pointer_frame ;
-
+
// final call to set position after the motion to tell interested parties of the new position
tavi->set_position(where, this) ;
}
{
//where = tavi->get_position() ;
}
-
+
}
drag_info.cumulative_x_drag = 0;
drag_info.motion_callback = &Editor::imageframe_start_handle_trim_motion ;
drag_info.finished_callback = &Editor::imageframe_start_handle_end_trim ;
-
+
start_grab(event) ;
-
+
show_verbose_time_cursor(ifv->get_position(), 10) ;
}
}
if(ifta)
{
ImageFrameView* ifv = ifta->get_view()->get_selected_imageframe_view() ;
-
+
if (ifv == 0)
{
fatal << _("programming error: no ImageFrameView selected") << endmsg ;
/*NOTREACHED*/
return ;
}
-
+
drag_info.item = ifv->get_canvas_frame() ;
drag_info.data = ifv ;
drag_info.grab_x = event->motion.x ;
Editor::imageframe_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event)
{
ImageFrameView* ifv = reinterpret_cast<ImageFrameView*> (drag_info.data) ;
-
- nframes_t start = 0 ;
- nframes_t end = 0 ;
- nframes_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()) {
snap_to(pointer_frame) ;
if(pointer_frame != drag_info.last_pointer_frame) {
start = ifv->get_position() ;
end = ifv->get_position() + ifv->get_duration() ;
-
+
if (pointer_frame > end) {
start = end ;
} else {
start = pointer_frame ;
}
-
+
// are we getting bigger or smaller?
- nframes_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)
+ if(pointer_frame <= drag_info.grab_frame)
{
if(ifv->get_max_duration_active() && (new_dur_val > ifv->get_max_duration()))
{
// current values are ok
}
}
-
+
drag_info.last_pointer_frame = pointer_frame ;
-
+
/* re-calculatethe duration and position of the imageframeview */
drag_info.cumulative_x_drag = new_dur_val ;
ifv->set_position(start, 0) ;
}
}
-
+
show_verbose_time_cursor(start, 10) ;
}
Editor::imageframe_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* event)
{
ImageFrameView* ifv = reinterpret_cast<ImageFrameView *> (drag_info.data) ;
-
+
if (drag_info.cumulative_x_drag == 0)
{
/* just a click */
}
else
{
- nframes_t temp = ifv->get_position() + ifv->get_duration() ;
-
- ifv->set_position((nframes_t) (temp - drag_info.cumulative_x_drag), this) ;
- ifv->set_duration((nframes_t) drag_info.cumulative_x_drag, this) ;
+ framepos_t temp = ifv->get_position() + ifv->get_duration() ;
+
+ ifv->set_position((framepos_t) (temp - drag_info.cumulative_x_drag), this) ;
+ ifv->set_duration((framepos_t) drag_info.cumulative_x_drag, this) ;
}
}
Editor::imageframe_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event)
{
ImageFrameView* ifv = reinterpret_cast<ImageFrameView *> (drag_info.data) ;
-
- nframes_t start = 0 ;
- nframes_t end = 0 ;
- nframes_t pointer_frame = event_frame(event) ;
- nframes_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) ;
-
+
if (pointer_frame != drag_info.last_pointer_frame)
{
start = ifv->get_position() ;
{
end = pointer_frame ;
}
-
+
new_dur_val = end - start ;
-
+
// are we getting bigger or smaller?
if(pointer_frame >= drag_info.last_pointer_frame)
{
new_dur_val = ifv->get_min_duration() ;
}
}
-
+
drag_info.last_pointer_frame = pointer_frame ;
drag_info.cumulative_x_drag = new_dur_val ;
-
+
// we treat this as a special case, usually we want to send the identitiy of the caller
// but in this case, that would trigger our socket handler to handle the event, sending
// notification to the image compositor. This would be fine, except that we have not
// We therefore set the caller identity to the special case of 0
ifv->set_duration(new_dur_val, 0) ;
}
-
+
show_verbose_time_cursor(new_dur_val, 10) ;
}
}
else
{
- nframes_t new_duration = (nframes_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) ;
/*NOTREACHED*/
return ;
}
-
+
drag_info.item = mv->get_canvas_frame() ;
drag_info.data = mv ;
drag_info.grab_x = event->motion.x ;
drag_info.cumulative_x_drag = 0 ;
-
+
drag_info.motion_callback = &Editor::markerview_end_handle_trim_motion ;
drag_info.finished_callback = &Editor::markerview_end_handle_end_trim ;
-
+
start_grab(event, trimmer_cursor) ;
}
Editor::markerview_start_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event)
{
MarkerView* mv = reinterpret_cast<MarkerView*> (drag_info.data) ;
-
- nframes_t start = 0 ;
- nframes_t end = 0 ;
- nframes_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())
{
{
start = mv->get_position() ;
end = mv->get_position() + mv->get_duration() ;
-
+
if (pointer_frame > end)
{
start = end ;
{
start = pointer_frame ;
}
-
+
// are we getting bigger or smaller?
- nframes_t new_dur_val = end - start ;
-
+ framepos_t new_dur_val = end - start ;
+
if(pointer_frame <= drag_info.grab_frame)
{
if(mv->get_max_duration_active() && (new_dur_val > mv->get_max_duration()))
// current values are ok
}
}
-
+
drag_info.last_pointer_frame = pointer_frame ;
-
+
/* re-calculatethe duration and position of the imageframeview */
drag_info.cumulative_x_drag = new_dur_val ;
-
+
// we treat this as a special case, usually we want to send the identitiy of the caller
// but in this case, that would trigger our socket handler to handle the event, sending
// notification to the image compositor. This would be fine, except that we have not
mv->set_position(start, 0) ;
}
}
-
+
show_verbose_time_cursor(start, 10) ;
}
Editor::markerview_start_handle_end_trim(ArdourCanvas::Item* item, GdkEvent* event)
{
MarkerView* mv = reinterpret_cast<MarkerView*> (drag_info.data) ;
-
+
if (drag_info.cumulative_x_drag == 0)
{
/* just a click */
}
else
{
- nframes_t temp = mv->get_position() + mv->get_duration() ;
-
- mv->set_position((nframes_t) (temp - drag_info.cumulative_x_drag), this) ;
- mv->set_duration((nframes_t) drag_info.cumulative_x_drag, this) ;
+ framepos_t temp = mv->get_position() + mv->get_duration() ;
+
+ mv->set_position((framepos_t) (temp - drag_info.cumulative_x_drag), this) ;
+ mv->set_duration((framepos_t) drag_info.cumulative_x_drag, this) ;
}
}
Editor::markerview_end_handle_trim_motion(ArdourCanvas::Item* item, GdkEvent* event)
{
MarkerView* mv = reinterpret_cast<MarkerView*> (drag_info.data) ;
-
- nframes_t start = 0 ;
- nframes_t end = 0 ;
- nframes_t pointer_frame = event_frame(event) ;
- nframes_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) ;
-
+
if (pointer_frame != drag_info.last_pointer_frame)
{
start = mv->get_position() ;
end = mv->get_position() + mv->get_duration() ;
-
+
if(pointer_frame < start)
{
end = start ;
{
end = pointer_frame ;
}
-
+
new_dur_val = end - start ;
-
+
// are we getting bigger or smaller?
if(pointer_frame >= drag_info.last_pointer_frame)
{
// we cant extend beyond the item we are marking
ImageFrameView* marked_item = mv->get_marked_item() ;
- nframes_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()))
{
if((start + mv->get_max_duration()) > marked_end)
drag_info.last_pointer_frame = pointer_frame ;
drag_info.cumulative_x_drag = new_dur_val ;
-
+
// we treat this as a special case, usually we want to send the identitiy of the caller
// but in this case, that would trigger our socket handler to handle the event, sending
// notification to the image compositor. This would be fine, except that we have not
// We therefore set the caller identity to the special case of 0
mv->set_duration(new_dur_val, 0) ;
}
-
+
show_verbose_time_cursor(new_dur_val, 10) ;
}
}
else
{
- nframes_t new_duration = (nframes_t)drag_info.cumulative_x_drag ;
+ framepos_t new_duration = (framepos_t)drag_info.cumulative_x_drag ;
mv->set_duration(new_duration, this) ;
}
}
Editor::handle_new_imageframe_time_axis_view(const string & track_name, void* src)
{
ImageFrameTimeAxis* iftav ;
- iftav = new ImageFrameTimeAxis(track_name, *this, *session, track_canvas) ;
+ iftav = new ImageFrameTimeAxis(track_name, *this, *session, *track_canvas) ;
iftav->set_time_axis_name(track_name, this) ;
track_views.push_back(iftav) ;
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"> */
projects / ardour.git / blobdiff