projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only the last step-edited note remains selected after each note addition; waf install...
[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 cfb9ebc3b720cbcf6ad6d77f8e0031cd722a8e0b..52c2f73e67b7ab3cca4719296af34c1d2f683bcd 100644
(file)
--- a/
gtk2_ardour/imageframe_time_axis.h
+++ b/
gtk2_ardour/imageframe_time_axis.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2003 Paul Davis
+ Copyright (C) 2003 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-15,7
+15,6
@@
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__
*/
#ifndef __ardour_imageframe_time_axis_h__
@@
-23,7
+22,7
@@
#include <list>
#include <list>
-
#include <libgnomecanvas/
libgnomecanvas.h>
+
//#include <
libgnomecanvas.h>
#include "ardour_dialog.h"
#include "enums.h"
#include "ardour_dialog.h"
#include "enums.h"
@@
-54,7
+53,7
@@
class ImageFrameTimeAxis : public VisualTimeAxis
public:
//---------------------------------------------------------------------------------------//
// Constructor / Desctructor
public:
//---------------------------------------------------------------------------------------//
// Constructor / Desctructor
-
+
/**
* Constructs a new ImageFrameTimeAxis.
*
/**
* Constructs a new ImageFrameTimeAxis.
*
@@
-63,24
+62,24
@@
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(
ARDOUR::stringcr_t track_id, PublicEditor& ed, ARDOUR::Session&
sess, ArdourCanvas::Canvas& canvas) ;
-
+ ImageFrameTimeAxis(
const std::string & track_id, PublicEditor& ed, ARDOUR::Session*
sess, ArdourCanvas::Canvas& canvas) ;
+
/**
* Destructor
* Responsible for destroying any child image items that may have been added to thie time axis
*/
virtual ~ImageFrameTimeAxis() ;
/**
* Destructor
* Responsible for destroying any child image items that may have been added to thie time axis
*/
virtual ~ImageFrameTimeAxis() ;
-
+
//---------------------------------------------------------------------------------------//
// ui methods & data
/**
* Sets the height of this TrackView to one of ths TrackHeghts
*
//---------------------------------------------------------------------------------------//
// ui methods & data
/**
* Sets the height of this TrackView to one of ths TrackHeghts
*
- * @param h the
TrackHeight value to set
- */
- virtual void set_height(
TimeAxisView::TrackHeight
) ;
-
+ * @param h the
number of pixels to set the height too
+ */
+ virtual void set_height(
uint32_t h
) ;
+
/**
* Sets the number of samples per unit that are used.
* This is used to determine the siezes of items upon this time axis
/**
* Sets the number of samples per unit that are used.
* This is used to determine the siezes of items upon this time axis
@@
-88,15
+87,15
@@
class ImageFrameTimeAxis : public VisualTimeAxis
* @param spu the number of samples per unit
*/
virtual void set_samples_per_unit(double spu) ;
* @param spu the number of samples per unit
*/
virtual void set_samples_per_unit(double spu) ;
-
+
/**
* Returns the available height for images to be drawn onto
*
* @return the available height for an image item to be drawn onto
*/
int get_image_display_height() ;
/**
* Returns the available height for images to be drawn onto
*
* @return the available height for an image item to be drawn onto
*/
int get_image_display_height() ;
-
-
+
+
/**
* Show the popup edit menu
*
/**
* Show the popup edit menu
*
@@
-106,11
+105,11
@@
class ImageFrameTimeAxis : public VisualTimeAxis
* @param with_item true if an item has been selected upon the time axis, used to set context menu
*/
void popup_imageframe_edit_menu(int button, int32_t time, ImageFrameView* clicked_imageframe, bool with_item) ;
* @param with_item true if an item has been selected upon the time axis, used to set context menu
*/
void popup_imageframe_edit_menu(int button, int32_t time, ImageFrameView* clicked_imageframe, bool with_item) ;
-
-
+
+
//---------------------------------------------------------------------------------------//
// Marker Time Axis Methods
//---------------------------------------------------------------------------------------//
// Marker Time Axis Methods
-
+
/**
* Add a MarkerTimeAxis to the ilst of MarkerTimeAxis' associated with this ImageFrameTimeAxis
*
/**
* Add a MarkerTimeAxis to the ilst of MarkerTimeAxis' associated with this ImageFrameTimeAxis
*
@@
-120,15
+119,15
@@
class ImageFrameTimeAxis : public VisualTimeAxis
* false otherwise
*/
bool add_marker_time_axis(MarkerTimeAxis* marker_track, void* src) ;
* false otherwise
*/
bool add_marker_time_axis(MarkerTimeAxis* marker_track, void* src) ;
-
+
/**
* Returns the named MarkerTimeAxis 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
*/
/**
* Returns the named MarkerTimeAxis 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(
ARDOUR::stringcr_t
track_id) ;
-
+ MarkerTimeAxis* get_named_marker_time_axis(
const std::string &
track_id) ;
+
/**
* Removes the named markerTimeAxis from those associated with this ImageFrameTimeAxis
*
/**
* Removes the named markerTimeAxis from those associated with this ImageFrameTimeAxis
*
@@
-136,20
+135,20
@@
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(
ARDOUR::stringcr_t
track_id, void* src) ;
-
+ MarkerTimeAxis* remove_named_marker_time_axis(
const std::string &
track_id, void* src) ;
+
/**
/**
- *
Removes tav
from the list of MarkerTimaAxis associated with this ImageFrameTimeAxis
+ *
Potentially removes a MarkerTimeAxisView
from the list of MarkerTimaAxis associated with this ImageFrameTimeAxis
*
* @param tav the TimeAxis to remove
* @param src the identity of the object that initiated the change
*/
*
* @param tav the TimeAxis to remove
* @param src the identity of the object that initiated the change
*/
- void remove_time_axis_view(MarkerTimeAxis* tav, void* src) ;
+ void remove_time_axis_view (TimeAxisView* av);
+
-
//---------------------------------------------------------------------------------------//
// Parent/Child helper object accessors
//---------------------------------------------------------------------------------------//
// Parent/Child helper object accessors
-
+
/**
* Returns the view helper of this TimeAxis
*
/**
* Returns the view helper of this TimeAxis
*
@@
-157,16
+156,16
@@
class ImageFrameTimeAxis : public VisualTimeAxis
*/
ImageFrameTimeAxisView* get_view() ;
*/
ImageFrameTimeAxisView* get_view() ;
-
+
//---------------------------------------------------------------------------------//
// Emitted Signals
//---------------------------------------------------------------------------------//
// Emitted Signals
-
+
/** Emitted when a Marker Time Axis is Added, or associated with, this time axis */
sigc::signal<void,MarkerTimeAxis*,void*> MarkerTimeAxisAdded ;
/** Emitted when a Marker Time Axis is Added, or associated with, this time axis */
sigc::signal<void,MarkerTimeAxis*,void*> MarkerTimeAxisAdded ;
-
+
/** Emitted when a Marker Time Axis is removed, from this time axis */
sigc::signal<void,std::string,void*> MarkerTimeAxisRemoved ;
/** Emitted when a Marker Time Axis is removed, from this time axis */
sigc::signal<void,std::string,void*> MarkerTimeAxisRemoved ;
-
+
protected:
private:
protected:
private:
@@
-175,7
+174,7
@@
class ImageFrameTimeAxis : public VisualTimeAxis
*
*/
void select_track_color() ;
*
*/
void select_track_color() ;
-
+
/**
* Handles the building of the popup menu
*/
/**
* Handles the building of the popup menu
*/
@@
-185,14
+184,14
@@
class ImageFrameTimeAxis : public VisualTimeAxis
* handles the building of the ImageFrameView sub menu
*/
void create_imageframe_menu() ;
* handles the building of the ImageFrameView sub menu
*/
void create_imageframe_menu() ;
-
+
/* We may have multiple marker views, but each marker view should only be associated with one timeaxisview */
typedef std::list<MarkerTimeAxis*> MarkerTimeAxisList ;
MarkerTimeAxisList marker_time_axis_list;
/* We may have multiple marker views, but each marker view should only be associated with one timeaxisview */
typedef std::list<MarkerTimeAxis*> MarkerTimeAxisList ;
MarkerTimeAxisList marker_time_axis_list;
-
+
/* the TimeAxis view helper */
ImageFrameTimeAxisView *view ;
/* the TimeAxis view helper */
ImageFrameTimeAxisView *view ;
-
+
// popup menu widgets
Gtk::Menu *image_action_menu ;
Gtk::Menu *imageframe_menu ;
// popup menu widgets
Gtk::Menu *image_action_menu ;
Gtk::Menu *imageframe_menu ;