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 6539282a9f75d7204caa16d73f0270a18e6eb87a..5deac204b30739df0df5e193fe044c78facb58fa 100644 (file)
--- 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 905346ee1b41f1f00bc8271fb02283b26912636d..cb31b70150483989062da6d7a41fce5741e7bdbb 100644 (file)
--- 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;
 }