projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
convert property_foo().set_value(bar) to property_foo() = bar
[ardour.git]
/
gtk2_ardour
/
imageframe_time_axis_group.h
diff --git
a/gtk2_ardour/imageframe_time_axis_group.h
b/gtk2_ardour/imageframe_time_axis_group.h
index 18731acbb8637cc06c8cec720a9718158091d473..090a464b4b89aa487495df275765a6c903ced67f 100644
(file)
--- a/
gtk2_ardour/imageframe_time_axis_group.h
+++ b/
gtk2_ardour/imageframe_time_axis_group.h
@@
-24,8
+24,8
@@
#include <list>
#include <cmath>
#include <list>
#include <cmath>
-#include <gtk
--
.h>
-#include <
gtk-
canvas.h>
+#include <gtk
mm
.h>
+#include <
libgnomecanvas/libgnome
canvas.h>
#include <jack/jack.h>
#include "imageframe_time_axis_view.h"
#include <jack/jack.h>
#include "imageframe_time_axis_view.h"
@@
-40,7
+40,7
@@
class ImageFrameView ;
* A viewable object may also be useful...
*
*/
* A viewable object may also be useful...
*
*/
-class ImageFrameTimeAxisGroup : public
SigC::Object
+class ImageFrameTimeAxisGroup : public
sigc::trackable
{
public:
//---------------------------------------------------------------------------------------//
{
public:
//---------------------------------------------------------------------------------------//
@@
-117,7
+117,7
@@
class ImageFrameTimeAxisGroup : public SigC::Object
*
* @param color the new base color
*/
*
* @param color the new base color
*/
- void apply_item_color(GdkColor&) ;
+ void apply_item_color(Gdk
::
Color&) ;
//---------------------------------------------------------------------------------------//
//---------------------------------------------------------------------------------------//
@@
-234,7
+234,7
@@
class ImageFrameTimeAxisGroup : public SigC::Object
//---------------------------------------------------------------------------------//
// Emitted Signals
//---------------------------------------------------------------------------------//
// Emitted Signals
-
SigC::Signal0
<void> GoingAway ;
+
sigc::signal
<void> GoingAway ;
/**
* Emitted when this Group has been removed
/**
* Emitted when this Group has been removed
@@
-243,16
+243,16
@@
class ImageFrameTimeAxisGroup : public SigC::Object
* the destructor, this allows us to capture the source of the deletion
* event
*/
* the destructor, this allows us to capture the source of the deletion
* event
*/
-
SigC::Signal2
<void,std::string,void*> GroupRemoved ;
+
sigc::signal
<void,std::string,void*> GroupRemoved ;
/** Emitted when we have changed the name of this TimeAxis */
/** Emitted when we have changed the name of this TimeAxis */
-
SigC::Signal3
<void,std::string,std::string,void*> NameChanged ;
+
sigc::signal
<void,std::string,std::string,void*> NameChanged ;
/** Emitted when an ImageFrameView is added to this group */
/** Emitted when an ImageFrameView is added to this group */
-
SigC::Signal2
<void, ImageFrameView*, void*> ImageFrameAdded ;
+
sigc::signal
<void, ImageFrameView*, void*> ImageFrameAdded ;
/** Emitted when an ImageFrameView is removed from this group */
/** Emitted when an ImageFrameView is removed from this group */
-
SigC::Signal4
<void, std::string&, std::string&, std::string&, void*> ImageFrameRemoved ;
+
sigc::signal
<void, std::string&, std::string&, std::string&, void*> ImageFrameRemoved ;
protected:
protected:
@@
-288,7
+288,7
@@
class ImageFrameTimeAxisGroup : public SigC::Object
std::string _group_id ;
/* XXX why are these different? */
std::string _group_id ;
/* XXX why are these different? */
- GdkColor region_color ;
+ Gdk
::
Color region_color ;
uint32_t stream_base_color ;
/** indicates if this group is currently selected */
uint32_t stream_base_color ;
/** indicates if this group is currently selected */