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
path: root/source
diff options
context:
space:
mode:
authorDiego Borghetti <bdiego@gmail.com>2008-11-06 21:49:53 +0300
committerDiego Borghetti <bdiego@gmail.com>2008-11-06 21:49:53 +0300
commit7b15e8cd64418bbd4999446b4e18fe7a3a879521 (patch)
tree4c1e16f0cc9869612a54f2e562309eb75a9d43ee /source
parent87538be426221e687687acd68385ce85be206b53 (diff)
Bugfix #17524
The problem is that the audio_fill_seq function try to load the hd file if the sequence don't have it, but it join the two string (directory path + file path) without the / (Linux... \ Windows), so the result is a wrong path. I change the the strncpy and strncat function for a BLI_join_dirfile (like the reload_sequence_new_file) and all work fine now. Also note that the "them go" that Luca report is (or what happen here) the ctrl+z function, and now both case work fine here. (interesting.. date from Feb 05.. 2006 ;)
Diffstat (limited to 'source')
-rw-r--r--source/blender/src/seqaudio.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/src/seqaudio.c b/source/blender/src/seqaudio.c
index 9b4e3361625..0bc40674350 100644
--- a/source/blender/src/seqaudio.c
+++ b/source/blender/src/seqaudio.c
@@ -398,11 +398,7 @@ static void audio_fill_seq(Sequence * seq, void * mixdown,
if (!seq->hdaudio) {
char name[FILE_MAXDIR+FILE_MAXFILE];
- strncpy(name, seq->strip->dir,
- FILE_MAXDIR-1);
- strncat(name,
- seq->strip->stripdata->name,
- FILE_MAXFILE-1);
+ BLI_join_dirfile(name, seq->strip->dir, seq->strip->stripdata->name);
BLI_convertstringcode(name, G.sce);
seq->hdaudio= sound_open_hdaudio(name);