mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-06 05:35:47 +01:00
globally remove all trailing whitespace from ardour code base.
Paul Davis was responsible for introducing almost all of this.
This commit is contained in:
parent
297e80e020
commit
4dc63966f0
774 changed files with 7919 additions and 7919 deletions
|
|
@ -42,7 +42,7 @@ public:
|
|||
void set_arc (double degrees);
|
||||
void set_start (double degrees);
|
||||
|
||||
Duple center() const {
|
||||
Duple center() const {
|
||||
return _center;
|
||||
}
|
||||
Coord radius () const {
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ public:
|
|||
|
||||
void scroll_to (Coord x, Coord y);
|
||||
void add_scroller (ScrollGroup& i);
|
||||
|
||||
|
||||
virtual Rect visible_area () const = 0;
|
||||
virtual Coord width () const = 0;
|
||||
virtual Coord height () const = 0;
|
||||
|
|
@ -137,7 +137,7 @@ public:
|
|||
Duple clamp_to_window (Duple const& winpos, Duple border = Duple());
|
||||
|
||||
void zoomed();
|
||||
|
||||
|
||||
std::string indent() const;
|
||||
std::string render_indent() const;
|
||||
void dump (std::ostream&) const;
|
||||
|
|
@ -210,7 +210,7 @@ protected:
|
|||
bool motion_notify_handler (GdkEventMotion *);
|
||||
bool deliver_event (GdkEvent *);
|
||||
void deliver_enter_leave (Duple const & point, int state);
|
||||
|
||||
|
||||
void pick_current_item (int state);
|
||||
void pick_current_item (Duple const &, int state);
|
||||
|
||||
|
|
@ -241,7 +241,7 @@ private:
|
|||
};
|
||||
|
||||
/** A GTK::Alignment with a GtkCanvas inside it plus some Gtk::Adjustments for
|
||||
* scrolling.
|
||||
* scrolling.
|
||||
*
|
||||
* This provides a GtkCanvas that can be scrolled. It does NOT implement the
|
||||
* Gtk::Scrollable interface.
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#include "canvas/visibility.h"
|
||||
#include "canvas/types.h"
|
||||
|
||||
namespace ArdourCanvas
|
||||
namespace ArdourCanvas
|
||||
{
|
||||
|
||||
struct LIBCANVAS_API HSV;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* @file colorspace.h
|
||||
/**
|
||||
* @file colorspace.h
|
||||
* @author Pascal Getreuer 2005-2010 <getreuer@gmail.com>
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ public:
|
|||
|
||||
/** The render() method is likely to be identical in all containers
|
||||
* (just call Item::render_children()). It can be overridden as necessary.
|
||||
*/
|
||||
*/
|
||||
void render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class LIBCANVAS_API Image : public Item
|
|||
public:
|
||||
Image (Canvas *, Cairo::Format, int width, int height);
|
||||
Image (Item*, Cairo::Format, int width, int height);
|
||||
|
||||
|
||||
struct Data {
|
||||
Data (uint8_t *d, int w, int h, int s, Cairo::Format fmt)
|
||||
: data (d)
|
||||
|
|
@ -65,12 +65,12 @@ public:
|
|||
void* destroy_arg;
|
||||
};
|
||||
|
||||
/**
|
||||
* Returns a shared_ptr to a Data object that can be used to
|
||||
/**
|
||||
* Returns a shared_ptr to a Data object that can be used to
|
||||
* write image data to. The Data object will contain a pointer
|
||||
* to the buffer, along with image properties that may be
|
||||
* useful during the data writing.
|
||||
*
|
||||
*
|
||||
* Can be called from any thread BUT ..
|
||||
*
|
||||
* ... to avoid collisions with Image deletion, some synchronization method
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ public:
|
|||
/** Adds one or more items to the vector @param items based on their
|
||||
* covering @param point which is in **window** coordinates
|
||||
*
|
||||
* Note that Item::add_items_at_window_point() is only intended to be
|
||||
* Note that Item::add_items_at_window_point() is only intended to be
|
||||
* called on items already looked up in a LookupTable (i.e. by a
|
||||
* parent) and thus known to cover @param point already.
|
||||
*
|
||||
|
|
@ -87,8 +87,8 @@ public:
|
|||
virtual void add_items_at_point (Duple /*point*/, std::vector<Item const *>& items) const;
|
||||
|
||||
/** Return true if the item covers @param point, false otherwise.
|
||||
*
|
||||
* The point is in window coordinates
|
||||
*
|
||||
* The point is in window coordinates
|
||||
*/
|
||||
virtual bool covers (Duple const &) const;
|
||||
|
||||
|
|
@ -105,19 +105,19 @@ public:
|
|||
Item* parent () const {
|
||||
return _parent;
|
||||
}
|
||||
|
||||
|
||||
uint32_t depth() const;
|
||||
const Item* closest_ancestor_with (const Item& other) const;
|
||||
bool common_ancestor_within (uint32_t, const Item& other) const;
|
||||
|
||||
/** returns true if this item is an ancestor of @param candidate,
|
||||
* and false otherwise.
|
||||
* and false otherwise.
|
||||
*/
|
||||
bool is_ancestor_of (const Item& candidate) const {
|
||||
return candidate.is_descendant_of (*this);
|
||||
}
|
||||
/** returns true if this Item is a descendant of @param candidate,
|
||||
* and false otherwise.
|
||||
* and false otherwise.
|
||||
*/
|
||||
bool is_descendant_of (const Item& candidate) const;
|
||||
|
||||
|
|
@ -160,7 +160,7 @@ public:
|
|||
Duple window_to_item (Duple const&) const;
|
||||
Rect item_to_window (Rect const&, bool rounded = true) const;
|
||||
Rect window_to_item (Rect const&) const;
|
||||
|
||||
|
||||
void raise_to_top ();
|
||||
void raise (int);
|
||||
void lower_to_bottom ();
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ class LIBCANVAS_API LookupTable
|
|||
public:
|
||||
LookupTable (Item const &);
|
||||
virtual ~LookupTable ();
|
||||
|
||||
|
||||
virtual std::vector<Item*> get (Rect const &) = 0;
|
||||
virtual std::vector<Item*> items_at_point (Duple const &) const = 0;
|
||||
virtual bool has_item_at_point (Duple const & point) const = 0;
|
||||
|
|
@ -51,7 +51,7 @@ class LIBCANVAS_API DumbLookupTable : public LookupTable
|
|||
{
|
||||
public:
|
||||
DumbLookupTable (Item const &);
|
||||
|
||||
|
||||
std::vector<Item*> get (Rect const &);
|
||||
std::vector<Item*> items_at_point (Duple const &) const;
|
||||
bool has_item_at_point (Duple const & point) const;
|
||||
|
|
@ -65,16 +65,16 @@ public:
|
|||
std::vector<Item*> get (Rect const &);
|
||||
std::vector<Item*> items_at_point (Duple const &) const;
|
||||
bool has_item_at_point (Duple const & point) const;
|
||||
|
||||
|
||||
static int default_items_per_cell;
|
||||
|
||||
|
||||
private:
|
||||
|
||||
|
||||
void area_to_indices (Rect const &, int &, int &, int &, int &) const;
|
||||
void point_to_indices (Duple, int &, int &) const;
|
||||
|
||||
|
||||
friend class ::OptimizingLookupTableTest;
|
||||
|
||||
|
||||
typedef std::vector<Item*> Cell;
|
||||
int _items_per_cell;
|
||||
int _dimension;
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ public:
|
|||
mutable float* multiple;
|
||||
mutable float* constant;
|
||||
mutable Points::size_type cached_size;
|
||||
|
||||
|
||||
void cache_shape_computation () const;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ public:
|
|||
|
||||
/** return @param y as a floating point fraction of the overall
|
||||
* height of the rectangle. @param y is in canvas coordinate space.
|
||||
*
|
||||
*
|
||||
* A value of zero indicates that y is at the bottom of the
|
||||
* rectangle; a value of 1 indicates that y is at the top.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ class StatefulImage : public Item
|
|||
public:
|
||||
ImageHandle image;
|
||||
};
|
||||
|
||||
|
||||
typedef std::vector<State> States;
|
||||
|
||||
public:
|
||||
|
|
@ -71,7 +71,7 @@ class StatefulImage : public Item
|
|||
double _text_y;
|
||||
|
||||
int load_states (const XMLNode&);
|
||||
|
||||
|
||||
typedef std::map<std::string,Cairo::RefPtr<Cairo::ImageSurface> > ImageCache;
|
||||
static ImageCache _image_cache;
|
||||
static PBD::Searchpath _image_search_path;
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ private:
|
|||
mutable bool _need_redraw;
|
||||
mutable double _width_correction;
|
||||
double _clamped_width;
|
||||
|
||||
|
||||
void _redraw () const;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ struct LIBCANVAS_API Duple
|
|||
: x (x_)
|
||||
, y (y_)
|
||||
{}
|
||||
|
||||
|
||||
Coord x;
|
||||
Coord y;
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
#define LIBCANVAS_API LIBCANVAS_DLL_EXPORT
|
||||
#else
|
||||
#define LIBCANVAS_API LIBCANVAS_DLL_IMPORT
|
||||
#endif
|
||||
#endif
|
||||
#define LIBCANVAS_LOCAL LIBCANVAS_DLL_LOCAL
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ struct LIBCANVAS_API WaveViewThreadRequest
|
|||
Cancel,
|
||||
Draw
|
||||
};
|
||||
|
||||
|
||||
WaveViewThreadRequest () : stop (0) {}
|
||||
|
||||
bool should_stop () const { return (bool) g_atomic_int_get (const_cast<gint*>(&stop)); }
|
||||
|
|
@ -113,7 +113,7 @@ class LIBCANVAS_API WaveViewCache
|
|||
uint64_t timestamp;
|
||||
|
||||
Entry (int chan, Coord hght, float amp, Color fcl, double spp, framepos_t strt, framepos_t ed,
|
||||
Cairo::RefPtr<Cairo::ImageSurface> img)
|
||||
Cairo::RefPtr<Cairo::ImageSurface> img)
|
||||
: channel (chan)
|
||||
, height (hght)
|
||||
, amplitude (amp)
|
||||
|
|
@ -165,14 +165,14 @@ class LIBCANVAS_API WaveViewCache
|
|||
*/
|
||||
typedef std::pair<boost::shared_ptr<ARDOUR::AudioSource>,boost::shared_ptr<Entry> > ListEntry;
|
||||
typedef std::vector<ListEntry> CacheList;
|
||||
|
||||
|
||||
struct SortByTimestamp {
|
||||
bool operator() (const WaveViewCache::ListEntry& a, const WaveViewCache::ListEntry& b) {
|
||||
return a.second->timestamp < b.second->timestamp;
|
||||
}
|
||||
};
|
||||
friend struct SortByTimestamp;
|
||||
|
||||
|
||||
uint64_t image_cache_size;
|
||||
uint64_t _image_cache_threshold;
|
||||
|
||||
|
|
@ -185,7 +185,7 @@ class LIBCANVAS_API WaveView : public Item, public sigc::trackable
|
|||
{
|
||||
public:
|
||||
|
||||
enum Shape {
|
||||
enum Shape {
|
||||
Normal,
|
||||
Rectified
|
||||
};
|
||||
|
|
@ -201,13 +201,13 @@ public:
|
|||
|
||||
x = 0 in the waveview corresponds to the first waveform datum taken
|
||||
from region->start() samples into the source data.
|
||||
|
||||
x = N in the waveview corresponds to the (N * spp)'th sample
|
||||
|
||||
x = N in the waveview corresponds to the (N * spp)'th sample
|
||||
measured from region->start() into the source data.
|
||||
|
||||
|
||||
when drawing, we will map the zeroth-pixel of the waveview
|
||||
into a window.
|
||||
|
||||
into a window.
|
||||
|
||||
The waveview itself contains a set of pre-rendered Cairo::ImageSurfaces
|
||||
that cache sections of the display. This is filled on-demand and
|
||||
never cleared until something explicitly marks the cache invalid
|
||||
|
|
@ -221,7 +221,7 @@ public:
|
|||
|
||||
void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
|
||||
void compute_bounding_box () const;
|
||||
|
||||
|
||||
void set_samples_per_pixel (double);
|
||||
void set_height (Distance);
|
||||
void set_channel (int);
|
||||
|
|
@ -252,7 +252,7 @@ public:
|
|||
void set_shape (Shape);
|
||||
|
||||
void set_always_get_image_in_thread (bool yn);
|
||||
|
||||
|
||||
/* currently missing because we don't need them (yet):
|
||||
set_shape_independent();
|
||||
set_logscaled_independent()
|
||||
|
|
@ -262,7 +262,7 @@ public:
|
|||
static void set_global_logscaled (bool);
|
||||
static void set_global_shape (Shape);
|
||||
static void set_global_show_waveform_clipping (bool);
|
||||
|
||||
|
||||
static double global_gradient_depth() { return _global_gradient_depth; }
|
||||
static bool global_logscaled() { return _global_logscaled; }
|
||||
static Shape global_shape() { return _global_shape; }
|
||||
|
|
@ -336,7 +336,7 @@ public:
|
|||
mutable bool get_image_in_thread;
|
||||
|
||||
/** If true, calls to get_image() will render a missing wave image
|
||||
in the calling thread. Set true for waveviews we expect to
|
||||
in the calling thread. Set true for waveviews we expect to
|
||||
keep updating (e.g. while recording)
|
||||
*/
|
||||
bool always_get_image_in_thread;
|
||||
|
|
@ -371,7 +371,7 @@ public:
|
|||
double spread;
|
||||
bool clip_max;
|
||||
bool clip_min;
|
||||
|
||||
|
||||
LineTips() : top (0.0), bot (0.0), clip_max (false), clip_min (false) {}
|
||||
};
|
||||
|
||||
|
|
@ -388,11 +388,11 @@ public:
|
|||
void queue_get_image (boost::shared_ptr<const ARDOUR::Region> region, framepos_t start, framepos_t end) const;
|
||||
void generate_image (boost::shared_ptr<WaveViewThreadRequest>, bool in_render_thread) const;
|
||||
boost::shared_ptr<WaveViewCache::Entry> cache_request_result (boost::shared_ptr<WaveViewThreadRequest> req) const;
|
||||
|
||||
|
||||
void image_ready ();
|
||||
|
||||
|
||||
mutable boost::shared_ptr<WaveViewCache::Entry> _current_image;
|
||||
|
||||
|
||||
mutable boost::shared_ptr<WaveViewThreadRequest> current_request;
|
||||
|
||||
static WaveViewCache* images;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ public:
|
|||
|
||||
void set_fade_position (XFadePosition xfp) { _xfadeposition = xfp; }
|
||||
void set_show_background_fade (bool show) { show_background_fade = show; }
|
||||
|
||||
|
||||
void compute_bounding_box () const;
|
||||
void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
|
||||
|
||||
|
|
@ -81,7 +81,7 @@ private:
|
|||
Color _fill_color;
|
||||
|
||||
bool show_background_fade;
|
||||
|
||||
|
||||
void interpolate ();
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue