Merge version 2.26.1
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:
commit
0769e488e3
|
@ -328,13 +328,14 @@ static int SDL_ResampleAudio(const int chans, const int inrate, const int outrat
|
|||
*(dst++) = outsample;
|
||||
}
|
||||
|
||||
outtime = ((ResampleFloatType)i) / ((ResampleFloatType)outrate);
|
||||
outtime = ((ResampleFloatType) i) / ((ResampleFloatType) outrate);
|
||||
}
|
||||
|
||||
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: (actually, we can't...len_cvt needs to be updated. Grr.) */
|
||||
|
|
|
@ -322,8 +322,10 @@ static NSString *GetApplicationName(void)
|
|||
return appName;
|
||||
}
|
||||
|
||||
static bool LoadMainMenuNibIfAvailable(void)
|
||||
static bool
|
||||
LoadMainMenuNibIfAvailable(void)
|
||||
{
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
|
||||
NSDictionary *infoDict;
|
||||
NSString *mainNibFileName;
|
||||
bool success = false;
|
||||
|
@ -338,9 +340,13 @@ static bool LoadMainMenuNibIfAvailable(void)
|
|||
}
|
||||
|
||||
return success;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
static void CreateApplicationMenus(void)
|
||||
static void
|
||||
CreateApplicationMenus(void)
|
||||
{
|
||||
NSString *appName;
|
||||
NSString *title;
|
||||
|
|
Loading…
Reference in a new issue