mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-05-23 13:09:11 +00:00
Rename SDL_GetPath to SDL_GetUserFolder
The documentation has been edited accordingly, and certain parts have been clarified.
This commit is contained in:
parent
71099149b8
commit
d4a867a256
17 changed files with 27 additions and 22 deletions
|
@ -159,11 +159,11 @@ extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app);
|
||||||
* | SAVEDGAMES | Vista+ | | | | | |
|
* | SAVEDGAMES | Vista+ | | | | | |
|
||||||
* | SCREENSHOTS | Vista+ | | | | | |
|
* | SCREENSHOTS | Vista+ | | | | | |
|
||||||
* | TEMPLATES | X | X | | X | | |
|
* | TEMPLATES | X | X | | X | | |
|
||||||
* | VIDEOS | X | X | | X | | |
|
* | VIDEOS | X | X* | | X | | |
|
||||||
*
|
*
|
||||||
* Note that on macOS/iOS, the Videos folder is called "Movies".
|
* * Note that on macOS/iOS, the Videos folder is called "Movies".
|
||||||
*
|
*
|
||||||
* \sa SDL_GetPath
|
* \sa SDL_GetUserFolder
|
||||||
*/
|
*/
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
|
@ -206,13 +206,18 @@ typedef enum
|
||||||
} SDL_Folder;
|
} SDL_Folder;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Finds the most suitable OS-provided folder for @p folder, and returns its
|
* Finds the most suitable user folder for @p purpose, and returns its
|
||||||
* path in OS-specific notation.
|
* path in OS-specific notation.
|
||||||
*
|
*
|
||||||
* Many OSes provide certain standard folders for certain purposes, such as
|
* Many OSes provide certain standard folders for certain purposes, such as
|
||||||
* storing pictures, music or videos for a certain user. This function gives
|
* storing pictures, music or videos for a certain user. This function gives
|
||||||
* the path for many of those special locations.
|
* the path for many of those special locations.
|
||||||
*
|
*
|
||||||
|
* This function is specifically for _user_ folders, which are meant for the
|
||||||
|
* user to access and manage. For application-specific folders, meant to hold
|
||||||
|
* data for the application to manage, see SDL_GetBasePath() and
|
||||||
|
* SDL_GetPrefPath().
|
||||||
|
*
|
||||||
* Note that the function is expensive, and should be called once at the
|
* Note that the function is expensive, and should be called once at the
|
||||||
* beginning of the execution and kept for as long as needed.
|
* beginning of the execution and kept for as long as needed.
|
||||||
*
|
*
|
||||||
|
@ -229,7 +234,7 @@ typedef enum
|
||||||
*
|
*
|
||||||
* \sa SDL_Folder
|
* \sa SDL_Folder
|
||||||
*/
|
*/
|
||||||
extern DECLSPEC char *SDLCALL SDL_GetPath(SDL_Folder folder);
|
extern DECLSPEC char *SDLCALL SDL_GetUserFolder(SDL_Folder folder);
|
||||||
|
|
||||||
/* Ends C function definitions when using C++ */
|
/* Ends C function definitions when using C++ */
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
|
@ -280,7 +280,7 @@ SDL3_0.0.0 {
|
||||||
SDL_GetNumTouchFingers;
|
SDL_GetNumTouchFingers;
|
||||||
SDL_GetNumVideoDrivers;
|
SDL_GetNumVideoDrivers;
|
||||||
SDL_GetOriginalMemoryFunctions;
|
SDL_GetOriginalMemoryFunctions;
|
||||||
SDL_GetPath;
|
SDL_GetUserFolder;
|
||||||
SDL_GetPerformanceCounter;
|
SDL_GetPerformanceCounter;
|
||||||
SDL_GetPerformanceFrequency;
|
SDL_GetPerformanceFrequency;
|
||||||
SDL_GetPixelFormatEnumForMasks;
|
SDL_GetPixelFormatEnumForMasks;
|
||||||
|
|
|
@ -304,7 +304,7 @@
|
||||||
#define SDL_GetNumTouchFingers SDL_GetNumTouchFingers_REAL
|
#define SDL_GetNumTouchFingers SDL_GetNumTouchFingers_REAL
|
||||||
#define SDL_GetNumVideoDrivers SDL_GetNumVideoDrivers_REAL
|
#define SDL_GetNumVideoDrivers SDL_GetNumVideoDrivers_REAL
|
||||||
#define SDL_GetOriginalMemoryFunctions SDL_GetOriginalMemoryFunctions_REAL
|
#define SDL_GetOriginalMemoryFunctions SDL_GetOriginalMemoryFunctions_REAL
|
||||||
#define SDL_GetPath SDL_GetPath_REAL
|
#define SDL_GetUserFolder SDL_GetUserFolder_REAL
|
||||||
#define SDL_GetPerformanceCounter SDL_GetPerformanceCounter_REAL
|
#define SDL_GetPerformanceCounter SDL_GetPerformanceCounter_REAL
|
||||||
#define SDL_GetPerformanceFrequency SDL_GetPerformanceFrequency_REAL
|
#define SDL_GetPerformanceFrequency SDL_GetPerformanceFrequency_REAL
|
||||||
#define SDL_GetPixelFormatEnumForMasks SDL_GetPixelFormatEnumForMasks_REAL
|
#define SDL_GetPixelFormatEnumForMasks SDL_GetPixelFormatEnumForMasks_REAL
|
||||||
|
|
|
@ -379,7 +379,7 @@ SDL_DYNAPI_PROC(int,SDL_GetNumTouchDevices,(void),(),return)
|
||||||
SDL_DYNAPI_PROC(int,SDL_GetNumTouchFingers,(SDL_TouchID a),(a),return)
|
SDL_DYNAPI_PROC(int,SDL_GetNumTouchFingers,(SDL_TouchID a),(a),return)
|
||||||
SDL_DYNAPI_PROC(int,SDL_GetNumVideoDrivers,(void),(),return)
|
SDL_DYNAPI_PROC(int,SDL_GetNumVideoDrivers,(void),(),return)
|
||||||
SDL_DYNAPI_PROC(void,SDL_GetOriginalMemoryFunctions,(SDL_malloc_func *a, SDL_calloc_func *b, SDL_realloc_func *c, SDL_free_func *d),(a,b,c,d),)
|
SDL_DYNAPI_PROC(void,SDL_GetOriginalMemoryFunctions,(SDL_malloc_func *a, SDL_calloc_func *b, SDL_realloc_func *c, SDL_free_func *d),(a,b,c,d),)
|
||||||
SDL_DYNAPI_PROC(char*,SDL_GetPath,(SDL_Folder a),(a),return)
|
SDL_DYNAPI_PROC(char*,SDL_GetUserFolder,(SDL_Folder a),(a),return)
|
||||||
SDL_DYNAPI_PROC(Uint64,SDL_GetPerformanceCounter,(void),(),return)
|
SDL_DYNAPI_PROC(Uint64,SDL_GetPerformanceCounter,(void),(),return)
|
||||||
SDL_DYNAPI_PROC(Uint64,SDL_GetPerformanceFrequency,(void),(),return)
|
SDL_DYNAPI_PROC(Uint64,SDL_GetPerformanceFrequency,(void),(),return)
|
||||||
SDL_DYNAPI_PROC(Uint32,SDL_GetPixelFormatEnumForMasks,(int a, Uint32 b, Uint32 c, Uint32 d, Uint32 e),(a,b,c,d,e),return)
|
SDL_DYNAPI_PROC(Uint32,SDL_GetPixelFormatEnumForMasks,(int a, Uint32 b, Uint32 c, Uint32 d, Uint32 e),(a,b,c,d,e),return)
|
||||||
|
|
|
@ -50,7 +50,7 @@ char *SDL_GetPrefPath(const char *org, const char *app)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
/* TODO: see https://developer.android.com/reference/android/os/Environment#lfields
|
/* TODO: see https://developer.android.com/reference/android/os/Environment#lfields
|
||||||
and https://stackoverflow.com/questions/39332085/get-path-to-pictures-directory */
|
and https://stackoverflow.com/questions/39332085/get-path-to-pictures-directory */
|
||||||
|
|
|
@ -130,7 +130,7 @@ char *SDL_GetPrefPath(const char *org, const char *app)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
@autoreleasepool {
|
@autoreleasepool {
|
||||||
#if TARGET_OS_TV
|
#if TARGET_OS_TV
|
||||||
|
|
|
@ -37,7 +37,7 @@ char *SDL_GetPrefPath(const char *org, const char *app)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
SDL_Unsupported();
|
SDL_Unsupported();
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -83,7 +83,7 @@ char *SDL_GetPrefPath(const char *org, const char *app)
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
const char *home = NULL;
|
const char *home = NULL;
|
||||||
char *retval;
|
char *retval;
|
||||||
|
|
|
@ -97,7 +97,7 @@ char *SDL_GetPrefPath(const char *org, const char *app)
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
const char *home = NULL;
|
const char *home = NULL;
|
||||||
char *retval;
|
char *retval;
|
||||||
|
|
|
@ -60,7 +60,7 @@ char *SDL_GetPrefPath(const char *org, const char *app)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO */
|
/* TODO */
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
SDL_Unsupported();
|
SDL_Unsupported();
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -103,7 +103,7 @@ char *SDL_GetPrefPath(const char *org, const char *app)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO */
|
/* TODO */
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
SDL_Unsupported();
|
SDL_Unsupported();
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -70,7 +70,7 @@ char *SDL_GetPrefPath(const char *org, const char *app)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO */
|
/* TODO */
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
SDL_Unsupported();
|
SDL_Unsupported();
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -200,7 +200,7 @@ char *SDL_GetPrefPath(const char *org, const char *app)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO */
|
/* TODO */
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
SDL_Unsupported();
|
SDL_Unsupported();
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -517,7 +517,7 @@ static char *xdg_user_dir_lookup (const char *type)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
const char *param = NULL;
|
const char *param = NULL;
|
||||||
char *retval;
|
char *retval;
|
||||||
|
|
|
@ -84,7 +84,7 @@ char *SDL_GetPrefPath(const char *org, const char *app)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO */
|
/* TODO */
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
SDL_Unsupported();
|
SDL_Unsupported();
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -177,7 +177,7 @@ char *SDL_GetPrefPath(const char *org, const char *app)
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
typedef HRESULT (WINAPI *pfnSHGetKnownFolderPath)(REFGUID /* REFKNOWNFOLDERID */, DWORD, HANDLE, PWSTR*);
|
typedef HRESULT (WINAPI *pfnSHGetKnownFolderPath)(REFGUID /* REFKNOWNFOLDERID */, DWORD, HANDLE, PWSTR*);
|
||||||
HMODULE lib = LoadLibrary(L"Shell32.dll");
|
HMODULE lib = LoadLibrary(L"Shell32.dll");
|
||||||
|
@ -346,7 +346,7 @@ char *SDL_GetPrefPath(const char *org, const char *app)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
SDL_Unsupported();
|
SDL_Unsupported();
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
|
@ -233,7 +233,7 @@ SDL_GetPrefPath(const char *org, const char *app)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO */
|
/* TODO */
|
||||||
char *SDL_GetPath(SDL_Folder folder)
|
char *SDL_GetUserFolder(SDL_Folder folder)
|
||||||
{
|
{
|
||||||
SDL_Unsupported();
|
SDL_Unsupported();
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue