projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix potential deadlock on session-load
[ardour.git]
/
libs
/
ardour
/
audio_playlist_source.cc
diff --git
a/libs/ardour/audio_playlist_source.cc
b/libs/ardour/audio_playlist_source.cc
index 9415065b8f4a404de0f6b0aa607c5dde821e80e7..f77c8b526fe1280582f464495f742e7f4a3107fb 100644
(file)
--- 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 "ardour/session.h"
#include "ardour/session_directory.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace ARDOUR;
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;
pair<framepos_t,framepos_t> extent = _playlist->get_extent();
AudioSource::_length = extent.second - extent.first;
@@
-188,7
+188,7
@@
AudioPlaylistSource::n_channels () const
return 1;
}
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 ();
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 ();
}
_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 ();
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
}
string
-AudioPlaylistSource::
generate_peak_path (const 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;
}
{
return _peak_path;
}