Das BlinkenSendButtons

[ardour.git] / libs / ardour / ardour / track.h

diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 96826e3eaaa9880bc994703de24cd665e7841197..aca7c6f968a7aed060cc1f1a04ddb20122073d8a 100644 (file)
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -34,7 +34,7 @@ class Region;
 class Track : public Route
 {
   public:
-       Track (Session&, string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal, DataType default_type = DataType::AUDIO);
+       Track (Session&, std::string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal, DataType default_type = DataType::AUDIO);
 
        virtual ~Track ();
        
@@ -45,13 +45,13 @@ class Track : public Route
        virtual bool can_use_mode (TrackMode m, bool& bounce_required) { return false; }
        sigc::signal<void> TrackModeChanged;
        
-       int no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
-                            bool state_changing, bool can_record, bool rec_monitors_input);
+       int no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, 
+                    bool state_changing, bool can_record, bool rec_monitors_input);
        
-       int silent_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
+       int silent_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, 
                        bool can_record, bool rec_monitors_input);
 
-       virtual int roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame, 
+       virtual int roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, 
                          int declick, bool can_record, bool rec_monitors_input) = 0;
        
        void toggle_monitor_input ();
@@ -60,7 +60,7 @@ class Track : public Route
 
        boost::shared_ptr<Diskstream> diskstream() const { return _diskstream; }
 
-       virtual int use_diskstream (string name) = 0;
+       virtual int use_diskstream (std::string name) = 0;
        virtual int use_diskstream (const PBD::ID& id) = 0;
 
        nframes_t update_total_latency();
@@ -122,7 +122,7 @@ class Track : public Route
            ~FreezeRecord();
 
            boost::shared_ptr<Playlist>        playlist;
-           vector<FreezeRecordProcessorInfo*> processor_info;
+           std::vector<FreezeRecordProcessorInfo*> processor_info;
            bool                               have_mementos;
            FreezeState                        state;
            gain_t                          gain;