mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-10 00:34:59 +01:00
Back out big shared_ptr change. Moving to a branch. Apologies all.
git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
cc351b97a9
commit
402cc384ce
71 changed files with 881 additions and 1105 deletions
|
|
@ -26,7 +26,6 @@
|
|||
#include "enums.h"
|
||||
#include "simplerect.h"
|
||||
#include "canvas.h"
|
||||
#include "shared_ptrs.h"
|
||||
|
||||
namespace Gdk {
|
||||
class Color;
|
||||
|
|
@ -59,8 +58,8 @@ class StreamView : public sigc::trackable
|
|||
public:
|
||||
virtual ~StreamView ();
|
||||
|
||||
RouteTimeAxisViewPtr trackview() { return _trackview; }
|
||||
const RouteTimeAxisViewPtr trackview() const { return _trackview; }
|
||||
RouteTimeAxisView& trackview() { return _trackview; }
|
||||
const RouteTimeAxisView& trackview() const { return _trackview; }
|
||||
|
||||
void attach ();
|
||||
|
||||
|
|
@ -113,7 +112,7 @@ public:
|
|||
sigc::signal<void> HeightChanged;
|
||||
|
||||
protected:
|
||||
StreamView (RouteTimeAxisViewPtr, ArdourCanvas::Group* group = NULL);
|
||||
StreamView (RouteTimeAxisView&, ArdourCanvas::Group* group = NULL);
|
||||
|
||||
void transport_changed();
|
||||
void transport_looped();
|
||||
|
|
@ -138,7 +137,7 @@ protected:
|
|||
|
||||
virtual void color_handler () = 0;
|
||||
|
||||
RouteTimeAxisViewPtr _trackview;
|
||||
RouteTimeAxisView& _trackview;
|
||||
bool owns_canvas_group;
|
||||
ArdourCanvas::Group* _background_group;
|
||||
ArdourCanvas::Group* canvas_group;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue