summaryrefslogtreecommitdiff
path: root/libs/ardour/speakers.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2010-11-26 19:57:03 +0000
committerDavid Robillard <d@drobilla.net>2010-11-26 19:57:03 +0000
commita8d4e33d1b61b7fc2eadec355689ccbe93fece22 (patch)
tree00b0be9939170098593705acc2d3a688b84ee0cb /libs/ardour/speakers.cc
parent1445bf5fc59dbca558d35b7bf7086e3032bbc7b4 (diff)
Fix more broken indentation (whitespace changes only).
git-svn-id: svn://localhost/ardour2/branches/3.0@8094 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/speakers.cc')
-rw-r--r--libs/ardour/speakers.cc73
1 files changed, 35 insertions, 38 deletions
diff --git a/libs/ardour/speakers.cc b/libs/ardour/speakers.cc
index c5495f204d..7d0461ff52 100644
--- a/libs/ardour/speakers.cc
+++ b/libs/ardour/speakers.cc
@@ -24,16 +24,16 @@ using namespace PBD;
using namespace std;
Speaker::Speaker (int i, const AngularVector& position)
- : id (i)
+ : id (i)
{
- move (position);
+ move (position);
}
void
Speaker::move (const AngularVector& new_position)
{
- _angles = new_position;
- _angles.cartesian (_coords);
+ _angles = new_position;
+ _angles.cartesian (_coords);
}
Speakers::Speakers ()
@@ -47,62 +47,59 @@ Speakers::~Speakers ()
void
Speakers::dump_speakers (ostream& o)
{
- for (vector<Speaker>::iterator i = _speakers.begin(); i != _speakers.end(); ++i) {
- o << "Speaker " << (*i).id << " @ "
- << (*i).coords().x << ", " << (*i).coords().y << ", " << (*i).coords().z
- << " azimuth " << (*i).angles().azi
- << " elevation " << (*i).angles().ele
- << " distance " << (*i).angles().length
- << endl;
- }
+ for (vector<Speaker>::iterator i = _speakers.begin(); i != _speakers.end(); ++i) {
+ o << "Speaker " << (*i).id << " @ "
+ << (*i).coords().x << ", " << (*i).coords().y << ", " << (*i).coords().z
+ << " azimuth " << (*i).angles().azi
+ << " elevation " << (*i).angles().ele
+ << " distance " << (*i).angles().length
+ << endl;
+ }
}
void
Speakers::clear_speakers ()
{
- _speakers.clear ();
- update ();
+ _speakers.clear ();
+ update ();
}
int
Speakers::add_speaker (const AngularVector& position)
{
- int id = _speakers.size();
+ int id = _speakers.size();
- cerr << "Added speaker " << id << " at " << position.azi << " /= " << position.ele << endl;
+ cerr << "Added speaker " << id << " at " << position.azi << " /= " << position.ele << endl;
- _speakers.push_back (Speaker (id, position));
- update ();
+ _speakers.push_back (Speaker (id, position));
+ update ();
- dump_speakers (cerr);
- Changed ();
+ dump_speakers (cerr);
+ Changed ();
- return id;
+ return id;
}
void
Speakers::remove_speaker (int id)
{
- for (vector<Speaker>::iterator i = _speakers.begin(); i != _speakers.end(); ) {
- if ((*i).id == id) {
- i = _speakers.erase (i);
- update ();
- break;
- }
- }
+ for (vector<Speaker>::iterator i = _speakers.begin(); i != _speakers.end(); ) {
+ if ((*i).id == id) {
+ i = _speakers.erase (i);
+ update ();
+ break;
+ }
+ }
}
void
Speakers::move_speaker (int id, const AngularVector& new_position)
{
- for (vector<Speaker>::iterator i = _speakers.begin(); i != _speakers.end(); ++i) {
- if ((*i).id == id) {
- (*i).move (new_position);
- update ();
- break;
- }
- }
+ for (vector<Speaker>::iterator i = _speakers.begin(); i != _speakers.end(); ++i) {
+ if ((*i).id == id) {
+ (*i).move (new_position);
+ update ();
+ break;
+ }
+ }
}
-
-
-