From a8d4e33d1b61b7fc2eadec355689ccbe93fece22 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 26 Nov 2010 19:57:03 +0000 Subject: Fix more broken indentation (whitespace changes only). git-svn-id: svn://localhost/ardour2/branches/3.0@8094 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/speakers.cc | 73 ++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 38 deletions(-) (limited to 'libs/ardour/speakers.cc') 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::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::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::iterator i = _speakers.begin(); i != _speakers.end(); ) { - if ((*i).id == id) { - i = _speakers.erase (i); - update (); - break; - } - } + for (vector::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::iterator i = _speakers.begin(); i != _speakers.end(); ++i) { - if ((*i).id == id) { - (*i).move (new_position); - update (); - break; - } - } + for (vector::iterator i = _speakers.begin(); i != _speakers.end(); ++i) { + if ((*i).id == id) { + (*i).move (new_position); + update (); + break; + } + } } - - - -- cgit v1.2.3