diff options
author | David Robillard <d@drobilla.net> | 2009-10-14 16:10:01 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-10-14 16:10:01 +0000 |
commit | bb9cc45cd22af67ac275a5e73accbe14fee664d8 (patch) | |
tree | e52977d3eae6ff07b856088041a080a2fa3e5b79 /gtk2_ardour/imageframe_time_axis_group.h | |
parent | 8c4ce1e2ce35571aed5a686671431fdfffae7f8c (diff) |
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent...
git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/imageframe_time_axis_group.h')
-rw-r--r-- | gtk2_ardour/imageframe_time_axis_group.h | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/gtk2_ardour/imageframe_time_axis_group.h b/gtk2_ardour/imageframe_time_axis_group.h index e189b71e0b..714d8515f7 100644 --- a/gtk2_ardour/imageframe_time_axis_group.h +++ b/gtk2_ardour/imageframe_time_axis_group.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 @@ -46,7 +46,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable public: //---------------------------------------------------------------------------------------// // Constructor / Desctructor - + /** * Constructs a new ImageFrameTimeAxisGroup. * @@ -54,18 +54,18 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * @param group_id the unique name/id of this group */ ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav, const std::string & group_id) ; - + /** * Destructor * Responsible for destroying any Items that may have been added to this group * */ virtual ~ImageFrameTimeAxisGroup() ; - - + + //---------------------------------------------------------------------------------------// // Name/Id Accessors/Mutators - + /** * Set the name/Id of this group. * @@ -81,49 +81,49 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * @return the id of this group */ std::string get_group_name() const ; - - + + //---------------------------------------------------------------------------------------// // 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 */ ImageFrameTimeAxisView& get_view() const { return _view_helper ; } - - - + + + //---------------------------------------------------------------------------------------// // ui methods & data - + /** * Sets the height of the time axis view and the item upon it * * @param height the new height */ int set_item_heights(gdouble) ; - + /** * 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_item_samples_per_units(gdouble spu) ; - + /** * Sets the color of the items contained uopn this view helper * * @param color the new base color */ void apply_item_color(Gdk::Color&) ; - - + + //---------------------------------------------------------------------------------------// // child ImageFrameView methods - + /** * Adds an ImageFrameView to the list of items upon this time axis view helper * the new ImageFrameView is returned @@ -139,7 +139,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * @param src the identity of the object that initiated the change */ ImageFrameView* add_imageframe_item(const std::string & item_id, nframes_t start, nframes_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels, void* src) ; - + /** * Returns the named ImageFrameView or 0 if the named view does not exist on this view helper * @@ -147,7 +147,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * @return the named ImageFrameView, or 0 if it is not held upon this view */ ImageFrameView* get_named_imageframe_item(const std::string & item_id) ; - + /** * Removes the currently selected ImageFrameView * @@ -155,7 +155,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * @see add_imageframe_view */ void remove_selected_imageframe_item(void* src) ; - + /** * Removes and returns the named ImageFrameView from the list of ImageFrameViews held by this view helper * @@ -164,7 +164,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * @see add_imageframe_view */ ImageFrameView* remove_named_imageframe_item(const std::string & item_id, void* src) ; - + /** * Removes ifv from the list of ImageFrameViews upon this TimeAxis. * if ifv is not upon this TimeAxis, this method takes no action @@ -172,23 +172,23 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * @param ifv the ImageFrameView to remove */ void remove_imageframe_item(ImageFrameView*, void* src) ; - - + + //---------------------------------------------------------------------------------------// // Selected group methods - + // removed in favour of a track level selectewd item // this is simply easier to manage a singularly selected item, rather than // a selected item within each group - + /** * Sets the currently selected item upon this time axis * * @param ifv the item to set selected */ //void set_selected_imageframe_item(ImageFrameView* ifv) ; - + /** * Sets the currently selected item upon this time axis to the named item * @@ -200,26 +200,26 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * Returns the currently selected item upon this time axis * * @return the currently selected item pon this time axis - */ + */ //ImageFrameView* get_selected_imageframe_item() ; - + /** * Returns whether this grou pis currently selected * * @returns true if this group is currently selected */ bool get_selected() const ; - + /** * Sets he selected state of this group * * @param yn set true if this group is selected, false otherwise */ void set_selected(bool yn) ; - + //---------------------------------------------------------------------------------------// // Handle group removal - + /** * Handles the Removal of this VisualTimeAxis * This _needs_ to be called to alert others of the removal properly, ie where the source @@ -234,9 +234,9 @@ class ImageFrameTimeAxisGroup : public sigc::trackable //---------------------------------------------------------------------------------// // Emitted Signals - + sigc::signal<void> GoingAway ; - + /** * Emitted when this Group has been removed * This is different to the GoingAway signal in that this signal @@ -245,16 +245,16 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * event */ sigc::signal<void,std::string,void*> GroupRemoved ; - + /** Emitted when we have changed the name of this TimeAxis */ sigc::signal<void,std::string,std::string,void*> NameChanged ; - + /** Emitted when an ImageFrameView is added to this group */ sigc::signal<void, ImageFrameView*, void*> ImageFrameAdded ; - + /** Emitted when an ImageFrameView is removed from this group */ sigc::signal<void, const std::string &, const std::string &, const std::string &, void*> ImageFrameRemoved ; - + protected: @@ -264,7 +264,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * */ void reset_samples_per_unit() ; - + /** * Callback used to remove this group during the gtk idle loop * This is used to avoid deleting the obejct while inside the remove_this_group @@ -274,27 +274,27 @@ class ImageFrameTimeAxisGroup : public sigc::trackable * @param src the identity of the object that initiated the change */ static gint idle_remove_this_group(ImageFrameTimeAxisGroup* group, void* src) ; - + /** The list of ImageFrameViews held by this view helper */ typedef std::list<ImageFrameView *> ImageFrameViewList ; ImageFrameViewList imageframe_views ; - + /** the currently selected time axis item upon this time axis */ ImageFrameView* selected_imageframe_item ; - + /** the view helper that this object is acting as a container upon on */ ImageFrameTimeAxisView& _view_helper ; - - /** the is of this group */ + + /** the is of this group */ std::string _group_id ; - + /* XXX why are these different? */ Gdk::Color region_color ; uint32_t stream_base_color ; - + /** indicates if this group is currently selected */ bool is_selected ; - + } ; /* class ImageFrameTimeAxisGroup */ #endif /* __ardour_imageframe_time_axis_group_h__ */ |