adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistent use of 'inline'

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2347 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2006-05-03 23:32:34 +00:00
parent d1ae11d961
commit f8629a9126
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/libs/sound/mixer/mixer.c
+10 -10
View File
@@ -1005,7 +1005,7 @@ mixer_SourceRewind_internal (mixer_Source *src)
} }
/* get the sample next in queue in internal format */ /* get the sample next in queue in internal format */
static __inline__ bool static inline bool
mixer_SourceGetNextSample (mixer_Source *src, float *psamp, bool left) mixer_SourceGetNextSample (mixer_Source *src, float *psamp, bool left)
{ {
/* fake the data if requested */ /* fake the data if requested */
@@ -1064,7 +1064,7 @@ mixer_SourceGetNextSample (mixer_Source *src, float *psamp, bool left)
} }
/* fake the next sample, but process buffers and states */ /* fake the next sample, but process buffers and states */
static __inline__ bool static inline bool
mixer_SourceGetFakeSample (mixer_Source *src, float *psamp, bool left) mixer_SourceGetFakeSample (mixer_Source *src, float *psamp, bool left)
{ {
while (src->nextqueued) while (src->nextqueued)
@@ -1108,7 +1108,7 @@ mixer_SourceGetFakeSample (mixer_Source *src, float *psamp, bool left)
} }
/* advance position in currently queued buffer */ /* advance position in currently queued buffer */
static __inline__ uint32 static inline uint32
mixer_SourceAdvance (mixer_Source *src, bool left) mixer_SourceAdvance (mixer_Source *src, bool left)
{ {
mixer_Buffer *curr = src->nextqueued; mixer_Buffer *curr = src->nextqueued;
@@ -1461,7 +1461,7 @@ mixer_BufferData (mixer_Object bufobj, uint32 format, void* data,
* Buffer internals * Buffer internals
*/ */
static __inline__ bool static inline bool
mixer_CheckBufferState (mixer_Buffer *buf, const char* FuncName) mixer_CheckBufferState (mixer_Buffer *buf, const char* FuncName)
{ {
if (!buf) if (!buf)
@@ -1518,7 +1518,7 @@ mixer_ConvertBuffer_internal (mixer_Convertion *conv)
/* get a sample from external buffer /* get a sample from external buffer
* in internal format * in internal format
*/ */
static __inline__ sint32 static inline sint32
mixer_GetSampleExt (void *src, uint32 bpc) mixer_GetSampleExt (void *src, uint32 bpc)
{ {
if (bpc == 2) if (bpc == 2)
@@ -1528,7 +1528,7 @@ mixer_GetSampleExt (void *src, uint32 bpc)
} }
/* get a sample from internal buffer */ /* get a sample from internal buffer */
static __inline__ sint32 static inline sint32
mixer_GetSampleInt (void *src, uint32 bpc) mixer_GetSampleInt (void *src, uint32 bpc)
{ {
if (bpc == 2) if (bpc == 2)
@@ -1540,7 +1540,7 @@ mixer_GetSampleInt (void *src, uint32 bpc)
/* put a sample into an external buffer /* put a sample into an external buffer
* from internal format * from internal format
*/ */
static __inline__ void static inline void
mixer_PutSampleExt (void *dst, uint32 bpc, sint32 samp) mixer_PutSampleExt (void *dst, uint32 bpc, sint32 samp)
{ {
if (bpc == 2) if (bpc == 2)
@@ -1552,7 +1552,7 @@ mixer_PutSampleExt (void *dst, uint32 bpc, sint32 samp)
/* put a sample into an internal buffer /* put a sample into an internal buffer
* in internal format * in internal format
*/ */
static __inline__ void static inline void
mixer_PutSampleInt (void *dst, uint32 bpc, sint32 samp) mixer_PutSampleInt (void *dst, uint32 bpc, sint32 samp)
{ {
if (bpc == 2) if (bpc == 2)
@@ -1687,7 +1687,7 @@ mixer_UpsampleCubic (mixer_Source *src, bool left)
* in internal format, while performing * in internal format, while performing
* convertion if necessary * convertion if necessary
*/ */
static __inline__ sint32 static inline sint32
mixer_GetConvSample (uint8 **psrc, uint32 bpc, uint32 flags) mixer_GetConvSample (uint8 **psrc, uint32 bpc, uint32 flags)
{ {
sint32 samp; sint32 samp;
@@ -1722,7 +1722,7 @@ mixer_GetConvSample (uint8 **psrc, uint32 bpc, uint32 flags)
* in internal format, while performing * in internal format, while performing
* convertion if necessary * convertion if necessary
*/ */
static __inline__ void static inline void
mixer_PutConvSample (uint8 **pdst, uint32 bpc, uint32 flags, sint32 samp) mixer_PutConvSample (uint8 **pdst, uint32 bpc, uint32 flags, sint32 samp)
{ {
mixer_PutSampleInt (*pdst, bpc, samp); mixer_PutSampleInt (*pdst, bpc, samp);
sc2/src/sc2code/libs/sound/mixer/mixerint.h
+10 -8
View File
@@ -21,6 +21,8 @@
#ifndef _MIXERINT_H #ifndef _MIXERINT_H
#define _MIXERINT_H #define _MIXERINT_H
#include "port.h"
#include "types.h"
/************************************************* /*************************************************
* Internals * Internals
@@ -67,11 +69,11 @@ typedef struct
static void mixer_ConvertBuffer_internal (mixer_Convertion *conv); static void mixer_ConvertBuffer_internal (mixer_Convertion *conv);
static void mixer_ResampleFlat (mixer_Convertion *conv); static void mixer_ResampleFlat (mixer_Convertion *conv);
static __inline__ sint32 mixer_GetSampleExt (void *src, uint32 bpc); static inline sint32 mixer_GetSampleExt (void *src, uint32 bpc);
static __inline__ sint32 mixer_GetSampleInt (void *src, uint32 bpc); static inline sint32 mixer_GetSampleInt (void *src, uint32 bpc);
static __inline__ void mixer_PutSampleInt (void *dst, uint32 bpc, static inline void mixer_PutSampleInt (void *dst, uint32 bpc,
sint32 samp); sint32 samp);
static __inline__ void mixer_PutSampleExt (void *dst, uint32 bpc, static inline void mixer_PutSampleExt (void *dst, uint32 bpc,
sint32 samp); sint32 samp);
static float mixer_ResampleNone (mixer_Source *src, bool left); static float mixer_ResampleNone (mixer_Source *src, bool left);
@@ -86,7 +88,7 @@ static void mixer_SourceRewind_internal (mixer_Source *src);
static void mixer_SourceActivate (mixer_Source* src); static void mixer_SourceActivate (mixer_Source* src);
static void mixer_SourceDeactivate (mixer_Source* src); static void mixer_SourceDeactivate (mixer_Source* src);
static __inline__ bool mixer_CheckBufferState (mixer_Buffer *buf, static inline bool mixer_CheckBufferState (mixer_Buffer *buf,
const char* FuncName); const char* FuncName);
/* Clipping boundaries */ /* Clipping boundaries */
@@ -99,10 +101,10 @@ static __inline__ bool mixer_CheckBufferState (mixer_Buffer *buf,
#define MIX_GAIN_ADJ (0.75f) #define MIX_GAIN_ADJ (0.75f)
/* The Mixer */ /* The Mixer */
static __inline__ bool mixer_SourceGetNextSample (mixer_Source *src, static inline bool mixer_SourceGetNextSample (mixer_Source *src,
float *psamp, bool left); float *psamp, bool left);
static __inline__ bool mixer_SourceGetFakeSample (mixer_Source *src, static inline bool mixer_SourceGetFakeSample (mixer_Source *src,
float *psamp, bool left); float *psamp, bool left);
static __inline__ uint32 mixer_SourceAdvance (mixer_Source *src, bool left); static inline uint32 mixer_SourceAdvance (mixer_Source *src, bool left);
#endif /* _MIXERINT_H */ #endif /* _MIXERINT_H */
sc2/src/sc2code/libs/video/dukvid.c
+1 -1
View File
@@ -441,7 +441,7 @@ dukv_InitDeltas (TFB_DuckVideoDecoder* dukv, uint8* vectors,
} }
} }
static __inline__ uint32 static inline uint32
dukv_PixelConv (uint16 pix, const TFB_PixelFormat* fmt) dukv_PixelConv (uint16 pix, const TFB_PixelFormat* fmt)
{ {
uint32 r, g, b; uint32 r, g, b;