merge with master, including manual merge conflict resolution

diff --cc gtk2_ardour/ardour_ui.cc
Simple merge

diff --cc gtk2_ardour/editor.cc
Simple merge

diff --cc gtk2_ardour/route_time_axis.cc
Simple merge

diff --cc gtk2_ardour/tempo_lines.cc
index 208ba4af136ce7e5c33057a05a9e982743b8e337,97aa662c38549779db1a67b9c38880c81a0469c8..9a9619c826e1d40bedd1cc44902a73ec18141e29
--- 1/gtk2_ardour/tempo_lines.cc
--- 2/gtk2_ardour/tempo_lines.cc
+++ b/gtk2_ardour/tempo_lines.cc
@@@ -161,8 -160,7 +160,8 @@@ TempoLines::draw (const ARDOUR::TempoMa
                        if (li != _lines.end())
                                ++li;
                        
 -                      line->property_color_rgba() = color;
 +                      line->set_outline_color (color);
-                       inserted_last_time = false; // don't search next time
++
                        // Use existing line, moving if necessary
                } else if (!exhausted) {
                        Lines::iterator steal = _lines.end();
@@@ -174,11 -172,10 +173,10 @@@
                                double const x = steal->first;
                                line = steal->second;
                                _lines.erase(steal);
 -                              line->property_x1() = xpos;
 -                              line->property_x2() = xpos;
 -                              line->property_color_rgba() = color;
 +                              line->set_x0 (xpos);
 +                              line->set_x1 (xpos);
 +                              line->set_outline_color (color);
                                _lines.insert(make_pair(xpos, line));
-                               inserted_last_time = true; // search next time
                                invalidated = true;
                                
                                // Shift clean range left
@@@ -191,22 -188,20 +189,20 @@@
                                if (existing != _lines.end()) {
                                        //cout << "*** EXISTING LINE" << endl;
                                        li = existing;
 -                                      li->second->property_color_rgba() = color;
 +                                      li->second->set_outline_color (color);
-                                       inserted_last_time = false; // don't search next time
                                } else {
                                        //cout << "*** MOVING LINE" << endl;
 -                                      const double x1 = line->property_x1();
 +                                      const double x1 = line->x0();
                                        const bool was_clean = x1 >= _clean_left && x1 <= _clean_right;
                                        invalidated = invalidated || was_clean;
                                        // Invalidate clean portion (XXX: too harsh?)
                                        _clean_left  = needed_left;
                                        _clean_right = needed_right;
                                        _lines.erase(li);
 -                                      line->property_color_rgba() = color;
 -                                      line->property_x1() = xpos;
 -                                      line->property_x2() = xpos;
 +                                      line->set_outline_color (color);
 +                                      line->set_x0 (xpos);
 +                                      line->set_x1 (xpos);
                                        _lines.insert(make_pair(xpos, line));
-                                       inserted_last_time = true; // search next time
                                }
                        }
                        
@@@ -215,14 -210,13 +211,13 @@@
                        //cout << "*** CREATING LINE" << endl;
                        /* if we already have a line there ... don't sweat it */
                        if (_lines.find (xpos) == _lines.end()) {
 -                              line = new ArdourCanvas::SimpleLine (*_group);
 -                              line->property_x1() = xpos;
 -                              line->property_x2() = xpos;
 -                              line->property_y1() = 0.0;
 -                              line->property_y2() = _height;
 -                              line->property_color_rgba() = color;
 +                              line = new ArdourCanvas::Line (_group);
 +                              line->set_x0 (xpos);
 +                              line->set_x1 (xpos);
 +                              line->set_y0 (0.0);
 +                              line->set_y1 (_height);
 +                              line->set_outline_color (color);
                                _lines.insert(make_pair(xpos, line));
-                               inserted_last_time = true;
                        }
                        
                        // Steal from the left
@@@ -233,11 -227,10 +228,10 @@@
                                double const x = steal->first;
                                line = steal->second;
                                _lines.erase(steal);
 -                              line->property_color_rgba() = color;
 -                              line->property_x1() = xpos;
 -                              line->property_x2() = xpos;
 +                              line->set_outline_color (color);
 +                              line->set_x0 (xpos);
 +                              line->set_x1 (xpos);
                                _lines.insert(make_pair(xpos, line));
-                               inserted_last_time = true; // search next time
                                invalidated = true;
                        
                                // Shift clean range right

diff --cc libs/ardour/wscript
Simple merge

diff --cc wscript
index a8c2bb753c6afec85a3e49c71afe74ae7cedc035,c0d518cbe6f83cdfde04e74369b2f8b7e1b20ffe..f49ce3a11fd435318474e3bc7ed4df6b57e05376
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -41,9 -41,7 +41,8 @@@ children = 
          'libs/gtkmm2ext',
          'libs/clearlooks-newer',
          'libs/audiographer',
 +        'libs/canvas',
          'gtk2_ardour',
-         'templates',
          'export',
          'midi_maps',
          'mcp',