merge changes from harrison branch back into trunk, by hand
[ardour.git] / libs / ardour / location.cc
index f4eea2cfc5555c2b8af0c91fce4f3f45ea6d23e7..30b28c6abee73a937e76d9eec31988ab66f3d5c9 100644 (file)
 #include <pbd/xml++.h>
 
 #include <ardour/location.h>
+#include <ardour/session.h>
+#include <ardour/audiofilesource.h>
 
 #include "i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace sigc;
+using namespace PBD;
 
 Location::Location (const Location& other)
        : _name (other._name),
@@ -43,6 +46,17 @@ Location::Location (const Location& other)
          _end (other._end),
          _flags (other._flags)
 {
+       /* start and end flags can never be copied, because there can only ever be one of each */
+
+       _flags = Flags (_flags & ~IsStart);
+       _flags = Flags (_flags & ~IsEnd);
+}
+
+Location::Location (const XMLNode& node)
+{
+       if (set_state (node)) {
+               throw failed_constructor ();
+       }
 }
 
 Location*
@@ -70,6 +84,13 @@ Location::set_start (jack_nframes_t s)
                        _start = s;
                        _end = s;
                        start_changed(this); /* EMIT SIGNAL */
+                       if ( is_start() ) {
+                               Session::StartTimeChanged (); /* EMIT SIGNAL */
+                               AudioFileSource::set_header_position_offset ( s );
+                       }
+                       if ( is_end() ) {
+                               Session::EndTimeChanged (); /* EMIT SIGNAL */
+                       }
                }
                return 0;
        }
