projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add QMDSP library to ardev file so that its discoverable as we try to load VAMP stuff
[ardour.git]
/
gtk2_ardour
/
marker_time_axis.h
diff --git
a/gtk2_ardour/marker_time_axis.h
b/gtk2_ardour/marker_time_axis.h
index db1fd09403717b8d56664b4feb256ceddff31605..bb30bc24dbb8df803bfca382114234d5b671491c 100644
(file)
--- a/
gtk2_ardour/marker_time_axis.h
+++ b/
gtk2_ardour/marker_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_marker_time_axis_h__
*/
#ifndef __ardour_marker_time_axis_h__
@@
-34,9
+33,6
@@
namespace ARDOUR {
class Session;
}
namespace ARDOUR {
class Session;
}
-namespace ARDOUR {
- class Menu;
-}
class PublicEditor;
class ImageFrameView ;
class PublicEditor;
class ImageFrameView ;
@@
-56,7
+52,7
@@
class MarkerTimeAxis : public VisualTimeAxis
public:
//---------------------------------------------------------------------------------------//
// Constructor / Desctructor
public:
//---------------------------------------------------------------------------------------//
// Constructor / Desctructor
-
+
/**
* Constructs a new MarkerTimeAxis
*
/**
* Constructs a new MarkerTimeAxis
*
@@
-66,25
+62,25
@@
class MarkerTimeAxis : public VisualTimeAxis
* @param name the name/id of this time axis
* @param tav the associated track view that this MarkerTimeAxis is marking up
*/
* @param name the name/id of this time axis
* @param tav the associated track view that this MarkerTimeAxis is marking up
*/
- MarkerTimeAxis(PublicEditor& ed, ARDOUR::Session
& sess, ArdourCanvas::Canvas& canvas, std::string
name, TimeAxisView* tav) ;
-
+ MarkerTimeAxis(PublicEditor& ed, ARDOUR::Session
* sess, ArdourCanvas::Canvas& canvas, const std::string &
name, TimeAxisView* tav) ;
+
/**
* Destructor
* Responsible for destroying any marker items upon this time axis
*/
virtual ~MarkerTimeAxis() ;
/**
* Destructor
* Responsible for destroying any marker items upon this time axis
*/
virtual ~MarkerTimeAxis() ;
-
-
+
+
//---------------------------------------------------------------------------------------//
// ui methods & data
//---------------------------------------------------------------------------------------//
// ui methods & data
-
+
/**
* Sets the height of this TrackView to one of the defined TrackHeights
*
/**
* Sets the height of this TrackView to one of the defined TrackHeights
*
- * @param h the
TrackHeight value to set
+ * @param h the
number of pixels to set the height to
*/
*/
- virtual void set_height(
TimeAxisView::TrackHeigh
t h) ;
-
+ virtual void set_height(
uint32_
t h) ;
+
/**
* Sets the number of samples per unit that are used.
* This is used to determine the sizes of items upon this time axis
/**
* Sets the number of samples per unit that are used.
* This is used to determine the sizes of items upon this time axis
@@
-92,8
+88,8
@@
class MarkerTimeAxis : 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) ;
-
-
+
+
/**
* Show the popup edit menu
*
/**
* Show the popup edit menu
*
@@
-103,8
+99,8
@@
class MarkerTimeAxis : public VisualTimeAxis
* @param with_item true if an item has been selected upon the time axis, used to set context menu
*/
void popup_marker_time_axis_edit_menu(int button, int32_t time, MarkerView* clicked_mv, bool with_item) ;
* @param with_item true if an item has been selected upon the time axis, used to set context menu
*/
void popup_marker_time_axis_edit_menu(int button, int32_t time, MarkerView* clicked_mv, bool with_item) ;
-
-
+
+
//---------------------------------------------------------------------------------------//
// Parent/Child helper object accessors
//---------------------------------------------------------------------------------------//
// Parent/Child helper object accessors
@@
-114,7
+110,7
@@
class MarkerTimeAxis : public VisualTimeAxis
* @return the view helper of this TimeAxis
*/
MarkerTimeAxisView* get_view() ;
* @return the view helper of this TimeAxis
*/
MarkerTimeAxisView* get_view() ;
-
+
/**
* Returns the TimeAxisView that this markerTimeAxis is marking up
*
/**
* Returns the TimeAxisView that this markerTimeAxis is marking up
*
@@
-124,18
+120,18
@@
class MarkerTimeAxis : public VisualTimeAxis
private:
private:
-
+
/**
* convenience method to select a new track color and apply it to the view and view items
*
*/
void select_track_color() ;
/**
* convenience method to select a new track color and apply it to the view and view items
*
*/
void select_track_color() ;
-
+
/**
* Handles the building of the popup menu
*/
virtual void build_display_menu() ;
/**
* Handles the building of the popup menu
*/
virtual void build_display_menu() ;
-
+
/**
* handles the building of the MarkerView sub menu
*/
/**
* handles the building of the MarkerView sub menu
*/
@@
-143,17
+139,17
@@
class MarkerTimeAxis : public VisualTimeAxis
/** The associated TimeAxis that this MarkerTimeAxis is marking up */
TimeAxisView* marked_time_axis ;
/** The associated TimeAxis that this MarkerTimeAxis is marking up */
TimeAxisView* marked_time_axis ;
-
+
/** Our time axis view helper */
MarkerTimeAxisView *view ;
/** Our time axis view helper */
MarkerTimeAxisView *view ;
- /** the popup menu available by clicking upon this time axis */
+ /** the popup menu available by clicking upon this time axis */
Gtk::Menu *marker_menu ;
Gtk::Menu *marker_menu ;
-
+
/** specialized sub menu available when clicking upon and item upon this time axis */
Gtk::Menu *marker_item_menu ;
/** specialized sub menu available when clicking upon and item upon this time axis */
Gtk::Menu *marker_item_menu ;
-
-
+
+
} ; /* class MarkerTimeAxis */
#endif /* __ardour_imageframe_time_axis_h__ */
} ; /* class MarkerTimeAxis */
#endif /* __ardour_imageframe_time_axis_h__ */