diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-05-12 17:03:42 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-05-12 17:03:42 +0000 |
| commit | 3b89d9eaa03406a5e03648f47734211f09b89d62 (patch) | |
| tree | 1c8d151bca327d4a5cb7047c8591aa814b9b4ec8 /libs/ardour/ardour/diskstream.h | |
| parent | 2e5c935990d6ea5cc6e9a5a6de0fd8c52e68657c (diff) | |
Remove most using declarations from header files.
git-svn-id: svn://localhost/ardour2/branches/3.0@5069 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/diskstream.h')
| -rw-r--r-- | libs/ardour/ardour/diskstream.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index 56400360d2..a78f2e23a7 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -68,11 +68,11 @@ class Diskstream : public SessionObject, public boost::noncopyable NonLayered = 0x8 }; - Diskstream (Session &, const string& name, Flag f = Recordable); + Diskstream (Session &, const std::string& name, Flag f = Recordable); Diskstream (Session &, const XMLNode&); virtual ~Diskstream(); - bool set_name (const string& str); + bool set_name (const std::string& str); ARDOUR::IO* io() const { return _io; } void set_io (ARDOUR::IO& io); @@ -149,7 +149,7 @@ class Diskstream : public SessionObject, public boost::noncopyable void remove_region_from_last_capture (boost::weak_ptr<Region> wregion); void move_processor_automation (boost::weak_ptr<Processor>, - list< Evoral::RangeMove<nframes_t> > const &); + std::list< Evoral::RangeMove<nframes_t> > const &); sigc::signal<void> RecordEnableChanged; sigc::signal<void> SpeedChanged; @@ -215,7 +215,7 @@ class Diskstream : public SessionObject, public boost::noncopyable virtual void playlist_changed (Change); virtual void playlist_deleted (boost::weak_ptr<Playlist>); - virtual void playlist_ranges_moved (list< Evoral::RangeMove<nframes_t> > const &); + virtual void playlist_ranges_moved (std::list< Evoral::RangeMove<nframes_t> > const &); virtual void transport_stopped (struct tm&, time_t, bool abort) = 0; virtual void transport_looped (nframes_t transport_frame) = 0; @@ -229,7 +229,7 @@ class Diskstream : public SessionObject, public boost::noncopyable virtual int use_new_write_source (uint32_t n=0) = 0; - virtual int find_and_use_playlist (const string&) = 0; + virtual int find_and_use_playlist (const std::string&) = 0; virtual void allocate_temporary_buffers () = 0; |