diff options
| author | Rob Haarsma <phaseIV@zonnet.nl> | 2004-12-10 16:24:56 +0300 |
|---|---|---|
| committer | Rob Haarsma <phaseIV@zonnet.nl> | 2004-12-10 16:24:56 +0300 |
| commit | 56242a497721889be5ddeffae04d33edfd0d5907 (patch) | |
| tree | 1da3ee2c3596628b60c4af8e21d2743e5ecff630 /source/blender/quicktime | |
| parent | 4b07e2c4d66a82dce447a71b20b3f88cd436f704 (diff) | |
Bugfix #1262 bugfix.
Path detection was wrong. Grrr, stupid windows paths.
Diffstat (limited to 'source/blender/quicktime')
| -rw-r--r-- | source/blender/quicktime/apple/quicktime_import.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c index 391da7a7ff7..5b10db39996 100644 --- a/source/blender/quicktime/apple/quicktime_import.c +++ b/source/blender/quicktime/apple/quicktime_import.c @@ -58,7 +58,7 @@ #define RECT_WIDTH(r) (r.right-r.left) #define RECT_HEIGHT(r) (r.bottom-r.top) -#define QTIME_DEBUG 0 +#define QTIME_DEBUG 1 void quicktime_init(void) @@ -113,17 +113,17 @@ char *get_valid_qtname(char *name) if(name[1] != ':') { char drive[2]; - if(name[0] != '/' || name[0] != '\\') { - BLI_dynstr_append(ds, Buffer); - BLI_dynstr_append(ds, "/"); - BLI_dynstr_append(ds, name); - } else { + if(name[0] == '/' || name[0] == '\\') { drive[0] = Buffer[0]; drive[1] = '\0'; BLI_dynstr_append(ds, drive); BLI_dynstr_append(ds, ":"); BLI_dynstr_append(ds, name); + } else { + BLI_dynstr_append(ds, Buffer); + BLI_dynstr_append(ds, "/"); + BLI_dynstr_append(ds, name); } } else { BLI_dynstr_append(ds, name); @@ -166,7 +166,7 @@ int anim_is_quicktime (char *name) BLI_testextensie(name, ".zip") || BLI_testextensie(name, ".mp3")) return 0; - if(QTIME_DEBUG) printf("qt: checking as movie\n"); + if(QTIME_DEBUG) printf("qt: checking as movie: %s\n", name); #ifdef __APPLE__ sprintf(theFullPath, "%s", name); @@ -176,6 +176,7 @@ int anim_is_quicktime (char *name) #else qtname = get_valid_qtname(name); sprintf(theFullPath, "%s", qtname); + if(QTIME_DEBUG) printf("qt: win checking as movie: %s\n", qtname); MEM_freeN(qtname); CopyCStringToPascal(theFullPath, dst); |