projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
patch from mantis user cth103 to fix up fixed-time cross-track drags
[ardour.git]
/
gtk2_ardour
/
imageframe_time_axis_group.cc
diff --git
a/gtk2_ardour/imageframe_time_axis_group.cc
b/gtk2_ardour/imageframe_time_axis_group.cc
index 228ce8bb2c16a058a44098eddd73e5e954c0cab6..5dc76978b06dec938f1be6232f0e3ce6f2d10f9d 100644
(file)
--- a/
gtk2_ardour/imageframe_time_axis_group.cc
+++ b/
gtk2_ardour/imageframe_time_axis_group.cc
@@
-15,13
+15,12
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <algorithm>
*/
#include <algorithm>
-#include <gtk
--
.h>
-#include <gtkmmext/gtk_ui.h>
+#include <gtk
mm
.h>
+#include <gtkmm
2
ext/gtk_ui.h>
#include "imageframe_time_axis_group.h"
#include "imageframe_time_axis_view.h"
#include "imageframe_time_axis_group.h"
#include "imageframe_time_axis_view.h"
@@
-45,7
+44,7
@@
using namespace ARDOUR ;
* @param iftav the parent ImageFrameTimeAxis of this view helper
* @param group_id the unique name/id of this group
*/
* @param iftav the parent ImageFrameTimeAxis of this view helper
* @param group_id the unique name/id of this group
*/
-ImageFrameTimeAxisGroup::ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav,
std::string
group_id)
+ImageFrameTimeAxisGroup::ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav,
const string &
group_id)
: _view_helper(iftav), _group_id(group_id)
{
selected_imageframe_item = 0 ;
: _view_helper(iftav), _group_id(group_id)
{
selected_imageframe_item = 0 ;
@@
-89,7
+88,7
@@
ImageFrameTimeAxisGroup::~ImageFrameTimeAxisGroup()
* @param src the identity of the object that initiated the change
*/
void
* @param src the identity of the object that initiated the change
*/
void
-ImageFrameTimeAxisGroup::set_group_name(
std::string
new_name, void* src)
+ImageFrameTimeAxisGroup::set_group_name(
const string &
new_name, void* src)
{
if(_group_id != new_name)
{
{
if(_group_id != new_name)
{
@@
-166,7
+165,7
@@
ImageFrameTimeAxisGroup::set_item_samples_per_units(gdouble spp)
* @param color the new base color
*/
void
* @param color the new base color
*/
void
-ImageFrameTimeAxisGroup::apply_item_color(GdkColor& color)
+ImageFrameTimeAxisGroup::apply_item_color(Gdk
::
Color& color)
{
region_color = color ;
for(ImageFrameViewList::const_iterator citer = imageframe_views.begin(); citer != imageframe_views.end(); citer++)
{
region_color = color ;
for(ImageFrameViewList::const_iterator citer = imageframe_views.begin(); citer != imageframe_views.end(); citer++)
@@
-195,7
+194,7
@@
ImageFrameTimeAxisGroup::apply_item_color(GdkColor& color)
* @param src the identity of the object that initiated the change
*/
ImageFrameView*
* @param src the identity of the object that initiated the change
*/
ImageFrameView*
-ImageFrameTimeAxisGroup::add_imageframe_item(
std::string frame_id, jack_nframes_t start, jack_
nframes_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels, void* src)
+ImageFrameTimeAxisGroup::add_imageframe_item(
const string & frame_id, nframes_t start,
nframes_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels, void* src)
{
ImageFrameView* ifv = 0 ;
{
ImageFrameView* ifv = 0 ;
@@
-203,7
+202,7
@@
ImageFrameTimeAxisGroup::add_imageframe_item(std::string frame_id, jack_nframes_
if(get_named_imageframe_item(frame_id) == 0)
{
ifv = new ImageFrameView(frame_id,
if(get_named_imageframe_item(frame_id) == 0)
{
ifv = new ImageFrameView(frame_id,
-
GTK_CANVAS_GROUP(_view_helper.canvas_item()
),
+
_view_helper.canvas_item()->property_parent(
),
&(_view_helper.trackview()),
this,
_view_helper.trackview().editor.get_current_zoom(),
&(_view_helper.trackview()),
this,
_view_helper.trackview().editor.get_current_zoom(),
@@
-217,7
+216,7
@@
ImageFrameTimeAxisGroup::add_imageframe_item(std::string frame_id, jack_nframes_
imageframe_views.push_front(ifv) ;
imageframe_views.push_front(ifv) ;
- ifv->GoingAway.connect(bind(
slot
(*this,&ImageFrameTimeAxisGroup::remove_imageframe_item), (void*)this)) ;
+ ifv->GoingAway.connect(bind(
mem_fun
(*this,&ImageFrameTimeAxisGroup::remove_imageframe_item), (void*)this)) ;
ImageFrameAdded(ifv, src) ; /* EMIT_SIGNAL */
}
ImageFrameAdded(ifv, src) ; /* EMIT_SIGNAL */
}
@@
-233,7
+232,7
@@
ImageFrameTimeAxisGroup::add_imageframe_item(std::string frame_id, jack_nframes_
* @return the named ImageFrameView, or 0 if it is not held upon this view
*/
ImageFrameView*
* @return the named ImageFrameView, or 0 if it is not held upon this view
*/
ImageFrameView*
-ImageFrameTimeAxisGroup::get_named_imageframe_item(
std::string
frame_id)
+ImageFrameTimeAxisGroup::get_named_imageframe_item(
const string &
frame_id)
{
ImageFrameView* ifv = 0 ;
{
ImageFrameView* ifv = 0 ;
@@
-293,7
+292,7
@@
ImageFrameTimeAxisGroup::remove_selected_imageframe_item(void* src)
* @see add_imageframe_view
*/
ImageFrameView*
* @see add_imageframe_view
*/
ImageFrameView*
-ImageFrameTimeAxisGroup::remove_named_imageframe_item(
std::string
frame_id, void* src)
+ImageFrameTimeAxisGroup::remove_named_imageframe_item(
const string &
frame_id, void* src)
{
ImageFrameView* removed = 0 ;
{
ImageFrameView* removed = 0 ;
@@
-331,7
+330,7
@@
ImageFrameTimeAxisGroup::remove_named_imageframe_item(std::string frame_id, void
void
ImageFrameTimeAxisGroup::remove_imageframe_item(ImageFrameView* ifv, void* src)
{
void
ImageFrameTimeAxisGroup::remove_imageframe_item(ImageFrameView* ifv, void* src)
{
- ENSURE_GUI_THREAD(bind (
slot
(*this, &ImageFrameTimeAxisGroup::remove_imageframe_item), ifv, src));
+ ENSURE_GUI_THREAD(bind (
mem_fun
(*this, &ImageFrameTimeAxisGroup::remove_imageframe_item), ifv, src));
ImageFrameViewList::iterator i;
if((i = find (imageframe_views.begin(), imageframe_views.end(), ifv)) != imageframe_views.end())
ImageFrameViewList::iterator i;
if((i = find (imageframe_views.begin(), imageframe_views.end(), ifv)) != imageframe_views.end())
@@
-439,7
+438,7
@@
ImageFrameTimeAxisGroup::remove_this_group(void* src)
defer to idle loop, otherwise we'll delete this object
while we're still inside this function ...
*/
defer to idle loop, otherwise we'll delete this object
while we're still inside this function ...
*/
- G
tk::Main::idle.connect(bind(slot
(&ImageFrameTimeAxisGroup::idle_remove_this_group), this, src));
+ G
lib::signal_idle().connect(bind(ptr_fun
(&ImageFrameTimeAxisGroup::idle_remove_this_group), this, src));
}
/**
}
/**