From: fincs Date: Tue, 20 Jan 2015 17:05:25 +0000 (+0100) Subject: Le chapeau de cul: fix some broken things after the git rebase X-Git-Tag: v0.4.0~12 X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=d4142589950ffd5b1438ce7650b8098fa6fce2a3;p=corbenik%2Fctrulib.git Le chapeau de cul: fix some broken things after the git rebase --- 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; }