projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't report an error when the user cancels a time stretch operation.
[ardour.git]
/
gtk2_ardour
/
imageframe_time_axis_view.cc
diff --git
a/gtk2_ardour/imageframe_time_axis_view.cc
b/gtk2_ardour/imageframe_time_axis_view.cc
index 88cdbd53cc6ff2b88ca88b6e20399696928938c7..b78ce58b084dfe3658b53e7f8f20a0fa2c97029d 100644
(file)
--- a/
gtk2_ardour/imageframe_time_axis_view.cc
+++ b/
gtk2_ardour/imageframe_time_axis_view.cc
@@
-66,6
+66,8
@@
ImageFrameTimeAxisView::ImageFrameTimeAxisView (ImageFrameTimeAxis& tv)
selected_imageframe_group = 0 ;
selected_imageframe_view = 0 ;
selected_imageframe_group = 0 ;
selected_imageframe_view = 0 ;
+
+ ImageFrameTimeAxisGroup::CatchDeletion.connect (*this, ui_bind (&ImageFrameTimeAxisView::remove_imageframe_group, this, _1), gui_context());
}
/**
}
/**
@@
-211,12
+213,8
@@
ImageFrameTimeAxisView::add_imageframe_group(std::string group_id, void* src)
else
{
iftag = new ImageFrameTimeAxisGroup(*this, group_id) ;
else
{
iftag = new ImageFrameTimeAxisGroup(*this, group_id) ;
-
imageframe_groups.push_front(iftag) ;
imageframe_groups.push_front(iftag) ;
-
- iftag->GoingAway.connect(sigc::bind(sigc::mem_fun(*this,&ImageFrameTimeAxisView::remove_imageframe_group), iftag, (void*)this)) ;
-
- ImageFrameGroupAdded(iftag, src) ; /* EMIT_SIGNAL */
+ ImageFrameGroupAdded(iftag, src) ; /* EMIT_SIGNAL */
}
return(iftag) ;
}
return(iftag) ;
@@
-410,7
+408,7
@@
ImageFrameTimeAxisView::set_imageframe_duration_sec(double sec)
{
if(selected_imageframe_group && selected_imageframe_view)
{
{
if(selected_imageframe_group && selected_imageframe_view)
{
- selected_imageframe_view->set_duration((nframes_t) (sec * _trackview.editor.
current_
session()->frame_rate()), this) ;
+ selected_imageframe_view->set_duration((nframes_t) (sec * _trackview.editor.session()->frame_rate()), this) ;
}
}
}
}