Merged with trunk R861

Possible new bugs - not very thoroughly tested, but at least functional at first glance


git-svn-id: svn://localhost/ardour2/branches/midi@870 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 0 insertions, 46 deletions

diff --git a/libs/ardour/playlist_factory.cc b/libs/ardour/playlist_factory.cc
index 7c7060dae8..05d9c76f7a 100644
--- a/libs/ardour/playlist_factory.cc
+++ b/libs/ardour/playlist_factory.cc
@@ -20,60 +20,14 @@
 
 #include <pbd/error.h>
 
-#include <ardour/session.h>
-
 #include <ardour/playlist.h>
 #include <ardour/audioplaylist.h>
 
-#include <ardour/region_factory.h>
-#include <ardour/region.h>
-#include <ardour/audioregion.h>
-
 #include "i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 
-Region*
-ARDOUR::createRegion (const Region& region, jack_nframes_t start, 
-		      jack_nframes_t length, std::string name, 
-		      layer_t layer, Region::Flag flags)
-{
-	const AudioRegion* ar;
-	
-	if ((ar = dynamic_cast<const AudioRegion*>(&region)) != 0) {
-		AudioRegion* ret;
-		ret = new AudioRegion (*ar, start, length, name, layer, flags);
-		return ret;
-	} else {
-		fatal << _("programming error: Playlist::createRegion called with unknown Region type")
-		      << endmsg;
-		/*NOTREACHED*/
-		return 0;
-	}
-}
-
-Region*
-ARDOUR::createRegion (const Region& region)
-{
-	const AudioRegion* ar;
-	
-	if ((ar = dynamic_cast<const AudioRegion*>(&region)) != 0) {
-		return new AudioRegion (*ar);
-	} else {
-		fatal << _("programming error: Playlist::createRegion called with unknown Region type")
-		      << endmsg;
-		/*NOTREACHED*/
-		return 0;
-	}
-}
-
-Region*
-ARDOUR::createRegion (Session& session, XMLNode& node, bool yn)
-{
-	return session.XMLRegionFactory (node, yn);
-}
-	
 Playlist*
 Playlist::copyPlaylist (const Playlist& playlist, jack_nframes_t start, jack_nframes_t length,
 			string name, bool result_is_hidden)