Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Mueller <nexyon@gmail.com>2013-06-20 11:46:40 +0400
committerJoerg Mueller <nexyon@gmail.com>2013-06-20 11:46:40 +0400
commite5944d23edd3efc88d1f60e4cee40eff8e21abfd (patch)
treea497d5fa3b9ea823e9b42149a588d27b2f5bb1bb /intern/audaspace
parent972c01ac0cfa90d3414625a6ef248c3ab66d1842 (diff)
Fix for [#35230] CPU freeze at playback after cutting/deleting/duplicating audio strip
Diffstat (limited to 'intern/audaspace')
-rw-r--r--intern/audaspace/intern/AUD_Sequencer.cpp2
-rw-r--r--intern/audaspace/intern/AUD_SequencerReader.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/audaspace/intern/AUD_Sequencer.cpp b/intern/audaspace/intern/AUD_Sequencer.cpp
index 58e8f682714..c59c56a4479 100644
--- a/intern/audaspace/intern/AUD_Sequencer.cpp
+++ b/intern/audaspace/intern/AUD_Sequencer.cpp
@@ -161,7 +161,7 @@ boost::shared_ptr<AUD_SequencerEntry> AUD_Sequencer::add(boost::shared_ptr<AUD_I
boost::shared_ptr<AUD_SequencerEntry> entry = boost::shared_ptr<AUD_SequencerEntry>(new AUD_SequencerEntry(sound, begin, end, skip, m_id++));
- m_entries.push_front(entry);
+ m_entries.push_back(entry);
m_entry_status++;
return entry;
diff --git a/intern/audaspace/intern/AUD_SequencerReader.cpp b/intern/audaspace/intern/AUD_SequencerReader.cpp
index d5e14590df5..aef93cd3896 100644
--- a/intern/audaspace/intern/AUD_SequencerReader.cpp
+++ b/intern/audaspace/intern/AUD_SequencerReader.cpp
@@ -112,7 +112,7 @@ void AUD_SequencerReader::read(int& length, bool& eos, sample_t* buffer)
try
{
handle = boost::shared_ptr<AUD_SequencerHandle>(new AUD_SequencerHandle(entry, m_device));
- handles.push_front(handle);
+ handles.push_back(handle);
}
catch(AUD_Exception&)
{
@@ -143,7 +143,7 @@ void AUD_SequencerReader::read(int& length, bool& eos, sample_t* buffer)
try
{
handle = boost::shared_ptr<AUD_SequencerHandle>(new AUD_SequencerHandle(*eit, m_device));
- handles.push_front(handle);
+ handles.push_back(handle);
}
catch(AUD_Exception&)
{