Fixed a bunch of compile warnings on Mac OS X
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403191
This commit is contained in:
parent
771abd3620
commit
cd839b4bd3
7 changed files with 8 additions and 4 deletions
|
@ -1622,7 +1622,6 @@ int
|
||||||
SDL_BuildWindowedSinc(SDL_AudioCVT * cvt, SDL_AudioFormat format,
|
SDL_BuildWindowedSinc(SDL_AudioCVT * cvt, SDL_AudioFormat format,
|
||||||
unsigned int m)
|
unsigned int m)
|
||||||
{
|
{
|
||||||
float fScale; /* scale factor for fixed point */
|
|
||||||
float *fSinc; /* floating point sinc buffer, to be converted to fixed point */
|
float *fSinc; /* floating point sinc buffer, to be converted to fixed point */
|
||||||
float fc; /* cutoff frequency */
|
float fc; /* cutoff frequency */
|
||||||
float two_pi_fc, two_pi_over_m, four_pi_over_m, m_over_two;
|
float two_pi_fc, two_pi_over_m, four_pi_over_m, m_over_two;
|
||||||
|
@ -1708,6 +1707,8 @@ SDL_BuildWindowedSinc(SDL_AudioCVT * cvt, SDL_AudioFormat format,
|
||||||
/* Clean up */
|
/* Clean up */
|
||||||
#undef convert_fixed
|
#undef convert_fixed
|
||||||
SDL_stack_free(fSinc);
|
SDL_stack_free(fSinc);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This is used to reduce the resampling ratio */
|
/* This is used to reduce the resampling ratio */
|
||||||
|
|
|
@ -418,7 +418,6 @@ prepare_audiounit(_THIS, const char *devname, int iscapture,
|
||||||
AURenderCallbackStruct callback;
|
AURenderCallbackStruct callback;
|
||||||
ComponentDescription desc;
|
ComponentDescription desc;
|
||||||
Component comp = NULL;
|
Component comp = NULL;
|
||||||
int use_system_device = 0;
|
|
||||||
UInt32 enableIO = 0;
|
UInt32 enableIO = 0;
|
||||||
const AudioUnitElement output_bus = 0;
|
const AudioUnitElement output_bus = 0;
|
||||||
const AudioUnitElement input_bus = 1;
|
const AudioUnitElement input_bus = 1;
|
||||||
|
|
|
@ -89,6 +89,7 @@ mix_buffer(SDL_AudioDevice * audio, UInt8 * buffer)
|
||||||
DecrementAtomic((SInt32 *) & need_to_mix);
|
DecrementAtomic((SInt32 *) & need_to_mix);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef __MACOSX__
|
||||||
static void
|
static void
|
||||||
SNDMGR_LockDevice(_THIS)
|
SNDMGR_LockDevice(_THIS)
|
||||||
{
|
{
|
||||||
|
@ -114,6 +115,7 @@ SNDMGR_UnlockDevice(_THIS)
|
||||||
mix_buffer(this, buffer[fill_me]);
|
mix_buffer(this, buffer[fill_me]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif // __MACOSX__
|
||||||
|
|
||||||
static void
|
static void
|
||||||
callBackProc(SndChannel * chan, SndCommand * cmd_passed)
|
callBackProc(SndChannel * chan, SndCommand * cmd_passed)
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include "SDL_config.h"
|
#include "SDL_config.h"
|
||||||
|
|
||||||
#include "SDL_cocoavideo.h"
|
#include "SDL_cocoavideo.h"
|
||||||
|
#include "../../events/SDL_events_c.h"
|
||||||
|
|
||||||
/* setAppleMenu disappeared from the headers in 10.4 */
|
/* setAppleMenu disappeared from the headers in 10.4 */
|
||||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
|
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
|
|
||||||
#if SDL_VIDEO_OPENGL_CGL
|
#if SDL_VIDEO_OPENGL_CGL
|
||||||
#include <OpenGL/CGLTypes.h>
|
#include <OpenGL/CGLTypes.h>
|
||||||
|
#include <OpenGL/OpenGL.h>
|
||||||
|
|
||||||
#include "SDL_loadso.h"
|
#include "SDL_loadso.h"
|
||||||
#include "SDL_opengl.h"
|
#include "SDL_opengl.h"
|
||||||
|
|
|
@ -201,7 +201,7 @@ X11_DispatchEvent(_THIS)
|
||||||
#ifdef X_HAVE_UTF8_STRING
|
#ifdef X_HAVE_UTF8_STRING
|
||||||
if (data->ic) {
|
if (data->ic) {
|
||||||
Xutf8LookupString(data->ic, &xevent.xkey, text, sizeof(text),
|
Xutf8LookupString(data->ic, &xevent.xkey, text, sizeof(text),
|
||||||
&keysym, status);
|
&keysym, &status);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
XLookupString(&xevent.xkey, text, sizeof(text), &keysym, NULL);
|
XLookupString(&xevent.xkey, text, sizeof(text), &keysym, NULL);
|
||||||
|
|
|
@ -69,7 +69,7 @@ typedef struct SDL_VideoData
|
||||||
int numwindows;
|
int numwindows;
|
||||||
SDL_WindowData **windowlist;
|
SDL_WindowData **windowlist;
|
||||||
int windowlistlength;
|
int windowlistlength;
|
||||||
int *mouse;
|
int mouse;
|
||||||
int keyboard;
|
int keyboard;
|
||||||
Atom WM_DELETE_WINDOW;
|
Atom WM_DELETE_WINDOW;
|
||||||
SDL_scancode key_layout[256];
|
SDL_scancode key_layout[256];
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue