diff options
| author | David Robillard <d@drobilla.net> | 2007-03-18 06:07:08 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-03-18 06:07:08 +0000 |
| commit | 99904735e066804358f1d0bd138a84f1e9ecda91 (patch) | |
| tree | 71a924cf1660b5b00231275bd481bbd27094dd9b /libs/ardour/ardour/diskstream.h | |
| parent | eb270e70a12c410cdd98585ad25bb6d8e384a4f5 (diff) | |
Merged with trunk R1612.
git-svn-id: svn://localhost/ardour2/branches/midi@1614 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/diskstream.h')
| -rw-r--r-- | libs/ardour/ardour/diskstream.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index a81921b9f1..10b3bbfe92 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: diskstream.h 579 2006-06-12 19:56:37Z essej $ */ #ifndef __ardour_diskstream_h__ @@ -54,7 +53,7 @@ class Session; class Playlist; class IO; - class Diskstream : public PBD::StatefulDestructible +class Diskstream : public PBD::StatefulDestructible { public: enum Flag { @@ -199,7 +198,6 @@ class IO; /** For non-butler contexts (allocates temporary working buffers) */ virtual int do_refill_with_alloc() = 0; - /* XXX fix this redundancy ... */ @@ -207,7 +205,6 @@ class IO; virtual void playlist_modified (); virtual void playlist_deleted (boost::weak_ptr<Playlist>); - virtual void finish_capture (bool rec_monitors_input) = 0; virtual void transport_stopped (struct tm&, time_t, bool abort) = 0; struct CaptureInfo { @@ -236,7 +233,7 @@ class IO; virtual void use_destructive_playlist () {} static nframes_t disk_io_chunk_frames; - vector<CaptureInfo*> capture_info; + std::vector<CaptureInfo*> capture_info; Glib::Mutex capture_info_lock; uint32_t i_am_the_modifier; |