Fix small issue with the playlist unique name patch.

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

diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index f495e0051065d8fff5a636e7e2d115426f35f701..9ed103b67ce8e8ac8d81e3efc4e4e2f204d470eb 100644 (file)
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -37,6 +37,7 @@
 #include <ardour/region.h>
 #include <ardour/region_factory.h>
 #include <ardour/playlist_factory.h>
+#include <ardour/transient_detector.h>
 
 #include "i18n.h"
 
@@ -281,7 +282,17 @@ Playlist::set_name (string str)
                return;
        }
 
-       _name = str; 
+       if (str == _name) {
+               return;
+       }
+
+       string name = str;
+
+       while (_session.playlist_by_name(name) != 0) {
+               name = bump_name_once(name);
+       }
+
+       _name = name; 
        NameChanged(); /* EMIT SIGNAL */
 }
 
@@ -1411,6 +1422,65 @@ Playlist::regions_touched (nframes_t start, nframes_t end)
        return rlist;
 }
 
+nframes64_t
+Playlist::find_next_transient (nframes64_t from, int dir)
+{
+       RegionLock rlock (this);
+       AnalysisFeatureList points;
+       AnalysisFeatureList these_points;
+
+       for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
+               if (dir > 0) {
+                       if ((*i)->last_frame() < from) {
+                               continue;
+                       }
+               } else {
+                       if ((*i)->first_frame() > from) {
+                               continue;
+                       }
+               }
+
+               (*i)->get_transients (these_points);
+
+               /* add first frame, just, err, because */
+               
+               these_points.push_back ((*i)->first_frame());
+               
+               points.insert (points.end(), these_points.begin(), these_points.end());
+               these_points.clear ();
+       }
+       
+       if (points.empty()) {
+               return -1;
+       }
+
+       TransientDetector::cleanup_transients (points, _session.frame_rate(), 3.0);
+       bool reached = false;
+       
+       if (dir > 0) {
+               for (AnalysisFeatureList::iterator x = points.begin(); x != points.end(); ++x) {
+                       if ((*x) >= from) {
+                               reached = true;
+                       }
+                       
+                       if (reached && (*x) > from) {
+                               return *x;
+                       }
+               }
+       } else {
+               for (AnalysisFeatureList::reverse_iterator x = points.rbegin(); x != points.rend(); ++x) {
+                       if ((*x) <= from) {
+                               reached = true;
+                       }
+                       
+                       if (reached && (*x) < from) {
+                               return *x;
+                       }
+               }
+       }
+
+       return -1;
+}
 
 boost::shared_ptr<Region>
 Playlist::find_next_region (nframes_t frame, RegionPoint point, int dir)
@@ -1736,50 +1806,12 @@ Playlist::bump_name (string name, Session &session)
        string newname = name;
 
        do {
-               newname = Playlist::bump_name_once (newname);
+               newname = bump_name_once (newname);
        } while (session.playlist_by_name (newname)!=NULL);
 
        return newname;
 }
 
-string
-Playlist::bump_name_once (string name)
-{
-       string::size_type period;
-       string newname;
-
-       if ((period = name.find_last_of ('.')) == string::npos) {
-               newname  = name;
-               newname += ".1";
-       } else {
-               int isnumber = 1;
-               const char *last_element = name.c_str() + period + 1;
-               for (size_t i = 0; i < strlen(last_element); i++) {
-                       if (!isdigit(last_element[i])) {
-                               isnumber = 0;
-                               break;
-                       }
-               }
-
-               errno = 0;
-               long int version = strtol (name.c_str()+period+1, (char **)NULL, 10);
-
-               if (isnumber == 0 || errno != 0) {
-                       // last_element is not a number, or is too large
-                       newname  = name;
-                       newname += ".1";
-               } else {
-                       char buf[32];
-
-                       snprintf (buf, sizeof(buf), "%ld", version+1);
-               
-                       newname  = name.substr (0, period+1);
-                       newname += buf;
-               }
-       }
-
-       return newname;
-}
 
 layer_t
 Playlist::top_layer() const
@@ -2209,3 +2241,18 @@ Playlist::region_is_shuffle_constrained (boost::shared_ptr<Region>)
 
        return false;
 }
+
+void
+Playlist::update_after_tempo_map_change ()
+{
+       RegionLock rlock (const_cast<Playlist*> (this));
+       RegionList copy (regions);
+
+       freeze ();
+       
+       for (RegionList::iterator i = copy.begin(); i != copy.end(); ++i) {     
+               (*i)->update_position_after_tempo_map_change ();
+       }
+
+       thaw ();
+}