Merge branch 'master' of https://github.com/olive-editor/olive
This commit is contained in:
@@ -8,9 +8,6 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
# FFmpeg 4.x
|
||||
sudo add-apt-repository ppa:jonathonf/ffmpeg-4 -y
|
||||
|
||||
# OpenImageIO
|
||||
sudo add-apt-repository ppa:olive-editor/openimageio -y
|
||||
|
||||
# OpenColorIO
|
||||
sudo add-apt-repository ppa:olive-editor/opencolorio -y
|
||||
|
||||
|
||||
@@ -66,13 +66,15 @@ void AudioBackend::ThreadCompletedCache(NodeDependency dep, NodeValueTable data,
|
||||
int out_point = offset + length;
|
||||
|
||||
QFile f(CachePathName());
|
||||
if (f.open(QFile::WriteOnly | QFile::Append)) {
|
||||
if (f.open(QFile::ReadWrite)) {
|
||||
|
||||
if (f.size() < out_point) {
|
||||
f.resize(out_point);
|
||||
if (f.size() < out_point && !f.resize(out_point)) {
|
||||
qCritical() << "Failed to resize file" << CachePathName();
|
||||
}
|
||||
|
||||
f.seek(offset);
|
||||
if (!f.seek(offset)) {
|
||||
qCritical() << "Failed to seek file" << CachePathName();
|
||||
}
|
||||
|
||||
// Replace data with this data
|
||||
int copy_length = qMin(length, cached_samples.size());
|
||||
|
||||
Reference in New Issue
Block a user