diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-27 20:54:14 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2015-12-29 02:27:18 +0300 |
commit | d1a26437ef81d9f5fcf8c2f3ff27ae22e7a970fa (patch) | |
tree | fe792043bb11637f5fe466ec83735947997974dc /source | |
parent | 6ca6d29e6b9a9f4f02ac48d8c77030f528ef4325 (diff) |
OS X: remove code for OS X <= 10.5, which is already not supported since 2 years.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_file/fsmenu.c | 51 | ||||
-rw-r--r-- | source/blender/quicktime/apple/qtkit_export.m | 4 | ||||
-rw-r--r-- | source/blender/quicktime/quicktime_export.h | 3 |
3 files changed, 1 insertions, 57 deletions
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c index 33e6990b179..e71c05d19c5 100644 --- a/source/blender/editors/space_file/fsmenu.c +++ b/source/blender/editors/space_file/fsmenu.c @@ -509,56 +509,6 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks) #else #ifdef __APPLE__ { -#if (MAC_OS_X_VERSION_MIN_REQUIRED <= 1050) - OSErr err = noErr; - int i; - const char *home; - - /* loop through all the OS X Volumes, and add them to the SYSTEM section */ - for (i = 1; err != nsvErr; i++) { - FSRef dir; - unsigned char path[FILE_MAX]; - - err = FSGetVolumeInfo(kFSInvalidVolumeRefNum, i, NULL, kFSVolInfoNone, NULL, NULL, &dir); - if (err != noErr) - continue; - - FSRefMakePath(&dir, path, FILE_MAX); - if (!STREQ((char *)path, "/home") && !STREQ((char *)path, "/net")) { - /* /net and /home are meaningless on OSX, home folders are stored in /Users */ - fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM, (char *)path, NULL, FS_INSERT_SORTED); - } - } - - /* As 10.4 doesn't provide proper API to retrieve the favorite places, - * assume they are the standard ones - * TODO : replace hardcoded paths with proper BKE_appdir_folder_id calls */ - home = getenv("HOME"); - if (read_bookmarks && home) { - BLI_snprintf(line, sizeof(line), "%s/", home); - fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, NULL, FS_INSERT_SORTED); - BLI_snprintf(line, sizeof(line), "%s/Desktop/", home); - if (BLI_exists(line)) { - fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, NULL, FS_INSERT_SORTED); - } - BLI_snprintf(line, sizeof(line), "%s/Documents/", home); - if (BLI_exists(line)) { - fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, NULL, FS_INSERT_SORTED); - } - BLI_snprintf(line, sizeof(line), "%s/Pictures/", home); - if (BLI_exists(line)) { - fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, NULL, FS_INSERT_SORTED); - } - BLI_snprintf(line, sizeof(line), "%s/Music/", home); - if (BLI_exists(line)) { - fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, NULL, FS_INSERT_SORTED); - } - BLI_snprintf(line, sizeof(line), "%s/Movies/", home); - if (BLI_exists(line)) { - fsmenu_insert_entry(fsmenu, FS_CATEGORY_SYSTEM_BOOKMARKS, line, NULL, FS_INSERT_SORTED); - } - } -#else /* OSX 10.6+ */ /* Get mounted volumes better method OSX 10.6 and higher, see: */ /*https://developer.apple.com/library/mac/#documentation/CoreFOundation/Reference/CFURLRef/Reference/reference.html*/ /* we get all volumes sorted including network and do not relay on user-defined finder visibility, less confusing */ @@ -622,7 +572,6 @@ void fsmenu_read_system(struct FSMenu *fsmenu, int read_bookmarks) CFRelease(pathesArray); CFRelease(list); } -#endif /* OSX 10.6+ */ } #else /* unix */ diff --git a/source/blender/quicktime/apple/qtkit_export.m b/source/blender/quicktime/apple/qtkit_export.m index 9bc4ec444bb..1ac3c58f888 100644 --- a/source/blender/quicktime/apple/qtkit_export.m +++ b/source/blender/quicktime/apple/qtkit_export.m @@ -62,10 +62,6 @@ #import <QTKit/QTKit.h> #include <AudioToolbox/AudioToolbox.h> -#if MAC_OS_X_VERSION_MIN_REQUIRED <= 1040 -#error OSX 10.5 minimum is needed for QTKit -#endif - #include "quicktime_import.h" #include "quicktime_export.h" diff --git a/source/blender/quicktime/quicktime_export.h b/source/blender/quicktime/quicktime_export.h index 41db83fb1c9..aaa3f5c9070 100644 --- a/source/blender/quicktime/quicktime_export.h +++ b/source/blender/quicktime/quicktime_export.h @@ -80,8 +80,7 @@ void free_qtcomponentdata(void); void makeqtstring(struct RenderData *rd, char *string, bool preview); //for playanim.c - -#if (MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 && __LP64__) +#ifdef __APPLE__ //Include the quicktime codec types constants that are missing in QTKitDefines.h enum { kRawCodecType = 'raw ', |