X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_playlist_source.cc;h=f77c8b526fe1280582f464495f742e7f4a3107fb;hb=d7a16786fc2bfa79d33dac676013fb34132d6fba;hp=5e8dc09d452a1c5a02d58e837438465fa0555111;hpb=55a10480945f2a41fe6cfda2173bed12d3d5bc89;p=ardour.git

diff --git a/libs/ardour/audio_playlist_source.cc b/libs/ardour/audio_playlist_source.cc
index 5e8dc09d45..f77c8b526f 100644
--- a/libs/ardour/audio_playlist_source.cc
+++ b/libs/ardour/audio_playlist_source.cc
@@ -35,7 +35,7 @@
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -108,7 +108,7 @@ AudioPlaylistSource::set_state (const XMLNode& node, int version, bool with_desc
 		}
 	}
 
-	const XMLProperty* prop;
+	XMLProperty const * prop;
 	pair<framepos_t,framepos_t> extent = _playlist->get_extent();
 
 	AudioSource::_length = extent.second - extent.first;
@@ -169,7 +169,7 @@ framecnt_t
 AudioPlaylistSource::write_unlocked (Sample *, framecnt_t)
 {
 	fatal << string_compose (_("programming error: %1"), "AudioPlaylistSource::write() called - should be impossible") << endmsg;
-	/*NOTREACHED*/
+	abort(); /*NOTREACHED*/
 	return 0;
 }
 
@@ -188,7 +188,7 @@ AudioPlaylistSource::n_channels () const
 		return 1;
 	}
 
-	boost::shared_ptr<Region> r = _playlist->region_list().front ();
+	boost::shared_ptr<Region> r = _playlist->region_list_property().front ();
 	boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (r);
 
 	return ar->audio_source()->n_channels ();
@@ -203,7 +203,7 @@ AudioPlaylistSource::sample_rate () const
 		_session.frame_rate ();
 	}
 
-	boost::shared_ptr<Region> r = _playlist->region_list().front ();
+	boost::shared_ptr<Region> r = _playlist->region_list_property().front ();
 	boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (r);
 
 	return ar->audio_source()->sample_rate ();
@@ -217,7 +217,7 @@ AudioPlaylistSource::setup_peakfile ()
 }
 
 string
-AudioPlaylistSource::peak_path (string /*audio_path_IGNORED*/)
+AudioPlaylistSource::construct_peak_filepath (const string& /*audio_path_*/, const bool /* in_session */, const bool /* old_peak_name */) const
 {
 	return _peak_path;
 }