From 13adb6a1c264ec256ca0a7e3ee898f04043ac0c4 Mon Sep 17 00:00:00 2001 From: Lectem Date: Wed, 7 Oct 2015 16:00:19 -0400 Subject: [PATCH] fixed enums for c++ --- libctru/include/3ds/services/apt.h | 4 ++-- libctru/include/3ds/services/csnd.h | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libctru/include/3ds/services/apt.h b/libctru/include/3ds/services/apt.h index 18004d7..c7c0c02 100644 --- a/libctru/include/3ds/services/apt.h +++ b/libctru/include/3ds/services/apt.h @@ -64,7 +64,7 @@ enum { APTSIGNAL_UTILITY = 9, ///< Utility called. APTSIGNAL_SLEEPSYSTEM = 10, ///< System sleeping. APTSIGNAL_ERROR = 11 ///< Error occurred. -} APT_Signal; +}; /// APT hook types. enum { @@ -75,7 +75,7 @@ enum { APTHOOK_ONEXIT, ///< App exiting. APTHOOK_COUNT, ///< Number of APT hook types. -} APT_HookType; +}; /// APT hook function. typedef void (*aptHookFn)(int hook, void* param); diff --git a/libctru/include/3ds/services/csnd.h b/libctru/include/3ds/services/csnd.h index c35d650..ea1f519 100644 --- a/libctru/include/3ds/services/csnd.h +++ b/libctru/include/3ds/services/csnd.h @@ -39,7 +39,7 @@ enum CSND_ENCODING_PCM16, ///< PCM16 CSND_ENCODING_ADPCM, ///< IMA-ADPCM CSND_ENCODING_PSG, ///< PSG (Similar to DS?) -} CSND_Encoding; +}; /// CSND loop modes. enum @@ -48,7 +48,7 @@ enum CSND_LOOPMODE_NORMAL, ///< Normal loop. CSND_LOOPMODE_ONESHOT, ///< Do not loop. CSND_LOOPMODE_NORELOAD, ///< Don't reload. -} CSND_LoopMode; +}; /// Creates a sound channel value from a channel number. #define SOUND_CHANNEL(n) ((u32)(n) & 0x1F) @@ -70,7 +70,7 @@ enum SOUND_FORMAT_ADPCM = SOUND_FORMAT(CSND_ENCODING_ADPCM), ///< ADPCM SOUND_FORMAT_PSG = SOUND_FORMAT(CSND_ENCODING_PSG), ///< PSG SOUND_ENABLE = BIT(14), ///< Enable sound. -} CSND_Flag; +}; /// Capture modes. enum @@ -80,7 +80,7 @@ enum CAPTURE_FORMAT_16BIT = 0, ///< PCM16 CAPTURE_FORMAT_8BIT = BIT(1), ///< PCM8 CAPTURE_ENABLE = BIT(15), ///< Enable capture. -} CSND_CaptureMode; +}; /// Duty cycles for a PSG channel. enum @@ -93,7 +93,7 @@ enum DutyCycle_62 = 4, ///< 62.5% duty cycle DutyCycle_75 = 5, ///< 75.0% duty cycle DutyCycle_87 = 6 ///< 87.5% duty cycle -} CSND_PSGDutyCycles; +}; /// Channel info. typedef union