mirror of
https://github.com/Maschell/dynamic_libs.git
synced 2024-11-22 12:29:16 +01:00
Fixing merging issues
This commit is contained in:
parent
b0f9e662de
commit
2524defead
@ -25,6 +25,8 @@
|
|||||||
#include "os_functions.h"
|
#include "os_functions.h"
|
||||||
#include "ax_functions.h"
|
#include "ax_functions.h"
|
||||||
|
|
||||||
|
unsigned int sound_handle __attribute__((section(".data"))) = 0;
|
||||||
|
|
||||||
EXPORT_DECL(void, AXInitWithParams, u32 * params);
|
EXPORT_DECL(void, AXInitWithParams, u32 * params);
|
||||||
EXPORT_DECL(void, AXInit, void);
|
EXPORT_DECL(void, AXInit, void);
|
||||||
EXPORT_DECL(void, AXQuit, void);
|
EXPORT_DECL(void, AXQuit, void);
|
||||||
@ -47,9 +49,8 @@ EXPORT_DECL(u32, AXGetVoiceLoopCount, void *v);
|
|||||||
EXPORT_DECL(void, AXSetVoiceEndOffset, void *v, u32 offset);
|
EXPORT_DECL(void, AXSetVoiceEndOffset, void *v, u32 offset);
|
||||||
EXPORT_DECL(void, AXSetVoiceLoopOffset, void *v, u32 offset);
|
EXPORT_DECL(void, AXSetVoiceLoopOffset, void *v, u32 offset);
|
||||||
|
|
||||||
void InitAXFunctionPointers(void)
|
void InitAcquireAX(void)
|
||||||
{
|
{
|
||||||
unsigned int sound_handle = 0;
|
|
||||||
unsigned int *funcPointer = 0;
|
unsigned int *funcPointer = 0;
|
||||||
|
|
||||||
if(OS_FIRMWARE >= 400)
|
if(OS_FIRMWARE >= 400)
|
||||||
@ -68,7 +69,14 @@ void InitAXFunctionPointers(void)
|
|||||||
OSDynLoad_Acquire("snd_core.rpl", &sound_handle);
|
OSDynLoad_Acquire("snd_core.rpl", &sound_handle);
|
||||||
OS_FIND_EXPORT(sound_handle, AXInit);
|
OS_FIND_EXPORT(sound_handle, AXInit);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void InitAXFunctionPointers(void)
|
||||||
|
{
|
||||||
|
unsigned int *funcPointer = 0;
|
||||||
|
|
||||||
|
InitAcquireAX();
|
||||||
|
|
||||||
OS_FIND_EXPORT(sound_handle, AXQuit);
|
OS_FIND_EXPORT(sound_handle, AXQuit);
|
||||||
OS_FIND_EXPORT(sound_handle, AXVoiceBegin);
|
OS_FIND_EXPORT(sound_handle, AXVoiceBegin);
|
||||||
OS_FIND_EXPORT(sound_handle, AXVoiceEnd);
|
OS_FIND_EXPORT(sound_handle, AXVoiceEnd);
|
||||||
|
@ -30,7 +30,10 @@ extern "C" {
|
|||||||
|
|
||||||
#include <gctypes.h>
|
#include <gctypes.h>
|
||||||
|
|
||||||
|
extern unsigned int sound_handle;
|
||||||
|
|
||||||
void InitAXFunctionPointers(void);
|
void InitAXFunctionPointers(void);
|
||||||
|
void InitAcquireAX(void);
|
||||||
void ProperlyEndTransitionAudio(void);
|
void ProperlyEndTransitionAudio(void);
|
||||||
|
|
||||||
extern void (* AXInitWithParams)(u32 * params);
|
extern void (* AXInitWithParams)(u32 * params);
|
||||||
|
Loading…
Reference in New Issue
Block a user