/*
- 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
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__
#include <map>
#include <sys/types.h>
-#include <pthread.h>
-#include <sigc++/signal.h>
-#include <pbd/lockmonitor.h>
-#include <pbd/undo.h>
+#include <glibmm/thread.h>
-#include "ardour.h"
-#include "stateful.h"
-#include "state_manager.h"
+#include "pbd/undo.h"
+#include "pbd/stateful.h"
+#include "pbd/statefuldestructible.h"
-using std::string;
+#include "ardour/ardour.h"
namespace ARDOUR {
-class Location : public Stateful, public sigc::trackable
+class Location : public PBD::StatefulDestructible
{
public:
enum Flags {
IsHidden = 0x8,
IsCDMarker = 0x10,
IsEnd = 0x20,
- IsRangeMarker = 0x40
+ IsRangeMarker = 0x40,
+ 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 (nframes64_t s);
+ int set_end (nframes64_t e);
+ int set (nframes64_t start, nframes64_t end);
- 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 move_to (nframes64_t pos);
- const string& name() { return _name; }
- void set_name (const string &str) { _name = str; name_changed(this); }
+ 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);
void set_hidden (bool yn, void *src);
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_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<void,Location*> name_changed;
- sigc::signal<void,Location*> end_changed;
- sigc::signal<void,Location*> start_changed;
+ PBD::Signal1<void,Location*> name_changed;
+ PBD::Signal1<void,Location*> end_changed;
+ PBD::Signal1<void,Location*> start_changed;
- sigc::signal<void,Location*,void*> FlagsChanged;
+ PBD::Signal2<void,Location*,void*> FlagsChanged;
/* this is sent only when both start&end change at the same time */
- sigc::signal<void,Location*> changed;
-
+ PBD::Signal1<void,Location*> changed;
+
/* CD Track / CD-Text info */
- std::map<string, string> cd_info;
- XMLNode& cd_info_node (const string &, const string &);
+ std::map<std::string, std::string> 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 Stateful, public StateManager
+class Locations : public PBD::StatefulDestructible
{
public:
typedef std::list<Location *> LocationList;
Locations ();
~Locations ();
+ const LocationList& list() { return locations; }
+
void add (Location *, bool make_current = false);
void remove (Location *);
void clear ();
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;
Location* auto_punch_location () const;
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);
+
+ void marks_either_side (nframes64_t const, nframes64_t &, nframes64_t &) const;
- sigc::signal<void,Location*> current_changed;
- sigc::signal<void> changed;
- sigc::signal<void,Location*> added;
- sigc::signal<void,Location*> removed;
+ void find_all_between (nframes64_t start, nframes64_t, LocationList&, Location::Flags);
+
+ PBD::Signal1<void,Location*> current_changed;
+ PBD::Signal0<void> changed;
+ PBD::Signal1<void,Location*> added;
+ PBD::Signal1<void,Location*> removed;
+ PBD::Signal1<void,Change> StateChanged;
template<class T> void apply (T& obj, void (T::*method)(LocationList&)) {
- LockMonitor lm (lock, __LINE__, __FILE__);
+ Glib::Mutex::Lock lm (lock);
(obj.*method)(locations);
}
template<class T1, class T2> void apply (T1& obj, void (T1::*method)(LocationList&, T2& arg), T2& arg) {
- LockMonitor lm (lock, __LINE__, __FILE__);
+ Glib::Mutex::Lock lm (lock);
(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;
- mutable PBD::Lock lock;
+ 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 */
+} // namespace ARDOUR
#endif /* __ardour_location_h__ */