Le chapeau de cul: fix some broken things after the git rebase
This commit is contained in:
parent
983b38f626
commit
d414258995
@ -6,7 +6,7 @@
|
||||
|
||||
#define CSND_TIMER(n) (0x3FEC3FC / ((u32)(n)))
|
||||
|
||||
typedef enum
|
||||
enum
|
||||
{
|
||||
CSND_ENCODING_PCM8 = 0,
|
||||
CSND_ENCODING_PCM16,
|
||||
|
@ -458,12 +458,12 @@ Result csndGetState(u32 channel, CSND_ChnInfo* out)
|
||||
Result csndIsPlaying(u32 channel, u8* status)
|
||||
{
|
||||
Result ret;
|
||||
struct CSND_CHANNEL_STATUS entry;
|
||||
CSND_ChnInfo entry;
|
||||
|
||||
ret = csndGetState(channel, &entry);
|
||||
if(ret!=0)return ret;
|
||||
|
||||
*status = entry.state;
|
||||
*status = entry.active;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user