summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/bundle.h
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-10-14 16:10:01 +0000
committerDavid Robillard <d@drobilla.net>2009-10-14 16:10:01 +0000
commitbb9cc45cd22af67ac275a5e73accbe14fee664d8 (patch)
treee52977d3eae6ff07b856088041a080a2fa3e5b79 /libs/ardour/ardour/bundle.h
parent8c4ce1e2ce35571aed5a686671431fdfffae7f8c (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 'libs/ardour/ardour/bundle.h')
-rw-r--r--libs/ardour/ardour/bundle.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h
index 98344e8406..0e80c5433d 100644
--- a/libs/ardour/ardour/bundle.h
+++ b/libs/ardour/ardour/bundle.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2007 Paul Davis
+ Copyright (C) 2002-2007 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
@@ -29,8 +29,8 @@
namespace ARDOUR {
-class AudioEngine;
-
+class AudioEngine;
+
/** A set of `channels', each of which is associated with 0 or more ports.
* Each channel has a name which can be anything useful.
* Intended for grouping things like, for example, a buss' outputs.
@@ -52,7 +52,7 @@ class Bundle : public sigc::trackable
bool operator== (Channel const &o) const {
return name == o.name && ports == o.ports;
}
-
+
std::string name;
PortList ports;
};
@@ -61,7 +61,7 @@ class Bundle : public sigc::trackable
Bundle (std::string const &, bool i = true);
Bundle (std::string const &, DataType, bool i = true);
Bundle (boost::shared_ptr<Bundle>);
-
+
virtual ~Bundle() {}
/** @return Number of channels that this Bundle has */
@@ -127,7 +127,7 @@ class Bundle : public sigc::trackable
sigc::signal<void, Change> Changed;
protected:
-
+
/// mutex for _channel_ports and _channel_names
/// XXX: is this necessary?
mutable Glib::Mutex _channel_mutex;
@@ -137,7 +137,7 @@ class Bundle : public sigc::trackable
int set_channels (std::string const &);
int parse_io_string (std::string const &, std::vector<std::string> &);
void emit_changed (Change);
-
+
std::string _name;
DataType _type;
bool _ports_are_inputs;
@@ -151,14 +151,14 @@ class Bundle : public sigc::trackable
struct BundleChannel
{
BundleChannel () : channel (0) {}
-
+
BundleChannel (boost::shared_ptr<Bundle> b, uint32_t c)
: bundle (b), channel (c) {}
-
+
bool operator== (BundleChannel const& other) const {
return bundle == other.bundle && channel == other.channel;
}
-
+
bool operator!= (BundleChannel const& other) const {
return bundle != other.bundle || channel != other.channel;
}
@@ -166,7 +166,7 @@ struct BundleChannel
boost::shared_ptr<Bundle> bundle;
uint32_t channel;
};
-
+
}
#endif /* __ardour_bundle_h__ */