From d4142589950ffd5b1438ce7650b8098fa6fce2a3 Mon Sep 17 00:00:00 2001 From: fincs Date: Tue, 20 Jan 2015 18:05:25 +0100 Subject: [PATCH] Le chapeau de cul: fix some broken things after the git rebase --- libctru/include/3ds/services/csnd.h | 2 +- libctru/source/services/csnd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libctru/include/3ds/services/csnd.h b/libctru/include/3ds/services/csnd.h index 6539282..5deac20 100644 --- a/libctru/include/3ds/services/csnd.h +++ b/libctru/include/3ds/services/csnd.h @@ -6,7 +6,7 @@ #define CSND_TIMER(n) (0x3FEC3FC / ((u32)(n))) -typedef enum +enum { CSND_ENCODING_PCM8 = 0, CSND_ENCODING_PCM16, diff --git a/libctru/source/services/csnd.c b/libctru/source/services/csnd.c index 905346e..cb31b70 100644 --- a/libctru/source/services/csnd.c +++ b/libctru/source/services/csnd.c @@ -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; }