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:
Carl Hetherington 2009-07-09 17:58:13 +00:00
parent cc351b97a9
commit 402cc384ce
71 changed files with 881 additions and 1105 deletions

View file

@ -42,7 +42,7 @@ class AutomationRegionView;
class AutomationStreamView : public StreamView
{
public:
AutomationStreamView (AutomationTimeAxisViewPtr tv);
AutomationStreamView (AutomationTimeAxisView& tv);
~AutomationStreamView ();
void set_automation_state (ARDOUR::AutoState state);
@ -50,7 +50,7 @@ class AutomationStreamView : public StreamView
void redisplay_diskstream ();
inline double contents_height() const {
return (_trackview->current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2);
return (_trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE - 2);
}
private:
@ -65,7 +65,7 @@ class AutomationStreamView : public StreamView
boost::shared_ptr<AutomationController> _controller;
AutomationTimeAxisViewPtr _automation_view;
AutomationTimeAxisView& _automation_view;
};
#endif /* __ardour_automation_streamview_h__ */