X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Flocation.cc;h=7e3330ecd9476128d9f54158b57dbe997c05391b;hb=9e0d03020ff47773f7d1c0414de1c74e6c9e0dac;hp=dd32da26284a0a200ef236d10460409f4af67355;hpb=e09c51251f1742ac5c61966b5dd8c5f61c567f69;p=ardour.git diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index dd32da2628..7e3330ecd9 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,8 @@ #include #include #include -#include +#include + #include "pbd/stl_delete.h" #include "pbd/xml++.h" @@ -39,7 +40,6 @@ using namespace std; using namespace ARDOUR; -using namespace sigc; using namespace PBD; Location::Location (const Location& other) @@ -61,7 +61,7 @@ Location::Location (const Location& other) Location::Location (const XMLNode& node) { - if (set_state (node)) { + if (set_state (node, Stateful::loading_state_version)) { throw failed_constructor (); } } @@ -83,12 +83,12 @@ Location::operator= (const Location& other) _locked = false; /* "changed" not emitted on purpose */ - + return this; } int -Location::set_start (nframes_t s) +Location::set_start (nframes64_t s) { if (_locked) { return -1; @@ -121,7 +121,7 @@ Location::set_start (nframes_t s) } if (s != _start) { - _start = s; + _start = s; start_changed(this); /* EMIT SIGNAL */ } @@ -129,7 +129,7 @@ Location::set_start (nframes_t s) } int -Location::set_end (nframes_t e) +Location::set_end (nframes64_t e) { if (_locked) { return -1; @@ -159,14 +159,14 @@ Location::set_end (nframes_t e) } if (e != _end) { - _end = e; + _end = e; end_changed(this); /* EMIT SIGNAL */ } return 0; } int -Location::set (nframes_t start, nframes_t end) +Location::set (nframes64_t start, nframes64_t end) { if (_locked) { return -1; @@ -177,7 +177,7 @@ Location::set (nframes_t start, nframes_t end) } else if (((is_auto_punch() || is_auto_loop()) && start >= end) || (start > end)) { return -1; } - + if (_start != start) { _start = start; start_changed(this); /* EMIT SIGNAL */ @@ -191,7 +191,7 @@ Location::set (nframes_t start, nframes_t end) } int -Location::move_to (nframes_t pos) +Location::move_to (nframes64_t pos) { if (_locked) { return -1; @@ -200,10 +200,10 @@ Location::move_to (nframes_t pos) if (_start != pos) { _start = pos; _end = _start + length(); - + changed (this); /* EMIT SIGNAL */ } - + return 0; } @@ -256,7 +256,7 @@ Location::set_is_range_marker (bool yn, void *src) } void -Location::set_auto_punch (bool yn, void *src) +Location::set_auto_punch (bool yn, void *src) { if (is_mark() || _start == _end) { return; @@ -268,7 +268,7 @@ Location::set_auto_punch (bool yn, void *src) } void -Location::set_auto_loop (bool yn, void *src) +Location::set_auto_loop (bool yn, void *src) { if (is_mark() || _start == _end) { return; @@ -304,7 +304,7 @@ Location::set_mark (bool yn) if (_start != _end) { return; } - + set_flag_internal (yn, IsMark); } @@ -316,11 +316,11 @@ Location::cd_info_node(const string & name, const string & value) root->add_property("name", name); root->add_property("value", value); - + return *root; } - + XMLNode& Location::get_state (void) { @@ -336,9 +336,9 @@ Location::get_state (void) id().print (buf, sizeof (buf)); node->add_property("id", buf); node->add_property ("name", name()); - snprintf (buf, sizeof (buf), "%u", start()); + snprintf (buf, sizeof (buf), "%" PRId64, start()); node->add_property ("start", buf); - snprintf (buf, sizeof (buf), "%u", end()); + snprintf (buf, sizeof (buf), "%" PRId64, end()); node->add_property ("end", buf); node->add_property ("flags", enum_2_string (_flags)); node->add_property ("locked", (_locked ? "yes" : "no")); @@ -347,14 +347,14 @@ Location::get_state (void) } int -Location::set_state (const XMLNode& node) +Location::set_state (const XMLNode& node, int /*version*/) { const XMLProperty *prop; XMLNodeList cd_list = node.children(); XMLNodeConstIterator cd_iter; XMLNode *cd_node; - + string cd_name; string cd_value; @@ -373,67 +373,67 @@ Location::set_state (const XMLNode& node) error << _("XML node for Location has no name information") << endmsg; return -1; } - + set_name (prop->value()); - + if ((prop = node.property ("start")) == 0) { - error << _("XML node for Location has no start information") << endmsg; + error << _("XML node for Location has no start information") << endmsg; return -1; } - + /* can't use set_start() here, because _end may make the value of _start illegal. */ - - _start = atoi (prop->value().c_str()); - + + sscanf (prop->value().c_str(), "%" PRId64, &_start); + if ((prop = node.property ("end")) == 0) { - error << _("XML node for Location has no end information") << endmsg; + error << _("XML node for Location has no end information") << endmsg; return -1; } - - _end = atoi (prop->value().c_str()); - + + sscanf (prop->value().c_str(), "%" PRId64, &_end); + if ((prop = node.property ("flags")) == 0) { - error << _("XML node for Location has no flags information") << endmsg; + error << _("XML node for Location has no flags information") << endmsg; return -1; } - + _flags = Flags (string_2_enum (prop->value(), _flags)); if ((prop = node.property ("locked")) != 0) { - _locked = (prop->value() == "yes"); + _locked = string_is_affirmative (prop->value()); } else { _locked = false; } for (cd_iter = cd_list.begin(); cd_iter != cd_list.end(); ++cd_iter) { - + cd_node = *cd_iter; - + if (cd_node->name() != "CD-Info") { continue; } - + if ((prop = cd_node->property ("name")) != 0) { cd_name = prop->value(); } else { throw failed_constructor (); } - + if ((prop = cd_node->property ("value")) != 0) { cd_value = prop->value(); } else { throw failed_constructor (); } - - + + cd_info[cd_name] = cd_value; - + } changed(this); /* EMIT SIGNAL */ - + return 0; } @@ -445,7 +445,7 @@ Locations::Locations () current_location = 0; } -Locations::~Locations () +Locations::~Locations () { for (LocationList::iterator i = locations.begin(); i != locations.end(); ) { LocationList::iterator tmp = i; @@ -499,7 +499,7 @@ Locations::next_available_name(string& result,string base) } } for (int k=1; k<=SUFFIX_MAX; k++) { - if (available[k]) { + if (available[k]) { snprintf (buf, 31, "%d", k); result += buf; return 1; @@ -515,7 +515,7 @@ Locations::set_current_unlocked (Location *loc) error << _("Locations: attempt to use unknown location as selected location") << endmsg; return -1; } - + current_location = loc; return 0; } @@ -543,7 +543,7 @@ Locations::clear () changed (); /* EMIT SIGNAL */ current_changed (0); /* EMIT SIGNAL */ -} +} void Locations::clear_markers () @@ -565,7 +565,7 @@ Locations::clear_markers () } changed (); /* EMIT SIGNAL */ -} +} void Locations::clear_ranges () @@ -573,7 +573,7 @@ Locations::clear_ranges () { Glib::Mutex::Lock lm (lock); LocationList::iterator tmp; - + for (LocationList::iterator i = locations.begin(); i != locations.end(); ) { tmp = i; @@ -592,7 +592,7 @@ Locations::clear_ranges () changed (); /* EMIT SIGNAL */ current_changed (0); /* EMIT SIGNAL */ -} +} void Locations::add (Location *loc, bool make_current) @@ -605,12 +605,12 @@ Locations::add (Location *loc, bool make_current) current_location = loc; } } - + added (loc); /* EMIT SIGNAL */ if (make_current) { current_changed (current_location); /* EMIT SIGNAL */ - } + } } void @@ -640,9 +640,9 @@ Locations::remove (Location *loc) } } } - + if (was_removed) { - + removed (loc); /* EMIT SIGNAL */ if (was_current) { @@ -654,7 +654,7 @@ Locations::remove (Location *loc) } void -Locations::location_changed (Location* loc) +Locations::location_changed (Location* /*loc*/) { changed (); /* EMIT SIGNAL */ } @@ -665,16 +665,16 @@ Locations::get_state () XMLNode *node = new XMLNode ("Locations"); LocationList::iterator iter; Glib::Mutex::Lock lm (lock); - + for (iter = locations.begin(); iter != locations.end(); ++iter) { node->add_child_nocopy ((*iter)->get_state ()); } return *node; -} +} int -Locations::set_state (const XMLNode& node) +Locations::set_state (const XMLNode& node, int /*version*/) { XMLNodeList nlist; XMLNodeConstIterator niter; @@ -683,7 +683,7 @@ Locations::set_state (const XMLNode& node) error << _("incorrect XML mode passed to Locations::set_state") << endmsg; return -1; } - + nlist = node.children(); locations.clear (); @@ -693,7 +693,7 @@ Locations::set_state (const XMLNode& node) Glib::Mutex::Lock lm (lock); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { - + try { Location *loc = new Location (**niter); @@ -704,7 +704,7 @@ Locations::set_state (const XMLNode& node) error << _("could not load location from session file - ignored") << endmsg; } } - + if (locations.size()) { current_location = locations.front(); @@ -714,18 +714,18 @@ Locations::set_state (const XMLNode& node) } changed (); /* EMIT SIGNAL */ - + return 0; -} +} -struct LocationStartEarlierComparison +struct LocationStartEarlierComparison { bool operator() (Location *a, Location *b) { return a->start() < b->start(); } }; -struct LocationStartLaterComparison +struct LocationStartLaterComparison { bool operator() (Location *a, Location *b) { return a->start() > b->start(); @@ -733,7 +733,7 @@ struct LocationStartLaterComparison }; Location * -Locations::first_location_before (nframes_t frame, bool include_special_ranges) +Locations::first_location_before (nframes64_t frame, bool include_special_ranges) { LocationList locs; @@ -746,7 +746,7 @@ Locations::first_location_before (nframes_t frame, bool include_special_ranges) locs.sort (cmp); /* locs is now sorted latest..earliest */ - + for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) { if (!include_special_ranges && ((*i)->is_auto_loop() || (*i)->is_auto_punch())) { continue; @@ -760,7 +760,7 @@ Locations::first_location_before (nframes_t frame, bool include_special_ranges) } Location * -Locations::first_location_after (nframes_t frame, bool include_special_ranges) +Locations::first_location_after (nframes64_t frame, bool include_special_ranges) { LocationList locs; @@ -773,7 +773,7 @@ Locations::first_location_after (nframes_t frame, bool include_special_ranges) locs.sort (cmp); /* locs is now sorted earliest..latest */ - + for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) { if (!include_special_ranges && ((*i)->is_auto_loop() || (*i)->is_auto_punch())) { continue; @@ -786,84 +786,67 @@ Locations::first_location_after (nframes_t frame, bool include_special_ranges) return 0; } -nframes_t -Locations::first_mark_before (nframes_t frame, bool include_special_ranges) +/** Look for the `marks' (either locations which are marks, or start/end points of range markers) either + * side of a frame. + * @param frame Frame to look for. + * @param before Filled in with the position of the last `mark' before `frame' (or max_frames if none exists) + * @param after Filled in with the position of the last `mark' after `frame' (or max_frames if none exists) + */ +void +Locations::marks_either_side (nframes64_t const frame, nframes64_t& before, nframes64_t& after) const { + before = after = max_frames; + LocationList locs; { - Glib::Mutex::Lock lm (lock); + Glib::Mutex::Lock lm (lock); locs = locations; } - LocationStartLaterComparison cmp; - locs.sort (cmp); + std::list positions; - /* locs is now sorted latest..earliest */ - - for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) { - if (!include_special_ranges && ((*i)->is_auto_loop() || (*i)->is_auto_punch())) { + for (LocationList::const_iterator i = locs.begin(); i != locs.end(); ++i) { + if (((*i)->is_auto_loop() || (*i)->is_auto_punch())) { continue; } + if (!(*i)->is_hidden()) { - if ((*i)->is_mark()) { - /* MARK: start == end */ - if ((*i)->start() < frame) { - return (*i)->start(); - } + if ((*i)->is_mark ()) { + positions.push_back ((*i)->start ()); } else { - /* RANGE: start != end, compare start and end */ - if ((*i)->end() < frame) { - return (*i)->end(); - } - if ((*i)->start () < frame) { - return (*i)->start(); - } + positions.push_back ((*i)->start ()); + positions.push_back ((*i)->end ()); } } } - return 0; -} + if (positions.empty ()) { + return; + } -nframes_t -Locations::first_mark_after (nframes_t frame, bool include_special_ranges) -{ - LocationList locs; + positions.sort (); - { - Glib::Mutex::Lock lm (lock); - locs = locations; + std::list::iterator i = positions.begin (); + while (i != positions.end () && *i < frame) { + ++i; } - LocationStartEarlierComparison cmp; - locs.sort (cmp); - - /* locs is now sorted earliest..latest */ - - for (LocationList::iterator i = locs.begin(); i != locs.end(); ++i) { - if (!include_special_ranges && ((*i)->is_auto_loop() || (*i)->is_auto_punch())) { - continue; - } - 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 (); - } - } - } + if (i == positions.end ()) { + /* run out of marks */ + before = positions.back (); + return; } - return max_frames; + after = *i; + + if (i == positions.begin ()) { + /* none before */ + return; + } + + --i; + before = *i; } Location* @@ -875,7 +858,7 @@ Locations::end_location () const } } return 0; -} +} Location* Locations::start_location () const @@ -886,7 +869,7 @@ Locations::start_location () const } } return 0; -} +} Location* Locations::auto_loop_location () const @@ -897,7 +880,7 @@ Locations::auto_loop_location () const } } return 0; -} +} Location* Locations::auto_punch_location () const @@ -908,7 +891,7 @@ Locations::auto_punch_location () const } } return 0; -} +} uint32_t Locations::num_range_markers () const @@ -940,7 +923,7 @@ Locations::find_all_between (nframes64_t start, nframes64_t end, LocationList& l Glib::Mutex::Lock lm (lock); for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { - if ((flags == 0 || (*i)->matches (flags)) && + if ((flags == 0 || (*i)->matches (flags)) && ((*i)->start() >= start && (*i)->end() < end)) { ll.push_back (*i); }