Commit 957440f

committed

Remove obsolete SDL2_mixer macros

SDL2_Mixer v2.6.0 promoted some identifiers from C preprocessor macros to proper functions. This commit removes Pascal functions that imitated said macros and replaces them with external function declarations.

1 parent a5fea4e commit 957440fCopy full SHA for 957440f

File tree

1 file changed

-18

lines changed

units
- sdl2_mixer.pas

1 file changed

-18

lines changed

`‎units/sdl2_mixer.pas`

Lines changed: 5 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ function Mix_QuerySpec(frequency: pcint; format: pcuint16; channels: pcint): cin`
`196`	`196`
`197`	`197`	`{* Load a wave file or a music (.mod .s3m .it .xm) file *}`
`198`	`198`	`function Mix_LoadWAV_RW(src: PSDL_RWops; freesrc: cint): PMix_Chunk cdecl; external MIX_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_MIX_LoadWAV_RW' {$ENDIF} {$ENDIF};`
`199`		`-function Mix_LoadWAV(_file: PAnsiChar): PMix_Chunk;`
	`199`	`+function Mix_LoadWAV(_file: PAnsiChar): PMix_Chunk cdecl; external MIX_LibName {$IFDEF DELPHI}{$IFDEF MACOS}name'_MIX_LoadWAV'{$ENDIF}{$ENDIF};`
`200`	`200`	`function Mix_LoadMUS(_file: PAnsiChar): PMix_Music cdecl; external MIX_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_MIX_LoadMUS' {$ENDIF} {$ENDIF};`
`201`	`201`
`202`	`202`	`{* Load a music file from an SDL_RWop object (Ogg and MikMod specific currently)`
`@@ -651,15 +651,17 @@ function Mix_GroupNewer(tag: cint): cint cdecl; external MIX_LibName {$IFDEF DEL`
`651`	`651`	`If 'loops' is -1, loop inifinitely (~65000 times).`
`652`	`652`	`Returns which channel was used to play the sound.`
`653`	`653`	`*}`
`654`		`-function Mix_PlayChannel(channel: cint; chunk: PMix_Chunk; loops: cint): cint;`
	`654`	`+function Mix_PlayChannel(channel: cint; chunk: PMix_Chunk; loops: cint): cint; cdecl;`
	`655`	`+ external MIX_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_MIX_PlayChannel' {$ENDIF} {$ENDIF};`
`655`	`656`	`{* The same as above, but the sound is played at most 'ticks' milliseconds *}`
`656`	`657`	`function Mix_PlayChannelTimed(channel: cint; chunk: PMix_Chunk; loops: cint; ticks: cint): cint cdecl; external MIX_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_MIX_PlayChannelTimed' {$ENDIF} {$ENDIF};`
`657`	`658`	`function Mix_PlayMusic(music: PMix_Music; loops: cint): cint cdecl; external MIX_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_MIX_PlayMusic' {$ENDIF} {$ENDIF};`
`658`	`659`
`659`	`660`	`{* Fade in music or a channel over "ms" milliseconds, same semantics as the "Play" functions *}`
`660`	`661`	`function Mix_FadeInMusic(music: PMix_Music; loops: cint; ms: cint): cint cdecl; external MIX_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_MIX_FadeInMusic' {$ENDIF} {$ENDIF};`
`661`	`662`	`function Mix_FadeInMusicPos(music: PMix_Music; loops: cint; ms: cint; position: Double): cint cdecl; external MIX_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_MIX_FadeInMusicPos' {$ENDIF} {$ENDIF};`
`662`		`-function Mix_FadeInChannel(channel: cint; chunk: PMix_Chunk; loops: cint; ms: cint): cint;`
	`663`	`+function Mix_FadeInChannel(channel: cint; chunk: PMix_Chunk; loops: cint; ms: cint): cint; cdecl;`
	`664`	`+ external MIX_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_MIX_FadeInChannel' {$ENDIF} {$ENDIF};`
`663`	`665`	`function Mix_FadeInChannelTimed(channel: cint; chunk: PMix_Chunk; loops: cint; ms: cint; ticks: cint): cint cdecl; external MIX_LibName {$IFDEF DELPHI} {$IFDEF MACOS} name '_MIX_FadeInChannelTimed' {$ENDIF} {$ENDIF};`
`664`	`666`
`665`	`667`	`{* Set the volume in the range of 0-128 of a specific channel or chunk.`
`@@ -848,19 +850,4 @@ procedure MIX_VERSION(Out X: TSDL_Version);`
`848`	`850`	`SDL_MIXER_VERSION(X);`
`849`	`851`	`end;`
`850`	`852`
`851`		`-function Mix_FadeInChannel(channel: cint; chunk: PMix_Chunk; loops: cint; ms: cint): cint;`
`852`		`-begin`
`853`		`- Result := Mix_FadeInChannelTimed(channel, chunk, loops, ms, -1);`
`854`		`-end;`
`855`		`-`
`856`		`-function Mix_PlayChannel(channel: cint; chunk: PMix_Chunk; loops: cint): cint;`
`857`		`-begin`
`858`		`- Result := Mix_PlayChannelTimed(channel, chunk, loops, -1);`
`859`		`-end;`
`860`		`-`
`861`		`-function Mix_LoadWAV(_file: PAnsiChar): PMix_Chunk;`
`862`		`-begin`
`863`		`- Result := Mix_LoadWAV_RW(SDL_RWFromFile(_file, 'rb'), 1);`
`864`		`-end;`
`865`		`-`
`866`	`853`	`end.`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 957440f

File tree

1 file changed

1 file changed

`‎units/sdl2_mixer.pas`

0 commit comments