projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix uninitialised variable causing garbage output from panners in some cases.
[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 f225db9c45e9b9e333f11321eaf406897c29a056..4ba820d7160ba2bf0c816655b87572992bf6937b 100644
(file)
--- a/
libs/ardour/audio_playlist_source.cc
+++ b/
libs/ardour/audio_playlist_source.cc
@@
-27,18
+27,13
@@
#include <glibmm/miscutils.h>
#include "pbd/error.h"
#include <glibmm/miscutils.h>
#include "pbd/error.h"
-#include "pbd/convert.h"
-#include "pbd/enumwriter.h"
#include "ardour/audioplaylist.h"
#include "ardour/audio_playlist_source.h"
#include "ardour/audioregion.h"
#include "ardour/audioplaylist.h"
#include "ardour/audio_playlist_source.h"
#include "ardour/audioregion.h"
-#include "ardour/debug.h"
#include "ardour/filename_extensions.h"
#include "ardour/session.h"
#include "ardour/session_directory.h"
#include "ardour/filename_extensions.h"
#include "ardour/session.h"
#include "ardour/session_directory.h"
-#include "ardour/session_playlists.h"
-#include "ardour/source_factory.h"
#include "i18n.h"
#include "i18n.h"
@@
-46,11
+41,11
@@
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace ARDOUR;
using namespace PBD;
-AudioPlaylistSource::AudioPlaylistSource (Session& s, const ID& orig, const std::string& name, boost::shared_ptr<AudioPlaylist> p,
+AudioPlaylistSource::AudioPlaylistSource (Session& s, const ID& orig, const std::string& name, boost::shared_ptr<AudioPlaylist> p,
uint32_t chn, frameoffset_t begin, framecnt_t len, Source::Flag flags)
: Source (s, DataType::AUDIO, name)
uint32_t chn, frameoffset_t begin, framecnt_t len, Source::Flag flags)
: Source (s, DataType::AUDIO, name)
- , AudioSource (s, name)
, PlaylistSource (s, orig, name, p, DataType::AUDIO, begin, len, flags)
, PlaylistSource (s, orig, name, p, DataType::AUDIO, begin, len, flags)
+ , AudioSource (s, name)
, _playlist_channel (chn)
{
AudioSource::_length = len;
, _playlist_channel (chn)
{
AudioSource::_length = len;
@@
-59,8
+54,8
@@
AudioPlaylistSource::AudioPlaylistSource (Session& s, const ID& orig, const std:
AudioPlaylistSource::AudioPlaylistSource (Session& s, const XMLNode& node)
: Source (s, node)
AudioPlaylistSource::AudioPlaylistSource (Session& s, const XMLNode& node)
: Source (s, node)
- , AudioSource (s, node)
, PlaylistSource (s, node)
, PlaylistSource (s, node)
+ , AudioSource (s, node)
{
/* PlaylistSources are never writable, renameable, removable or destructive */
_flags = Flag (_flags & ~(Writable|CanRename|Removable|RemovableIfEmpty|RemoveAtDestroy|Destructive));
{
/* PlaylistSources are never writable, renameable, removable or destructive */
_flags = Flag (_flags & ~(Writable|CanRename|Removable|RemovableIfEmpty|RemoveAtDestroy|Destructive));
@@
-68,10
+63,12
@@
AudioPlaylistSource::AudioPlaylistSource (Session& s, const XMLNode& node)
/* ancestors have already called ::set_state() in their XML-based
constructors.
*/
/* ancestors have already called ::set_state() in their XML-based
constructors.
*/
-
+
if (set_state (node, Stateful::loading_state_version, false)) {
throw failed_constructor ();
}
if (set_state (node, Stateful::loading_state_version, false)) {
throw failed_constructor ();
}
+
+ AudioSource::_length = _playlist_length;
}
AudioPlaylistSource::~AudioPlaylistSource ()
}
AudioPlaylistSource::~AudioPlaylistSource ()
@@
-94,26
+91,26
@@
AudioPlaylistSource::get_state ()
return node;
}
return node;
}
-
int
int
-AudioPlaylistSource::set_state (const XMLNode& node, int version)
+AudioPlaylistSource::set_state (const XMLNode& node, int version)
{
return set_state (node, version, true);
}
int
{
return set_state (node, version, true);
}
int
-AudioPlaylistSource::set_state (const XMLNode& node, int version, bool with_descendants)
+AudioPlaylistSource::set_state (const XMLNode& node, int version, bool with_descendants)
{
if (with_descendants) {
{
if (with_descendants) {
- if (Source::set_state (node, version) ||
-
Audio
Source::set_state (node, version) ||
-
Playlist
Source::set_state (node, version)) {
+ if (Source::set_state (node, version) ||
+
Playlist
Source::set_state (node, version) ||
+
Audio
Source::set_state (node, version)) {
return -1;
}
}
const XMLProperty* prop;
pair<framepos_t,framepos_t> extent = _playlist->get_extent();
return -1;
}
}
const XMLProperty* prop;
pair<framepos_t,framepos_t> extent = _playlist->get_extent();
+
AudioSource::_length = extent.second - extent.first;
if ((prop = node.property (X_("channel"))) == 0) {
AudioSource::_length = extent.second - extent.first;
if ((prop = node.property (X_("channel"))) == 0) {
@@
-127,14
+124,13
@@
AudioPlaylistSource::set_state (const XMLNode& node, int version, bool with_desc
return 0;
}
return 0;
}
-framecnt_t
+framecnt_t
AudioPlaylistSource::read_unlocked (Sample* dst, framepos_t start, framecnt_t cnt) const
{
boost::shared_ptr<Sample> sbuf;
boost::shared_ptr<gain_t> gbuf;
framecnt_t to_read;
framecnt_t to_zero;
AudioPlaylistSource::read_unlocked (Sample* dst, framepos_t start, framecnt_t cnt) const
{
boost::shared_ptr<Sample> sbuf;
boost::shared_ptr<gain_t> gbuf;
framecnt_t to_read;
framecnt_t to_zero;
- pair<framepos_t,framepos_t> extent = _playlist->get_extent();
/* we must be careful not to read beyond the end of our "section" of
* the playlist, because otherwise we may read data that exists, but
/* we must be careful not to read beyond the end of our "section" of
* the playlist, because otherwise we may read data that exists, but
@@
-149,7
+145,7
@@
AudioPlaylistSource::read_unlocked (Sample* dst, framepos_t start, framecnt_t cn
to_zero = 0;
}
to_zero = 0;
}
- {
+ {
/* Don't need to hold the lock for the actual read, and
actually, we cannot, but we do want to interlock
with any changes to the list of buffers caused
/* Don't need to hold the lock for the actual read, and
actually, we cannot, but we do want to interlock
with any changes to the list of buffers caused
@@
-169,8
+165,8
@@
AudioPlaylistSource::read_unlocked (Sample* dst, framepos_t start, framecnt_t cn
return cnt;
}
return cnt;
}
-framecnt_t
-AudioPlaylistSource::write_unlocked (Sample *
src, framecnt_t cnt)
+framecnt_t
+AudioPlaylistSource::write_unlocked (Sample *
, framecnt_t)
{
fatal << string_compose (_("programming error: %1"), "AudioPlaylistSource::write() called - should be impossible") << endmsg;
/*NOTREACHED*/
{
fatal << string_compose (_("programming error: %1"), "AudioPlaylistSource::write() called - should be impossible") << endmsg;
/*NOTREACHED*/
@@
-226,3
+222,4
@@
AudioPlaylistSource::peak_path (string /*audio_path_IGNORED*/)
return _peak_path;
}
return _peak_path;
}
+