X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Flocation.h;h=1f2b80c831953c3237798b77c0616b1ccee45365;hb=aae367b63c9b619db1e40f27dc334c6987219481;hp=96fb1b1bcfee319fa0f2c074947944a4740cfd84;hpb=7bd41538d951c3e476655df741adfbebbb990bde;p=ardour.git diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index 96fb1b1bcf..1f2b80c831 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -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 @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __ardour_location_h__ @@ -27,22 +26,18 @@ #include #include -#include #include -#include -#include -#include +#include "pbd/undo.h" +#include "pbd/stateful.h" +#include "pbd/statefuldestructible.h" -#include -#include - -using std::string; +#include "ardour/ardour.h" namespace ARDOUR { -class Location : public sigc::trackable, public PBD::StatefulDestructible +class Location : public PBD::StatefulDestructible { public: enum Flags { @@ -56,36 +51,44 @@ class Location : public sigc::trackable, public PBD::StatefulDestructible IsStart = 0x80 }; - Location (jack_nframes_t sample_start, - jack_nframes_t sample_end, - const string &name, - Flags bits = Flags(0)) - + Location (nframes64_t sample_start, + nframes64_t sample_end, + const std::string &name, + Flags bits = Flags(0)) + : _name (name), _start (sample_start), _end (sample_end), - _flags (bits) { } - + _flags (bits), + _locked (false) { } + Location () { _start = 0; _end = 0; - _flags = 0; + _flags = Flags (0); + _locked = false; } Location (const Location& other); Location (const XMLNode&); Location* operator= (const Location& other); - jack_nframes_t start() { return _start; } - jack_nframes_t end() { return _end; } - jack_nframes_t length() { return _end - _start; } + bool locked() const { return _locked; } + void lock() { _locked = true; changed (this); } + void unlock() { _locked = false; changed (this); } + + nframes64_t start() const { return _start; } + nframes64_t end() const { return _end; } + nframes64_t length() const { return _end - _start; } - int set_start (jack_nframes_t s); - int set_end (jack_nframes_t e); - int set (jack_nframes_t start, jack_nframes_t end); + int set_start (nframes64_t s); + int set_end (nframes64_t e); + int set (nframes64_t start, nframes64_t end); - const string& name() { return _name; } - void set_name (const string &str) { _name = str; name_changed(this); } + int move_to (nframes64_t pos); + + const std::string& name() const { return _name; } + void set_name (const std::string &str) { _name = str; name_changed(this); } void set_auto_punch (bool yn, void *src); void set_auto_loop (bool yn, void *src); @@ -93,45 +96,48 @@ class Location : public sigc::trackable, public PBD::StatefulDestructible void set_cd (bool yn, void *src); void set_is_end (bool yn, void* src); void set_is_start (bool yn, void* src); + void set_is_range_marker (bool yn, void* src); - bool is_auto_punch () { return _flags & IsAutoPunch; } - bool is_auto_loop () { return _flags & IsAutoLoop; } - bool is_mark () { return _flags & IsMark; } - bool is_hidden () { return _flags & IsHidden; } - bool is_cd_marker () { return _flags & IsCDMarker; } - bool is_end() { return _flags & IsEnd; } - bool is_start() { return _flags & IsStart; } - bool is_range_marker() { return _flags & IsRangeMarker; } + bool is_auto_punch () const { return _flags & IsAutoPunch; } + bool is_auto_loop () const { return _flags & IsAutoLoop; } + bool is_mark () const { return _flags & IsMark; } + bool is_hidden () const { return _flags & IsHidden; } + bool is_cd_marker () const { return _flags & IsCDMarker; } + bool is_end() const { return _flags & IsEnd; } + bool is_start() const { return _flags & IsStart; } + bool is_range_marker() const { return _flags & IsRangeMarker; } + bool matches (Flags f) const { return _flags & f; } - sigc::signal name_changed; - sigc::signal end_changed; - sigc::signal start_changed; + PBD::Signal1 name_changed; + PBD::Signal1 end_changed; + PBD::Signal1 start_changed; - sigc::signal FlagsChanged; + PBD::Signal2 FlagsChanged; /* this is sent only when both start&end change at the same time */ - sigc::signal changed; - + PBD::Signal1 changed; + /* CD Track / CD-Text info */ - std::map cd_info; - XMLNode& cd_info_node (const string &, const string &); + std::map cd_info; + XMLNode& cd_info_node (const std::string &, const std::string &); XMLNode& get_state (void); - int set_state (const XMLNode&); + int set_state (const XMLNode&, int version); private: - string _name; - jack_nframes_t _start; - jack_nframes_t _end; - uint32_t _flags; + std::string _name; + nframes64_t _start; + nframes64_t _end; + Flags _flags; + bool _locked; void set_mark (bool yn); bool set_flag_internal (bool yn, Flags flag); }; -class Locations : public StateManager, public PBD::StatefulDestructible +class Locations : public PBD::StatefulDestructible { public: typedef std::list LocationList; @@ -139,6 +145,8 @@ class Locations : public StateManager, public PBD::StatefulDestructible Locations (); ~Locations (); + const LocationList& list() { return locations; } + void add (Location *, bool make_current = false); void remove (Location *); void clear (); @@ -146,7 +154,7 @@ class Locations : public StateManager, public PBD::StatefulDestructible void clear_ranges (); XMLNode& get_state (void); - int set_state (const XMLNode&); + int set_state (const XMLNode&, int version); Location *get_location_by_id(PBD::ID); Location* auto_loop_location () const; @@ -154,21 +162,24 @@ class Locations : public StateManager, public PBD::StatefulDestructible Location* end_location() const; Location* start_location() const; + int next_available_name(std::string& result,std::string base); uint32_t num_range_markers() const; int set_current (Location *, bool want_lock = true); Location *current () const { return current_location; } - Location *first_location_before (jack_nframes_t); - Location *first_location_after (jack_nframes_t); + Location *first_location_before (nframes64_t, bool include_special_ranges = false); + Location *first_location_after (nframes64_t, bool include_special_ranges = false); - jack_nframes_t first_mark_before (jack_nframes_t); - jack_nframes_t first_mark_after (jack_nframes_t); + void marks_either_side (nframes64_t const, nframes64_t &, nframes64_t &) const; - sigc::signal current_changed; - sigc::signal changed; - sigc::signal added; - sigc::signal removed; + void find_all_between (nframes64_t start, nframes64_t, LocationList&, Location::Flags); + + PBD::Signal1 current_changed; + PBD::Signal0 changed; + PBD::Signal1 added; + PBD::Signal1 removed; + PBD::Signal1 StateChanged; template void apply (T& obj, void (T::*method)(LocationList&)) { Glib::Mutex::Lock lm (lock); @@ -180,26 +191,14 @@ class Locations : public StateManager, public PBD::StatefulDestructible (obj.*method)(locations, arg); } - UndoAction get_memento () const; - private: - struct State : public ARDOUR::StateManager::State { - LocationList locations; - LocationList states; - - State (std::string why) : ARDOUR::StateManager::State (why) {} - }; - - LocationList locations; - Location *current_location; + LocationList locations; + Location *current_location; mutable Glib::Mutex lock; int set_current_unlocked (Location *); void location_changed (Location*); - - Change restore_state (StateManager::State&); - StateManager::State* state_factory (std::string why) const; }; } // namespace ARDOUR