X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker_time_axis_view.h;h=caf022178b42211dfaf96d69c02e83a98d47a781;hb=061a85191c301ac18f2e8ca59d43127a4499ba96;hp=1dd742a4591060f8e63a43b755b57014afab5924;hpb=868f557f2612903f72614a2b3a317c7a528188d1;p=ardour.git diff --git a/gtk2_ardour/marker_time_axis_view.h b/gtk2_ardour/marker_time_axis_view.h index 1dd742a459..caf022178b 100644 --- a/gtk2_ardour/marker_time_axis_view.h +++ b/gtk2_ardour/marker_time_axis_view.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 @@ -15,7 +15,6 @@ 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_view_h__ @@ -25,7 +24,7 @@ #include #include -#include +#include "ardour/location.h" #include "simplerect.h" #include "canvas.h" @@ -39,44 +38,44 @@ class TimeAxisViewItem ; /** * A view helper for handling MarkerView objects. * This object is responsible for the time axis canvas view, and - * maintains the list of items that have been added to it + * maintains the list of items that have been added to it */ class MarkerTimeAxisView : public sigc::trackable { public: //---------------------------------------------------------------------------------------// // Constructor / Desctructor - + /** * Construct a new MarkerTimeAxisView helper time axis helper * * @param mta the TimeAxsiView that this objbect is the helper for */ MarkerTimeAxisView(MarkerTimeAxis& mta) ; - + /** * Destructor * Reposinsibly for destroying all marker items that may have been added to this time axis view * */ ~MarkerTimeAxisView () ; - + //---------------------------------------------------------------------------------------// // Parent/Child helper object accessors - + /** * Returns the TimeAxisView thatt his object is acting as a helper for * * @return the TimeAxisView that this object is acting as a view helper for */ MarkerTimeAxis& trackview() { return _trackview; } - + /** * */ ArdourCanvas::Item *canvas_item() { return canvas_group; } - - + + //---------------------------------------------------------------------------------------// // ui methods & data @@ -86,7 +85,7 @@ class MarkerTimeAxisView : public sigc::trackable * @param height the new height */ int set_height(gdouble height) ; - + /** * Sets the position of this view helper on the canvas * @@ -94,22 +93,22 @@ class MarkerTimeAxisView : public sigc::trackable * @param y the y position upon the canvas */ int set_position(gdouble x, gdouble y) ; - + /** * Sets the current samples per unit. * this method tells each item upon the time axis of the change - * + * * @param spu the new samples per canvas unit value */ int set_samples_per_unit(gdouble spu) ; - + /** * Returns the current samples per unit of this time axis view helper * * @return the current samples per unit of this time axis view helper */ gdouble get_samples_per_unit() { return _samples_per_unit; } - + /** * Sets the color of the items contained upon this view helper * @@ -119,7 +118,7 @@ class MarkerTimeAxisView : public sigc::trackable //---------------------------------------------------------------------------------------// // Child MarkerView Accessors/Mutators - + /** * Adds a marker view to the list of items upon this time axis view helper * the new MarkerView is returned @@ -131,8 +130,8 @@ class MarkerTimeAxisView : public sigc::trackable * @param duration the duration the new item should be placed upon the timeline * @param src the identity of the object that initiated the change */ - MarkerView* add_marker_view(ImageFrameView* ifv, std::string mark_type, std::string mark_id, jack_nframes_t start, jack_nframes_t dur, void* src) ; - + MarkerView* add_marker_view(ImageFrameView* ifv, std::string mark_type, std::string mark_id, nframes_t start, nframes_t dur, void* src) ; + /** * Returns the named MarkerView or 0 if the named marker does not exist * @@ -140,7 +139,7 @@ class MarkerTimeAxisView : public sigc::trackable * @return the named MarkerView, or 0 if it is not held upon this view */ MarkerView* get_named_marker_view(std::string item_id) ; - + /** * Removes the currently selected MarverView * Note that this method actually destroys the MarkerView too. @@ -150,7 +149,7 @@ class MarkerTimeAxisView : public sigc::trackable * @see add_marker_view */ void remove_selected_marker_view(void* src) ; - + /** * Removes and returns the named MarkerView from the list of MarkerView held by this view helper * @@ -159,7 +158,7 @@ class MarkerTimeAxisView : public sigc::trackable * @see add_marker_view */ MarkerView* remove_named_marker_view(std::string item_id, void* src) ; - + /** * Removes mv from the list of MarkerView upon this TimeAxis * @@ -167,7 +166,7 @@ class MarkerTimeAxisView : public sigc::trackable * @param src the identity of the object that initiated the change */ void remove_marker_view(MarkerView* item, void* src) ; - + //---------------------------------------------------------------------------------------// // Selected item methods @@ -177,21 +176,21 @@ class MarkerTimeAxisView : public sigc::trackable * @param mv the item to set selected */ void set_selected_time_axis_item(MarkerView* mv) ; - + /** * Clears any selected item upon this time axis * */ void clear_selected_time_axis_item() ; - + /** * Returnsthe currently selected item upon this time axis * * @return the currently selected item pon this time axis */ MarkerView* get_selected_time_axis_item() ; - - + + /** * Sets the duration of the selected MarkerView to the specified number of seconds * @@ -201,30 +200,30 @@ class MarkerTimeAxisView : public sigc::trackable //---------------------------------------------------------------------------------// // Emitted Signals - + /** Emitted when a MarkerView is Added */ sigc::signal MarkerViewAdded ; - + /** Emitted when a MarkerView Item is removed */ sigc::signal MarkerViewRemoved ; - + private: /** * convenience method to re-get the samples per unit and tell items upon this view * */ void reset_samples_per_unit() ; - + /** The list of items held by this time axis view helper */ typedef std::list MarkerViewList ; MarkerViewList marker_view_list; - + /** the currently selected time axis item upon this time axis */ MarkerView* selected_time_axis_item ; - + /* the TimeAxisView that this object is acting as the view helper for */ MarkerTimeAxis& _trackview ; - + ArdourCanvas::Group *canvas_group ; ArdourCanvas::SimpleRect *canvas_rect ; /* frame around the whole thing */ @@ -234,7 +233,7 @@ class MarkerTimeAxisView : public sigc::trackable /* XXX why are these different? */ Gdk::Color region_color; uint32_t stream_base_color; - + }; /* class MarkerTimeAxisView */ #endif /* __ardour_marker_time_axis_view_h__ */