From 81372b6ebebce8a330cab42b53e3bdee5e8a9ba8 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Mon, 2 Apr 2012 23:31:17 +0000
Subject: Remove some unused stuff.

git-svn-id: svn://localhost/ardour2/branches/3.0@11782 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/ardour/playlist.h |  8 --------
 libs/ardour/playlist.cc       | 30 ------------------------------
 2 files changed, 38 deletions(-)

(limited to 'libs/ardour')

diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 1f66310877..d315daacaf 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -152,7 +152,6 @@ public:
 
 	boost::shared_ptr<RegionList> regions_at (framepos_t frame);
 	uint32_t                   count_regions_at (framepos_t) const;
-	uint32_t                   count_joined_regions () const;
 	boost::shared_ptr<RegionList> regions_touched (framepos_t start, framepos_t end);
 	boost::shared_ptr<RegionList> regions_to_read (framepos_t start, framepos_t end);
 	uint32_t                   region_use_count (boost::shared_ptr<Region>) const;
@@ -221,8 +220,6 @@ public:
 	framepos_t find_next_top_layer_position (framepos_t) const;
 	uint32_t combine_ops() const { return _combine_ops; }
 
-	uint64_t highest_layering_index () const;
-
 	void set_layer (boost::shared_ptr<Region>, double);
 	
   protected:
@@ -269,8 +266,6 @@ public:
 	std::list< Evoral::RangeMove<framepos_t> > pending_range_moves;
 	/** Extra sections added to regions during trims */
 	std::list< Evoral::Range<framepos_t> >     pending_region_extensions;
-	bool             save_on_thaw;
-	std::string      last_save_reason;
 	uint32_t         in_set_state;
 	bool             in_undo;
 	bool             first_set_state;
@@ -285,7 +280,6 @@ public:
 	bool            _frozen;
 	uint32_t         subcnt;
 	PBD::ID         _orig_track_id;
-	bool             auto_partition;
 	uint32_t        _combine_ops;
 
 	void init (bool hide);
@@ -353,8 +347,6 @@ public:
 
 	void begin_undo ();
 	void end_undo ();
-	void unset_freeze_parent (Playlist*);
-	void unset_freeze_child (Playlist*);
 
 	void _split_region (boost::shared_ptr<Region>, framepos_t position);
 
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 885f592bf2..f7267e4545 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -3173,38 +3173,8 @@ Playlist::max_source_level () const
 	return lvl;
 }
 
-
-uint32_t
-Playlist::count_joined_regions () const
-{
-	RegionLock rlock (const_cast<Playlist *> (this));
-	uint32_t cnt = 0;
-
-	for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
-		if ((*i)->max_source_level() > 0) {
-			cnt++;
-		}
-	}
-
-	return cnt;
-}
-
 void
 Playlist::set_orig_track_id (const PBD::ID& id)
 {
 	_orig_track_id = id;
 }
-
-uint64_t
-Playlist::highest_layering_index () const
-{
-	RegionLock rlock (const_cast<Playlist *> (this));
-
-	uint64_t h = 0;
-	for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
-		h = max (h, (*i)->layering_index ());
-	}
-
-	return h;
-}
-
-- 
cgit v1.2.3