From bb9cc45cd22af67ac275a5e73accbe14fee664d8 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 14 Oct 2009 16:10:01 +0000 Subject: 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 --- gtk2_ardour/imageframe_view.h | 60 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'gtk2_ardour/imageframe_view.h') diff --git a/gtk2_ardour/imageframe_view.h b/gtk2_ardour/imageframe_view.h index 2026853654..281e09ebb8 100644 --- a/gtk2_ardour/imageframe_view.h +++ b/gtk2_ardour/imageframe_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 @@ -43,7 +43,7 @@ class ImageFrameView : public TimeAxisViewItem public: //---------------------------------------------------------------------------------------// // Constructor / Desctructor - + /** * Constructs a new ImageFrameView upon the canvas * @@ -77,12 +77,12 @@ class ImageFrameView : public TimeAxisViewItem * Reposible for removing and destroying all marker items associated with this item */ ~ImageFrameView() ; - + static sigc::signal GoingAway; - + //---------------------------------------------------------------------------------------// // Position and duration Accessors/Mutators - + /** * Set the position of this item to the specified value * @@ -91,7 +91,7 @@ class ImageFrameView : public TimeAxisViewItem * @return true if the position change was a success, false otherwise */ virtual bool set_position(nframes64_t pos, void* src, double* delta = 0) ; - + /** * Sets the duration of this item * @@ -100,10 +100,10 @@ class ImageFrameView : public TimeAxisViewItem * @return true if the duration change was succesful, false otherwise */ virtual bool set_duration(nframes64_t dur, void* src) ; - + //---------------------------------------------------------------------------------------// // Parent Component Methods - + /** * Sets the parent ImageFrameTimeAxisGroup of thie item * each Item must be part of exactly one group (or 'scene') upon the timeline @@ -111,25 +111,25 @@ class ImageFrameView : public TimeAxisViewItem * @param group the new parent group */ void set_time_axis_group(ImageFrameTimeAxisGroup* group) ; - + /** * Returns the parent group of this item * * @return the parent group of this item */ ImageFrameTimeAxisGroup* get_time_axis_group() ; - + //---------------------------------------------------------------------------------------// // ui methods - + /** * Set the height of this item * * @param h the new height */ virtual void set_height(gdouble h) ; - - + + //---------------------------------------------------------------------------------------// // MarkerView methods @@ -140,7 +140,7 @@ class ImageFrameView : public TimeAxisViewItem * @param src the identity of the object that initiated the change */ void add_marker_view_item(MarkerView* item, void* src) ; - + /** * Removes the named marker view from the list of marker view associated with this item * The Marker view is not destroyed on removal, so the caller must handle the item themself @@ -150,7 +150,7 @@ class ImageFrameView : public TimeAxisViewItem * @return the removed marker item */ MarkerView* remove_named_marker_view_item(const std::string & markId, void* src) ; - + /** * Removes item from the list of marker views assocaited with this item * This method will do nothing if item if not assiciated with this item @@ -160,7 +160,7 @@ class ImageFrameView : public TimeAxisViewItem * @param src the identity of the object that initiated the change */ void remove_marker_view_item(MarkerView* item, void* src) ; - + /** * Determines if the named marker is one of those associated with this item * @@ -168,13 +168,13 @@ class ImageFrameView : public TimeAxisViewItem */ bool has_marker_view_item(const std::string & markId) ; - + //---------------------------------------------------------------------------------// // Emitted Signals - + /** Emitted when a marker Item is added to this Item */ sigc::signal MarkerViewAdded ; - + /** Emitted when a Marker Item is added to this Item */ sigc::signal MarkerViewRemoved ; @@ -182,31 +182,31 @@ class ImageFrameView : public TimeAxisViewItem /** the list of MarkerViews associated with this item */ typedef std::list MarkerViewList ; MarkerViewList marker_view_list ; - - + + /** The parent group that this item is a member of */ ImageFrameTimeAxisGroup* the_parent_group ; - + // ------- Image data ----------- - + /** the image data that we display */ //unsigned char* the_rgb_data ; - + /** The width of the image contained within the_rgb_data */ uint32_t image_data_width ; - + /** The height of the image contained within the_rgb_data */ uint32_t image_data_height ; - + /** the number of channels contained in the_rgb_data */ uint32_t image_data_num_channels ; - - + + // ------- Our canvas element ----------- - + /** the CanvasImageFrame to display the image */ ArdourCanvas::ImageFrame* imageframe ; - + } ; /* class ImageFrameView */ #endif /* __gtk_ardour_imageframe_view_h__ */ -- cgit v1.2.3