Bugfix #17524
authorDiego Borghetti <bdiego@gmail.com>
Thu, 6 Nov 2008 18:49:53 +0000 (18:49 +0000)
committerDiego Borghetti <bdiego@gmail.com>
Thu, 6 Nov 2008 18:49:53 +0000 (18:49 +0000)
 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 ;)

source/blender/src/seqaudio.c

index 9b4e33616255fdab9bdfe3bad2d733b2b316da29..0bc406743506024f9da5a78ac15e0ba5032d7913 100644 (file)
@@ -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);