gallant/SDL2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge version 2.26.1

Browse source 
When I was not sure about a conflit, I used a conservative strategy:
I kept the code how it was already in version 3. But it may be wrong.
This commit is contained in:
kevin2 2023-02-12 21:13:55 +01:00
parent b305d9e3c0 f17058b562
commit 0769e488e3
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/audio/SDL_audiocvt.c
View file

@ -328,13 +328,14 @@ static int SDL_ResampleAudio(const int chans, const int inrate, const int outrat
*(dst++) = outsample; *(dst++) = outsample;
} }
outtime = ((ResampleFloatType)i) / ((ResampleFloatType)outrate); outtime = ((ResampleFloatType) i) / ((ResampleFloatType) outrate);
} }
return outframes * chans * sizeof(float); return outframes * chans * sizeof(float);
} }
static int SDL_ConvertAudio(SDL_AudioCVT *cvt) static int
SDL_ConvertAudio(SDL_AudioCVT *cvt)
{ {
/* !!! FIXME: (cvt) should be const; stack-copy it here. */ /* !!! FIXME: (cvt) should be const; stack-copy it here. */
/* !!! FIXME: (actually, we can't...len_cvt needs to be updated. Grr.) */ /* !!! FIXME: (actually, we can't...len_cvt needs to be updated. Grr.) */

10
src/video/cocoa/SDL_cocoaevents.m
View file

@ -322,8 +322,10 @@ static NSString *GetApplicationName(void)
return appName; return appName;
} }
static bool LoadMainMenuNibIfAvailable(void) static bool
LoadMainMenuNibIfAvailable(void)
{ {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
NSDictionary *infoDict; NSDictionary *infoDict;
NSString *mainNibFileName; NSString *mainNibFileName;
bool success = false; bool success = false;
@ -338,9 +340,13 @@ static bool LoadMainMenuNibIfAvailable(void)
} }
return success; return success;
#else
return false;
#endif
} }
static void CreateApplicationMenus(void) static void
CreateApplicationMenus(void)
{ {
NSString *appName; NSString *appName;
NSString *title; NSString *title;