X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Flocation.h;h=b48db52d92a613922a414b39d65b50bf2362bdca;hb=8713667ec1a6cc9ba56c07f763e5a422cc47fbef;hp=d5b672a89d00fe95b9e6bea75032eb1ea0e36faa;hpb=6f8cd634501efd70711b148b4ac0e0ce2aa5cc95;p=ardour.git

diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h
index d5b672a89d..b48db52d92 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
@@ -30,13 +30,11 @@
 
 #include <glibmm/thread.h>
 
-#include <pbd/undo.h>
-#include <pbd/stateful.h> 
-#include <pbd/statefuldestructible.h> 
+#include "pbd/undo.h"
+#include "pbd/stateful.h"
+#include "pbd/statefuldestructible.h"
 
-#include <ardour/ardour.h>
-
-using std::string;
+#include "ardour/ardour.h"
 
 namespace ARDOUR {
 
@@ -54,17 +52,17 @@ class Location : public PBD::StatefulDestructible
 		IsStart = 0x80
 	};
 
-	Location (nframes_t sample_start,
-		  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),
 		_locked (false) { }
-	
+
 	Location () {
 		_start = 0;
 		_end = 0;
@@ -79,19 +77,19 @@ class Location : public PBD::StatefulDestructible
 	bool locked() const { return _locked; }
 	void lock() { _locked = true; changed (this); }
 	void unlock() { _locked = false; changed (this); }
-	
-	nframes_t start() const  { return _start; }
-	nframes_t end() const { return _end; }
-	nframes_t length() const { return _end - _start; }
 
-	int set_start (nframes_t s);
-	int set_end (nframes_t e);
-	int set (nframes_t start, nframes_t end);
+	nframes64_t start() const  { return _start; }
+	nframes64_t end() const { return _end; }
+	nframes64_t length() const { return _end - _start; }
 
-	int move_to (nframes_t pos);
+	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);
@@ -99,6 +97,7 @@ class Location : 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 () const { return _flags & IsAutoPunch; }
 	bool is_auto_loop () const { return _flags & IsAutoLoop; }
@@ -119,19 +118,19 @@ class Location : public PBD::StatefulDestructible
 	/* this is sent only when both start&end change at the same time */
 
 	sigc::signal<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;
-	nframes_t     _start;
-	nframes_t     _end;
+	std::string   _name;
+	nframes64_t   _start;
+	nframes64_t   _end;
 	Flags         _flags;
 	bool          _locked;
 
@@ -146,7 +145,7 @@ class Locations : public PBD::StatefulDestructible
 
 	Locations ();
 	~Locations ();
-	
+
 	const LocationList& list() { return locations; }
 
 	void add (Location *, bool make_current = false);
@@ -156,7 +155,7 @@ class Locations : 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;
@@ -164,17 +163,17 @@ class Locations : public PBD::StatefulDestructible
 	Location* end_location() const;
 	Location* start_location() const;
 
-	int next_available_name(string& result,string base);
+	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 (nframes_t, bool include_special_ranges = false);
-	Location *first_location_after (nframes_t, bool include_special_ranges = false);
+	Location *first_location_before (nframes64_t, bool include_special_ranges = false);
+	Location *first_location_after (nframes64_t, bool include_special_ranges = false);
 
-	nframes_t first_mark_before (nframes_t, bool include_special_ranges = false);
-	nframes_t first_mark_after (nframes_t, bool include_special_ranges = false);
+	nframes64_t first_mark_before (nframes64_t, bool include_special_ranges = false);
+	nframes64_t first_mark_after (nframes64_t, bool include_special_ranges = false);
 
 	void find_all_between (nframes64_t start, nframes64_t, LocationList&, Location::Flags);