use existing API to find the instrument

[ardour.git] / libs / ardour / location.cc

diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index c693e1f5d55034e3d84f421990a3206755fc7296..1b63ce4431cf3b86f8ceefe8afa824088a37734d 100644 (file)
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -104,6 +104,7 @@ Location::Location (const Location& other)
 
 Location::Location (Session& s, const XMLNode& node)
        : SessionHandleRef (s)
+       , _flags (Flags (0))
        , _position_lock_style (AudioTime)
 {
        /* Note: _position_lock_style is initialised above in case set_state doesn't set it
@@ -147,7 +148,7 @@ Location::operator= (const Location& other)
        _bbt_end = other._bbt_end;
        _flags = other._flags;
        _position_lock_style = other._position_lock_style;
-       
+
        /* XXX need to copy scene change */
 
        /* copy is not locked even if original was */
@@ -167,8 +168,8 @@ Location::operator= (const Location& other)
 
 void
 Location::set_name (const std::string& str)
-{ 
-       _name = str; 
+{
+       _name = str;
 
        name_changed (this); /* EMIT SIGNAL */
        NameChanged  (); /* EMIT SIGNAL */
@@ -239,7 +240,7 @@ Location::set_start (framepos_t s, bool force, bool allow_bbt_recompute)
                }
                start_changed (this); /* EMIT SIGNAL */
                StartChanged (); /* EMIT SIGNAL */
-                               
+
                if (is_session_range ()) {
                        Session::StartTimeChanged (old); /* EMIT SIGNAL */
                        AudioFileSource::set_header_position_offset (s);
@@ -357,7 +358,7 @@ Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute)
                if (e - s < Config->get_range_location_minimum()) {
                        return -1;
                }
-                
+
                if (s != _start) {
 
                        framepos_t const old = _start;
@@ -368,23 +369,23 @@ Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute)
                        }
 
                        start_change = true;
-                        
+
                        if (is_session_range ()) {
                                Session::StartTimeChanged (old); /* EMIT SIGNAL */
                                AudioFileSource::set_header_position_offset (s);
                        }
                }
-                        
-                 
+
+
                if (e != _end) {
-                        
+
                        framepos_t const old = _end;
                        _end = e;
 
                        if (allow_bbt_recompute) {
                                recompute_bbt_from_frames ();
                        }
-                        
+
                        end_change = true;
 
                        if (is_session_range()) {
@@ -687,7 +688,7 @@ Location::set_state (const XMLNode& node, int version)
        }
 
        XMLNode* scene_child = find_named_node (node, SceneChange::xml_node_name);
-       
+
        if (scene_child) {
                _scene_change = SceneChange::factory (*scene_child, version);
        }
@@ -762,7 +763,7 @@ Location::set_scene_change (boost::shared_ptr<SceneChange>  sc)
         if (_scene_change != sc) {
                 _scene_change = sc;
                 _session.set_dirty ();
-                
+
                 scene_changed (); /* EMIT SIGNAL */
                 SceneChangeChanged (); /* EMIT SIGNAL */
         }
@@ -818,7 +819,7 @@ Locations::next_available_name(string& result,string base)
        l = base.length();
 
        if (!base.empty()) {
-                
+
                /* find all existing names that match "base", and store
                   the numeric part of them (if any) in the map "taken"
                */
@@ -826,7 +827,7 @@ Locations::next_available_name(string& result,string base)
                for (i = locations.begin(); i != locations.end(); ++i) {
 
                        const string& temp ((*i)->name());
-                        
+
                        if (!temp.find (base,0)) {
                                /* grab what comes after the "base" as if it was
                                   a number, and assuming that works OK,
@@ -845,12 +846,12 @@ Locations::next_available_name(string& result,string base)
           was deleted.
 
           This must start at 1, both for human-numbering reasons
-          and also because the call to atoi() above would return 
+          and also because the call to atoi() above would return
           zero if there is no recognizable numeric suffix, causing
           "base 0" not to be inserted into the "taken" map.
        */
 
-       n = 1; 
+       n = 1;
 
        while (n < UINT32_MAX) {
                if (taken.find (n) == taken.end()) {
@@ -860,7 +861,7 @@ Locations::next_available_name(string& result,string base)
                }
                ++n;
        }
-                
+
        return 0;
 }
 
@@ -921,7 +922,7 @@ Locations::clear_markers ()
                        i = tmp;
                }
        }
-        
+
        changed (); /* EMIT SIGNAL */
 }
 
@@ -1021,7 +1022,7 @@ Locations::remove (Location *loc)
        if (was_removed) {
 
                removed (loc); /* EMIT SIGNAL */
-                
+
                if (was_current) {
                        current_changed (0); /* EMIT SIGNAL */
                }
@@ -1084,7 +1085,7 @@ Locations::set_state (const XMLNode& node, int version)
                                if (i != locations.end()) {
                                        /* we can re-use an old Location object */
                                        loc = *i;
-                    
+
                                        // changed locations will be updated by Locations::changed signal
                                        loc->set_state (**niter, version);
                                } else {
@@ -1190,7 +1191,7 @@ Locations::first_mark_before (framepos_t frame, bool include_special_ranges)
 {
        Glib::Threads::Mutex::Lock lm (lock);
        vector<LocationPair> locs;
-       
+
        for (LocationList::iterator i = locations.begin(); i != locations.end(); ++i) {
                locs.push_back (make_pair ((*i)->start(), (*i)));
                if (!(*i)->is_mark()) {
@@ -1233,12 +1234,12 @@ Locations::mark_at (framepos_t pos, framecnt_t slop) const
        for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) {
 
                if ((*i)->is_mark()) {
-                       if (pos > (*i)->start()) { 
+                       if (pos > (*i)->start()) {
                                delta = pos - (*i)->start();
                        } else {
                                delta = (*i)->start() - pos;
                        }
-                       
+
                        if (slop == 0 && delta == 0) {
                                /* special case: no slop, and direct hit for position */
                                return *i;
@@ -1271,7 +1272,7 @@ Locations::first_mark_after (framepos_t frame, bool include_special_ranges)
 
        LocationStartEarlierComparison cmp;
        sort (locs.begin(), locs.end(), cmp);
-       
+
        /* locs is sorted in reverse order */
 
        for (vector<LocationPair>::iterator i = locs.begin(); i != locs.end(); ++i) {