@@ -232,13 +253,16 @@ XMLNode&
 Location::get_state (void)
 {
        XMLNode *node = new XMLNode ("Location");
-       char buf[32];
+       char buf[64];
 
        typedef map<string, string>::const_iterator CI;
+
        for(CI m = cd_info.begin(); m != cd_info.end(); ++m){
                node->add_child_nocopy(cd_info_node(m->first, m->second));
        }
 
+       id().print (buf);
+       node->add_property("id", buf);
        node->add_property ("name", name());
        snprintf (buf, sizeof (buf), "%u", start());
        node->add_property ("start", buf);
@@ -253,7 +277,6 @@ Location::get_state (void)
 int
 Location::set_state (const XMLNode& node)
 {
-       XMLPropertyList plist;
        const XMLProperty *prop;
 
        XMLNodeList cd_list = node.children();
@@ -263,14 +286,17 @@ Location::set_state (const XMLNode& node)
        string cd_name;
        string cd_value;
 
-
        if (node.name() != "Location") {
                error << _("incorrect XML node passed to Location::set_state") << endmsg;
                return -1;
        }
 
-       plist = node.properties();
-               
+       if ((prop = node.property ("id")) == 0) {
+               warning << _("XML node for Location has no ID information") << endmsg;
+       } else {
+               _id = prop->value ();
+       }
+
        if ((prop = node.property ("name")) == 0) {
                error << _("XML node for Location has no name information") << endmsg;
                return -1;
@@ -371,7 +397,7 @@ Locations::set_current (Location *loc, bool want_lock)
        int ret;
 
        if (want_lock) {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                ret = set_current_unlocked (loc);
        } else {
                ret = set_current_unlocked (loc);
@@ -399,12 +425,12 @@ void
 Locations::clear ()
 {
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                LocationList::iterator tmp;
                for (LocationList::iterator i = locations.begin(); i != locations.end(); ) {
                        tmp = i;
                        ++tmp;
-                       if (!(*i)->is_end()) {
+                       if (!(*i)->is_end() && !(*i)->is_start()) {
                                locations.erase (i);
                        }
                        i = tmp;
@@ -424,14 +450,14 @@ void
 Locations::clear_markers ()
 {
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                LocationList::iterator tmp;
 
                for (LocationList::iterator i = locations.begin(); i != locations.end(); ) {
                        tmp = i;
                        ++tmp;
 
-                       if ((*i)->is_mark() && !(*i)->is_end()) {
+                       if ((*i)->is_mark() && !(*i)->is_end() && !(*i)->is_start()) {
                                locations.erase (i);
                        }
 
@@ -448,7 +474,7 @@ void
 Locations::clear_ranges ()
 {
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                LocationList::iterator tmp;
                
                for (LocationList::iterator i = locations.begin(); i != locations.end(); ) {
@@ -477,7 +503,7 @@ void
 Locations::add (Location *loc, bool make_current)
 {
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                locations.push_back (loc);
 
                if (make_current) {
@@ -502,12 +528,12 @@ Locations::remove (Location *loc)
        bool was_current = false;
        LocationList::iterator i;
 
-       if (loc->is_end()) {
+       if (loc->is_end() || loc->is_start()) {
                return;
        }
 
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
 
                for (i = locations.begin(); i != locations.end(); ++i) {
                        if ((*i) == loc) {
@@ -547,7 +573,7 @@ Locations::get_state ()
 {
        XMLNode *node = new XMLNode ("Locations");
        LocationList::iterator iter;
-       LockMonitor lm (lock, __LINE__, __FILE__);
+       Glib::Mutex::Lock lm (lock);
        
        for (iter  = locations.begin(); iter != locations.end(); ++iter) {
                node->add_child_nocopy ((*iter)->get_state ());
@@ -570,19 +596,23 @@ Locations::set_state (const XMLNode& node)
        nlist = node.children();
        
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
 
                for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-                       Location *loc = new Location;
                        
-                       if (loc->set_state (**niter)) {
-                               delete loc;
-                       } else {
+                       try {
+
+                               Location *loc = new Location (**niter);
                                locations.push_back (loc);
                        }
+
+                       catch (failed_constructor& err) {
+                               error << _("could not load location from session file - ignored") << endmsg;
+                       }
                }
                
                if (locations.size()) {
+
                        current_location = locations.front();
                } else {
                        current_location = 0;
@@ -614,7 +644,7 @@ Locations::first_location_before (jack_nframes_t frame)
        LocationList locs;
 
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                locs = locations;
        }
 
@@ -638,7 +668,7 @@ Locations::first_location_after (jack_nframes_t frame)
        LocationList locs;
 
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                locs = locations;
        }
 
@@ -656,6 +686,80 @@ Locations::first_location_after (jack_nframes_t frame)
        return 0;
 }
 
+jack_nframes_t
+Locations::first_mark_before (jack_nframes_t frame)
+{
+       LocationList locs;
+
+       {
+        Glib::Mutex::Lock lm (lock);
+               locs = locations;
+       }
+
+       LocationStartLaterComparison cmp;
+       locs.sort (cmp);
+
+       /* locs is now sorted latest..earliest */
+       
+       for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) {
+               if (!(*i)->is_hidden()) {
+                       if ((*i)->is_mark()) {
+                               /* MARK: start == end */
+                               if ((*i)->start() < frame) {
+                                       return (*i)->start();
+                               }
+                       } else {
+                               /* RANGE: start != end, compare start and end */
+                               if ((*i)->end() < frame) {
+                                       return (*i)->end();
+                               }
+                               if ((*i)->start () < frame) {
+                                       return (*i)->start();
+                               }
+                       }
+               }
+       }
+
+       return 0;
+}
+
+jack_nframes_t
+Locations::first_mark_after (jack_nframes_t frame)
+{
+       LocationList locs;
+
+       {
+        Glib::Mutex::Lock lm (lock);
+               locs = locations;
+       }
+
+       LocationStartEarlierComparison cmp;
+       locs.sort (cmp);
+
+       /* locs is now sorted earliest..latest */
+       
+       for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) {
+               if (!(*i)->is_hidden()) {
+                       if ((*i)->is_mark()) {
+                               /* MARK, start == end so just compare start */
+                               if ((*i)->start() > frame) {
+                                       return (*i)->start();
+                               }
+                       } else {
+                               /* RANGE, start != end, compare start and end */
+                               if ((*i)->start() > frame ) {
+                                       return (*i)->start ();
+                               }
+                               if ((*i)->end() > frame) {
+                                       return (*i)->end ();
+                               }
+                       }
+               }
+       }
+
+       return max_frames;
+}
+
 Location*
 Locations::end_location () const
 {
@@ -718,7 +822,7 @@ Change
 Locations::restore_state (StateManager::State& state) 
 {
        {
-               LockMonitor lm (lock, __LINE__, __FILE__);
+               Glib::Mutex::Lock lm (lock);
                State* lstate = dynamic_cast<State*> (&state);
 
                locations = lstate->locations;
@@ -743,7 +847,7 @@ uint32_t
 Locations::num_range_markers () const
 {
        uint32_t cnt = 0;
-       LockMonitor lm (lock, __LINE__, __FILE__);
+       Glib::Mutex::Lock lm (lock);
        for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) {
                if ((*i)->is_range_marker()) {
                        ++cnt;
@@ -751,3 +855,14 @@ Locations::num_range_markers () const
        }
        return cnt;
 }
+
+Location *
+Locations::get_location_by_id(PBD::ID id)
+{
+    LocationList::iterator it;
+    for (it  = locations.begin(); it != locations.end(); it++)
+        if (id == (*it)->id())
+            return *it;
+
+    return 0;
+}