@@ -22,7 +22,6 @@ Library Sound.AudioToolbox.AUGraph, System.Mac.Components, System.Mac.OSStatus, - System.Mac.OSType, System.Mac.Types frameworks: AudioToolbox, AudioUnit hs-coreaudio.cabal @@ -20,11 +20,8 @@ module System.Mac.Components ( import Prelude hiding (any) import Control.Applicative -import Control.Exception (bracket) -import Data.Bits (bitSize) import Foreign (Ptr, Storable (..), alloca, nullPtr) import Foreign.C.Types (CInt, CUInt, CLong) -import System.Mac.OSType import System.Mac.Types #include "/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers/Components.h" @@ -118,10 +115,7 @@ componentDescription component = alloca $ \ptr -> do -- | Call @GetComponentInfo@ to retrieve a 'Component''s name as a String componentName :: Component -> IO String -componentName component = bracket - (c_NewHandle $ bitSize (undefined::CInt) `div` 8) - c_DisposeHandle - (\h -> do - c_GetComponentInfo component nullPtr h nullPtr nullPtr - peek h >>= peekPascalStr) +componentName component = withHandle $ \h -> do + c_GetComponentInfo component nullPtr h nullPtr nullPtr + peek h >>= peekPascalStr {-# INLINE componentName #-} src/System/Mac/Components.hsc @@ -1,10 +1,33 @@ -{-# LANGUAGE ForeignFunctionInterface #-} +{-# LANGUAGE ForeignFunctionInterface, GeneralizedNewtypeDeriving #-} -module System.Mac.Types where +module System.Mac.Types ( + Handle, withHandle, + OSErr, + OSType (..), + OSStatus, + peekPascalStr +) where +import Control.Exception (bracket) +import Data.Bits (bitSize, shift) +import Data.Char (ord, chr) import Data.Word (Word8) import Foreign (Ptr, Storable (..), castPtr) -import Foreign.C.Types (CShort) +import Foreign.C.Types (CInt, CShort) +import GHC.Exts (IsString (..)) +import System.Mac.OSStatus + +newtype OSType = OSType CInt deriving (Eq, Ord, Storable) + +instance IsString OSType where + fromString = OSType . foldl1 (<<) . map (fromIntegral . ord) . pad 4 + where pad n = take n . (++ repeat ' ') + x << y = shift x 8 + y + +instance Show OSType where + show (OSType n) = show str + where str = map (chr . fromIntegral . f) [0..3] + f i = shift (shift n (i*8)) (-24) type OSErr = CShort @@ -16,6 +39,11 @@ foreign import ccall "NewHandle" foreign import ccall "DisposeHandle" c_DisposeHandle :: Handle -> IO () +withHandle :: (Handle -> IO a) -> IO a +withHandle = bracket + (c_NewHandle $ bitSize (undefined::CInt) `div` 8) + c_DisposeHandle + peekPascalStr :: Ptr a -> IO String peekPascalStr ptr = do let ptr' = castPtr ptr :: Ptr Word8 src/System/Mac/Types.hs src/System/Mac/OSType.hs 6ea91ccdcdd714b9e7f3c152c0eccb73e317ad3d Jeremy Voorhis jvoorhis@jeremy-voorhiss-macbook-2.local http://github.com/jvoorhis/hs-coreaudio/commit/84f4fefa4daac8b5e3a513ea32302a45d214a0d4 84f4fefa4daac8b5e3a513ea32302a45d214a0d4 2009-10-19T17:30:51-07:00 2009-10-19T17:30:51-07:00 Folded System.Mac.OSType into System.Mac.Types d3c4a47fba67e65cbd36c5b680c4fa8ec1b2723d Jeremy Voorhis jvoorhis@jeremy-voorhiss-macbook-2.local