projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make "New Session" open NSD on the right page
[ardour.git]
/
gtk2_ardour
/
imageframe_time_axis.h
diff --git
a/gtk2_ardour/imageframe_time_axis.h
b/gtk2_ardour/imageframe_time_axis.h
index dfbb0bd72f4a070a02835fbabb2f7219c7c34737..4b3bf0c857faaff59dd80cf61a77907601bdecec 100644
(file)
--- a/
gtk2_ardour/imageframe_time_axis.h
+++ b/
gtk2_ardour/imageframe_time_axis.h
@@
-15,25
+15,28
@@
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$
*/
#ifndef __ardour_imageframe_time_axis_h__
#define __ardour_imageframe_time_axis_h__
*/
#ifndef __ardour_imageframe_time_axis_h__
#define __ardour_imageframe_time_axis_h__
-#include <gtk--.h>
-#include <gtk-canvas.h>
+#include <list>
+
+//#include <libgnomecanvas.h>
#include "ardour_dialog.h"
#include "enums.h"
#include "time_axis_view.h"
#include "ardour_dialog.h"
#include "enums.h"
#include "time_axis_view.h"
-#include
<list>
+#include
"canvas.h"
#include "visual_time_axis.h"
namespace ARDOUR
{
class Session ;
}
#include "visual_time_axis.h"
namespace ARDOUR
{
class Session ;
}
+namespace Gtk {
+ class Menu;
+}
class PublicEditor ;
class ImageFrameView ;
class PublicEditor ;
class ImageFrameView ;
@@
-59,7
+62,7
@@
class ImageFrameTimeAxis : public VisualTimeAxis
* @param sess the current session
* @param canvas the parent canvas item
*/
* @param sess the current session
* @param canvas the parent canvas item
*/
- ImageFrameTimeAxis(
std::string track_id, PublicEditor& ed, ARDOUR::Session& sess, Gtk::Widget *
canvas) ;
+ ImageFrameTimeAxis(
const string & track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas&
canvas) ;
/**
* Destructor
/**
* Destructor
@@
-123,7
+126,7
@@
class ImageFrameTimeAxis : public VisualTimeAxis
* @param track_id the track_id of the MarkerTimeAxis to search for
* @return the named markerTimeAxis, or 0 if the named MarkerTimeAxis is not associated with this ImageFrameTimeAxis
*/
* @param track_id the track_id of the MarkerTimeAxis to search for
* @return the named markerTimeAxis, or 0 if the named MarkerTimeAxis is not associated with this ImageFrameTimeAxis
*/
- MarkerTimeAxis* get_named_marker_time_axis(
std::string
track_id) ;
+ MarkerTimeAxis* get_named_marker_time_axis(
const string &
track_id) ;
/**
* Removes the named markerTimeAxis from those associated with this ImageFrameTimeAxis
/**
* Removes the named markerTimeAxis from those associated with this ImageFrameTimeAxis
@@
-132,7
+135,7
@@
class ImageFrameTimeAxis : public VisualTimeAxis
* @param src the identity of the object that initiated the change
* @return the removed MarkerTimeAxis
*/
* @param src the identity of the object that initiated the change
* @return the removed MarkerTimeAxis
*/
- MarkerTimeAxis* remove_named_marker_time_axis(
std::string
track_id, void* src) ;
+ MarkerTimeAxis* remove_named_marker_time_axis(
const string &
track_id, void* src) ;
/**
* Removes tav from the list of MarkerTimaAxis associated with this ImageFrameTimeAxis
/**
* Removes tav from the list of MarkerTimaAxis associated with this ImageFrameTimeAxis
@@
-158,10
+161,10
@@
class ImageFrameTimeAxis : public VisualTimeAxis
// Emitted Signals
/** Emitted when a Marker Time Axis is Added, or associated with, this time axis */
// Emitted Signals
/** Emitted when a Marker Time Axis is Added, or associated with, this time axis */
-
SigC::Signal2
<void,MarkerTimeAxis*,void*> MarkerTimeAxisAdded ;
+
sigc::signal
<void,MarkerTimeAxis*,void*> MarkerTimeAxisAdded ;
/** Emitted when a Marker Time Axis is removed, from this time axis */
/** Emitted when a Marker Time Axis is removed, from this time axis */
-
SigC::Signal2
<void,std::string,void*> MarkerTimeAxisRemoved ;
+
sigc::signal
<void,std::string,void*> MarkerTimeAxisRemoved ;
protected:
protected: