summaryrefslogtreecommitdiff
path: root/libs/ardour/speakers.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-01-15 14:29:32 -0500
committerPaul Davis <paul@linuxaudiosystems.com>2014-01-15 14:29:32 -0500
commit9aacefc17010a889222425f97b99050171165038 (patch)
treea1a80ed3557caa2b223274fd33f54df35252ee5f /libs/ardour/speakers.cc
parent96586e81f40e883a7807c88eaa7df73b60140352 (diff)
parent79b56b1d3319d03d14b2d3e2f8d6cd7b3e797deb (diff)
merge with master
Diffstat (limited to 'libs/ardour/speakers.cc')
-rw-r--r--libs/ardour/speakers.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/speakers.cc b/libs/ardour/speakers.cc
index 2acc9659ef..bbad254f6e 100644
--- a/libs/ardour/speakers.cc
+++ b/libs/ardour/speakers.cc
@@ -149,7 +149,7 @@ Speakers::move_speaker (int id, const AngularVector& new_position)
void
Speakers::setup_default_speakers (uint32_t n)
{
- double o = 90.0;
+ double o = 180.0;
/* default assignment of speaker position for n speakers */
@@ -229,12 +229,12 @@ Speakers::setup_default_speakers (uint32_t n)
*/
if (n % 2) {
- deg = 90.0 - degree_step;
+ deg = 360 + o + degree_step;
} else {
- deg = 90.0;
+ deg = 360 + o;
}
- for (i = 0; i < n; ++i, deg += degree_step) {
- add_speaker (AngularVector (deg, 0.0));
+ for (i = 0; i < n; ++i, deg -= degree_step) {
+ add_speaker (AngularVector (fmod(deg, 360), 0.0));
}
}
}