hosc 0.18.1 → 0.19

raw patch · 12 files changed

+786/−108 lines, 12 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• README +0/−30
• README.md +31/−0
• Sound/OSC/Coding/Decode/Base.hs +12/−13
• Sound/OSC/Coding/Decode/Binary.hs +19/−19
• Sound/OSC/Coding/Encode/Builder.hs +0/−6
• Sound/OSC/Datum.hs +19/−10
• Sound/OSC/Packet.hs +7/−8
• Sound/OSC/Transport/FD/TCP.hs +3/−2
• Sound/OSC/Transport/FD/UDP.hs +10/−8
• Sound/OSC/Transport/Monad.hs +5/−5
• contrib/LICENSE +674/−0
• hosc.cabal +6/−7

@@ -1,30 +0,0 @@-hosc - haskell open sound control------------------------------------[hosc][hosc] provides `Sound.OSC`, a [haskell][hs]-module implementing a subset of the [Open Sound Control][osc] byte protocol.-hosc is required by the [hsc3][hsc3] haskell [supercollider][sc3] bindings.--See also:--- [hosc-json](?t=hosc-json): JSON text encoding of OSC-- [hosc-util](?t=hosc-util): non-core OSC functions--© [rohan drape][rd], [stefan kersten][sk] and others, 2007-2020,-[gpl][gpl]. with contributions by:--- [alex mclean][am]-- [henning thielemann][ht]--see the [git](https://git-scm.com/) [history](?t=hosc&q=history) for details--[hosc]: http://rohandrape.net/?t=hosc-[hs]: http://haskell.org/-[osc]: http://opensoundcontrol.org/-[hsc3]: http://rohandrape.net/?t=hsc3-[sc3]: http://audiosynth.com/-[rd]:  http://rohandrape.net/-[sk]: http://space.k-hornz.de/-[am]: http://yaxu.org/-[ht]: http://www.henning-thielemann.de/Research.html-[gpl]: http://gnu.org/copyleft/

@@ -0,0 +1,31 @@+hosc - haskell open sound control+---------------------------------++[hosc][hosc] provides `Sound.OSC`, a [haskell][hs]+module implementing a subset of the [Open Sound Control][osc] byte protocol.+hosc is required by the [hsc3][hsc3] haskell [supercollider][sc3] bindings.++See also:++- [hosc-json](http://rohandrape.net/?t=hosc-json): JSON text encoding of OSC+- [hosc-util](http://rohandrape.net/?t=hosc-util): non-core OSC functions++© [rohan drape][rd], [stefan kersten][sk] and others, 2007-2021,+[gpl-3][gpl-3]. with contributions by:++- [alex mclean][am]+- [henning thielemann][ht]++see the [git](https://git-scm.com/) [history](http://rohandrape.net/?t=hosc&q=history) for details++[hosc]: http://rohandrape.net/?t=hosc+[hs]: http://haskell.org/+[osc]: http://opensoundcontrol.org/+[hsc3]: http://rohandrape.net/?t=hsc3+[sc3]: http://audiosynth.com/+[rd]:  http://rohandrape.net/+[sk]: http://space.k-hornz.de/+[am]: http://yaxu.org/+[ht]: http://www.henning-thielemann.de/Research.html+[gpl]: http://gnu.org/copyleft/+[gpl-3]: http://gnu.org/licenses/gpl-3.0.html

@@ -16,22 +16,22 @@ import Sound.OSC.Packet {- hosc -} import Sound.OSC.Time {- hosc -} --- The plain byte count of an OSC value.+-- | The plain byte count of an OSC value. size :: Datum_Type -> B.ByteString -> Int size ty b =     case ty of-      'i' -> 4-      'f' -> 4-      'd' -> 8-      't' -> 8 -- timetag-      'm' -> 4 -- MIDI message+      'i' -> 4 -- Int32+      'f' -> 4 -- Float+      'd' -> 8 -- Double+      't' -> 8 -- Time (NTP)+      'm' -> 4 -- MIDI       's' -> int64_to_int (fromMaybe                            (error ("size: no terminating zero: " ++ show b))                            (B.elemIndex 0 b))       'b' -> decode_i32 (B.take 4 b)       _ -> error "size: illegal type" --- The storage byte count of an OSC value.+-- | The storage byte count (aligned) of an OSC value. storage :: Datum_Type -> B.ByteString -> Int storage ty b =     case ty of@@ -39,7 +39,7 @@       'b' -> let n = size 'b' b in n + align n + 4       _ -> size ty B.empty --- Decode an OSC datum+-- | Decode an OSC datum decode_datum :: Datum_Type -> B.ByteString -> Datum decode_datum ty b =     case ty of@@ -50,11 +50,10 @@       's' -> ASCII_String (decode_ascii (b_take (size 's' b) b))       'b' -> Blob (b_take (size 'b' b) (B.drop 4 b))       't' -> TimeStamp (ntpi_to_ntpr (decode_word64 b))-      'm' -> let [b0,b1,b2,b3] = B.unpack (B.take 4 b)-             in midi (b0,b1,b2,b3)+      'm' -> let [b0,b1,b2,b3] = B.unpack (B.take 4 b) in midi (b0,b1,b2,b3)       _ -> error ("decode_datum: illegal type (" ++ [ty] ++ ")") --- Decode a sequence of OSC datum given a type descriptor string.+-- | Decode a sequence of OSC datum given a type descriptor string. decode_datum_seq :: ASCII -> B.ByteString -> [Datum] decode_datum_seq cs b =     let swap (x,y) = (y,x)@@ -72,7 +71,7 @@         arg = decode_datum_seq (descriptor_tags dsc) (b_drop (n + m) b)     in Message (C.unpack cmd) arg --- Decode a sequence of OSC messages, each one headed by its length+-- | Decode a sequence of length prefixed (Int32) OSC messages. decode_message_seq :: B.ByteString -> [Message] decode_message_seq b =     let s = decode_i32 b@@ -84,7 +83,7 @@ decodeBundle :: B.ByteString -> Bundle decodeBundle b =     let h = storage 's' b -- header (should be '#bundle')-        t = storage 't' (b_drop h b) -- time tag+        t = storage 't' (b_drop h b) -- time         (TimeStamp timeStamp) = decode_datum 't' (b_drop h b)         ms = decode_message_seq (b_drop (h+t) b)     in Bundle timeStamp ms

@@ -8,13 +8,14 @@  import Control.Applicative {- base -} import Control.Monad {- base -}+import Data.Int {- base -}+import Data.Word {- base -}+ import qualified Data.Binary.Get as G {- binary -} import qualified Data.Binary.IEEE754 as I {- data-binary-ieee754 -} import qualified Data.ByteString.Char8 as S.C {- bytestring -} import qualified Data.ByteString.Lazy as B {- bytestring -} import qualified Data.ByteString.Lazy.Char8 as C {- bytestring -}-import Data.Int {- base -}-import Data.Word {- base -}  import qualified Sound.OSC.Coding.Byte as Byte {- hosc -} import Sound.OSC.Coding.Convert {- hosc -}@@ -24,18 +25,18 @@  -- | Get a 32 bit integer in big-endian byte order. getInt32be :: G.Get Int32-getInt32be = word32_to_int32 <$> G.getWord32be+getInt32be = fmap word32_to_int32 G.getWord32be  -- | Get a 64 bit integer in big-endian byte order. getInt64be :: G.Get Int64-getInt64be = word64_to_int64 <$> G.getWord64be+getInt64be = fmap word64_to_int64 G.getWord64be  -- | Get an aligned OSC string. get_string :: G.Get String get_string = do     s <- G.getLazyByteStringNul     G.skip (int64_to_int (Byte.align (B.length s + 1)))-    return $ C.unpack s+    return (C.unpack s)  -- | Get an aligned OSC string. get_ascii :: G.Get ASCII@@ -57,18 +58,18 @@ get_datum :: Datum_Type -> G.Get Datum get_datum ty =     case ty of-      'i' -> Int32 <$> getInt32be-      'h' -> Int64 <$> getInt64be-      'f' -> Float <$> I.getFloat32be-      'd' -> Double <$> I.getFloat64be-      's' -> ASCII_String <$> get_ascii-      'b' -> Blob   <$> (get_bytes =<< G.getWord32be)-      't' -> TimeStamp <$> Time.ntpi_to_ntpr <$> G.getWord64be+      'i' -> fmap Int32 getInt32be+      'h' -> fmap Int64 getInt64be+      'f' -> fmap Float I.getFloat32be+      'd' -> fmap Double I.getFloat64be+      's' -> fmap ASCII_String get_ascii+      'b' -> fmap Blob (get_bytes =<< G.getWord32be)+      't' -> fmap (TimeStamp . Time.ntpi_to_ntpr) G.getWord64be       'm' -> do b0 <- G.getWord8                 b1 <- G.getWord8                 b2 <- G.getWord8                 b3 <- G.getWord8-                return $ Midi (MIDI b0 b1 b2 b3)+                return (Midi (MIDI b0 b1 b2 b3))       _ -> fail ("get_datum: illegal type " ++ show ty)  -- | Get an OSC 'Message', fail if type descriptor is invalid.@@ -79,7 +80,7 @@     case S.C.unpack dsc of         ',':tags -> do             arg <- mapM get_datum tags-            return $ Message cmd arg+            return (Message cmd arg)         e -> fail ("get_message: invalid type descriptor string: " ++ e)  -- | Get a sequence of OSC 'Message's, each one headed by its length.@@ -98,13 +99,12 @@ get_bundle = do     h <- G.getByteString (S.C.length Byte.bundleHeader_strict)     when (h /= Byte.bundleHeader_strict) (fail "get_bundle: not a bundle")-    t <- Time.ntpi_to_ntpr <$> G.getWord64be-    ps <- get_message_seq-    return $ Bundle t ps+    t <- fmap Time.ntpi_to_ntpr G.getWord64be+    fmap (Bundle t) get_message_seq  -- | Get an OSC 'Packet'. get_packet :: G.Get Packet-get_packet = (Packet_Bundle <$> get_bundle) <|> (Packet_Message <$> get_message)+get_packet = fmap Packet_Bundle get_bundle <|> fmap Packet_Message get_message  {-# INLINE decodeMessage #-} {-# INLINE decodeBundle #-}@@ -131,6 +131,6 @@ decodePacket :: B.ByteString -> Packet decodePacket = G.runGet get_packet --- | Decode an OSC packet from a strict ByteString.+-- | Decode an OSC packet from a strict Char8 ByteString. decodePacket_strict :: S.C.ByteString -> Packet decodePacket_strict = G.runGet get_packet . B.fromChunks . (:[])

@@ -1,5 +1,3 @@-{-# LANGUAGE CPP #-}- -- | Optimised encode function for OSC packets. module Sound.OSC.Coding.Encode.Builder     (build_packet@@ -15,10 +13,6 @@ import qualified Data.ByteString.Lazy as L {- bytestring -} import qualified Blaze.ByteString.Builder as B {- bytestring -} import qualified Blaze.ByteString.Builder.Char8 as B {- bytestring -}--#ifdef IMPORT_SEMIGROUP-import Data.Semigroup-#endif  import qualified Sound.OSC.Coding.Byte as Byte {- hosc -} import qualified Sound.OSC.Coding.Convert as Convert {- hosc -}

@@ -1,6 +1,7 @@ -- | Data type for OSC datum. module Sound.OSC.Datum where +import Data.Char {- base -} import Data.Int {- base -} import Data.List {- base -} import Data.Maybe {- base -}@@ -143,7 +144,7 @@  -- * Constructors --- | Type generalised Int32.+-- | Type generalised 'Int32'. -- -- > int32 (1::Int32) == int32 (1::Integer) -- > d_int32 (int32 (maxBound::Int32)) == maxBound@@ -185,6 +186,10 @@ midi :: (Word8,Word8,Word8,Word8) -> Datum midi (p,q,r,s) = Midi (MIDI p q r s) +-- | 'Blob' of 'blob_pack'.+blob :: [Word8] -> Datum+blob = Blob . blob_pack+ -- * Descriptor  -- | Message argument types are given by a descriptor.@@ -205,7 +210,7 @@ -- | Variant of 'showFFloat' that deletes trailing zeros. -- -- > map (floatPP (Just 4)) [1,pi] == ["1.0","3.1416"]-floatPP :: RealFloat n => Maybe Int -> n -> String+floatPP :: RealFloat n => FP_Precision -> n -> String floatPP p n =     let s = showFFloat p n ""         s' = dropWhile (== '0') (reverse s)@@ -221,18 +226,22 @@  -- | Pretty printer for vectors. ----- > vecPP [1::Int,2,3] == "<1,2,3>"-vecPP :: Show a => [a] -> String-vecPP v = '<' : intercalate "," (map show v) ++ ">"+-- > vecPP show [1::Int,2,3] == "<1,2,3>"+vecPP :: (a -> String) -> [a] -> String+vecPP f v = '<' : intercalate "," (map f v) ++ ">"  -- | Pretty printer for blobs, two-digit zero-padded hexadecimal. blobPP :: BLOB -> String-blobPP = unwords . map (printf "%02X") . Lazy.unpack+blobPP = ('B':) . vecPP (printf "%02X") . Lazy.unpack +-- | Print strings in double quotes iff they contain white space.+stringPP :: String -> String+stringPP x = if any isSpace x then show x else x+ {- | Pretty printer for 'Datum'. -> let d = [Int32 1,Float 1.2,string "str",midi (0,0x90,0x40,0x60)]-> map (datumPP (Just 5)) d ==  ["1","1.2","\"str\"","<0,144,64,96>"]+> let d = [Int32 1,Float 1.2,string "str",midi (0,0x90,0x40,0x60),blob [12,16]]+> map (datumPP (Just 5)) d==  ["1","1.2","str","M<0,144,64,96>","B<0C,10>"]  -} datumPP :: FP_Precision -> Datum -> String@@ -242,10 +251,10 @@       Int64 n -> show n       Float n -> floatPP p n       Double n -> floatPP p n-      ASCII_String s -> show (Char8.unpack s)+      ASCII_String s -> stringPP (Char8.unpack s)       Blob s -> blobPP s       TimeStamp t -> timePP p t-      Midi (MIDI b1 b2 b3 b4) -> vecPP [b1,b2,b3,b4]+      Midi (MIDI b1 b2 b3 b4) -> 'M': vecPP show [b1,b2,b3,b4]  -- | Variant of 'datumPP' that appends the 'datum_type_name'. datum_pp_typed :: FP_Precision -> Datum -> String

@@ -10,7 +10,7 @@  -- | OSC address pattern.  This is strictly an ASCII value, however it --   is very common to pattern match on addresses and matching on---   'C.ByteString' requires @OverloadedStrings@.+--   Data.ByteString.Char8 requires @OverloadedStrings@. type Address_Pattern = String  -- | An OSC message, an 'Address_Pattern' and a sequence of 'Datum'.@@ -116,17 +116,16 @@  -- * Pretty printing --- | Pretty printer for 'Message'.+{- | Pretty printer for 'Message'.++> messagePP Nothing (Message "/m" [int32 0,float 1.0,string "s",midi (1,2,3,4),blob [1,2,3]])+-} messagePP :: FP_Precision -> Message -> String-messagePP p (Message a d) =-    let d' = map (datumPP p) d-    in unwords ("#message" : a : d')+messagePP p (Message a d) = let d' = map (datumPP p) d in unwords (a : d')  -- | Pretty printer for 'Bundle'. bundlePP :: FP_Precision -> Bundle -> String-bundlePP p (Bundle t m) =-    let m' = intersperse ";" (map (messagePP p) m)-    in unwords ("#bundle" : timePP p t : m')+bundlePP p (Bundle t m) = let m' = intersperse ";" (map (messagePP p) m) in unwords (timePP p t : m')  -- | Pretty printer for 'Packet'. packetPP :: FP_Precision -> Packet -> String

@@ -14,7 +14,7 @@ import qualified Sound.OSC.Transport.FD as FD {- hosc -}  -- | The TCP transport handle data type.-data TCP = TCP {tcpHandle :: IO.Handle}+newtype TCP = TCP {tcpHandle :: IO.Handle}  -- | Send packet over TCP. tcp_send_packet :: TCP -> Packet.Packet -> IO ()@@ -49,7 +49,8 @@ tcp_socket :: (N.Socket -> N.SockAddr -> IO ()) -> Maybe String -> Int -> IO N.Socket tcp_socket f host port = do   fd <- N.socket N.AF_INET N.Stream 0-  i:_ <- N.getAddrInfo Nothing host (Just (show port))+  let hints = N.defaultHints {N.addrFamily = N.AF_INET} -- localhost=ipv4+  i:_ <- N.getAddrInfo (Just hints) host (Just (show port))   let sa = N.addrAddress i   _ <- f fd sa   return fd

@@ -2,8 +2,8 @@ module Sound.OSC.Transport.FD.UDP where  import Control.Exception {- base -}-import Control.Monad {- base -} import Data.Bifunctor {- base -}+ import qualified Network.Socket as N {- network -} import qualified Network.Socket.ByteString as C {- network -} @@ -13,15 +13,15 @@ import qualified Sound.OSC.Transport.FD as FD {- hosc -}  -- | The UDP transport handle data type.-data UDP = UDP {udpSocket :: N.Socket}+newtype UDP = UDP {udpSocket :: N.Socket}  -- | Return the port number associated with the UDP socket. udpPort :: Integral n => UDP -> IO n udpPort = fmap fromIntegral . N.socketPort . udpSocket --- | Send packet over UDP.+-- | Send packet over UDP using 'C.sendAll'. upd_send_packet :: UDP -> Packet.Packet -> IO ()-upd_send_packet (UDP fd) p = void (C.send fd (Builder.encodePacket_strict p))+upd_send_packet (UDP fd) p = C.sendAll fd (Builder.encodePacket_strict p)  -- | Receive packet over UDP. udp_recv_packet :: UDP -> IO Packet.Packet@@ -45,7 +45,8 @@ udp_socket :: (N.Socket -> N.SockAddr -> IO ()) -> String -> Int -> IO UDP udp_socket f host port = do   fd <- N.socket N.AF_INET N.Datagram 0-  i:_ <- N.getAddrInfo Nothing (Just host) (Just (show port))+  let hints = N.defaultHints {N.addrFamily = N.AF_INET} -- localhost=ipv4+  i:_ <- N.getAddrInfo (Just hints) (Just host) (Just (show port))   let sa = N.addrAddress i   f fd sa   return (UDP fd)@@ -80,7 +81,8 @@ udp_server p = do   let hints =         N.defaultHints-        {N.addrFlags = [N.AI_PASSIVE,N.AI_NUMERICSERV]+        {N.addrFamily = N.AF_INET -- localhost=ipv4+        ,N.addrFlags = [N.AI_PASSIVE,N.AI_NUMERICSERV]         ,N.addrSocketType = N.Datagram}   a:_ <- N.getAddrInfo (Just hints) Nothing (Just (show p))   s <- N.socket (N.addrFamily a) (N.addrSocketType a) (N.addrProtocol a)@@ -88,9 +90,9 @@   N.bind s (N.addrAddress a)   return (UDP s) --- | Send variant to send to specified address.+-- | Send to specified address using 'C.sendAllTo. sendTo :: UDP -> Packet.Packet -> N.SockAddr -> IO ()-sendTo (UDP fd) p = void . C.sendTo fd (Builder.encodePacket_strict p)+sendTo (UDP fd) p = C.sendAllTo fd (Builder.encodePacket_strict p)  -- | Recv variant to collect message source address. recvFrom :: UDP -> IO (Packet.Packet, N.SockAddr)

@@ -68,11 +68,11 @@  -- | Variant of 'recvPacket' that runs 'packet_to_bundle'. recvBundle :: (RecvOSC m) => m Packet.Bundle-recvBundle = liftM Packet.packet_to_bundle recvPacket+recvBundle = fmap Packet.packet_to_bundle recvPacket  -- | Variant of 'recvPacket' that runs 'packet_to_message'. recvMessage :: (RecvOSC m) => m (Maybe Packet.Message)-recvMessage = liftM Packet.packet_to_message recvPacket+recvMessage = fmap Packet.packet_to_message recvPacket  -- | Erroring variant. recvMessage_err :: RecvOSC m => m Packet.Message@@ -80,7 +80,7 @@  -- | Variant of 'recvPacket' that runs 'packetMessages'. recvMessages :: (RecvOSC m) => m [Packet.Message]-recvMessages = liftM Packet.packetMessages recvPacket+recvMessages = fmap Packet.packetMessages recvPacket  -- * Wait @@ -116,8 +116,8 @@     let f = fromMaybe (error "waitReply: message not located?") .             find (Packet.message_has_address s) .             Packet.packetMessages-    in liftM f (waitAddress s)+    in fmap f (waitAddress s)  -- | Variant of 'waitReply' that runs 'messageDatum'. waitDatum :: RecvOSC m => Packet.Address_Pattern -> m [Datum.Datum]-waitDatum = liftM Packet.messageDatum . waitReply+waitDatum = fmap Packet.messageDatum . waitReply

@@ -0,0 +1,674 @@+                    GNU GENERAL PUBLIC LICENSE+                       Version 3, 29 June 2007++ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>+ Everyone is permitted to copy and distribute verbatim copies+ of this license document, but changing it is not allowed.++                            Preamble++  The GNU General Public License is a free, copyleft license for+software and other kinds of works.++  The licenses for most software and other practical works are designed+to take away your freedom to share and change the works.  By contrast,+the GNU General Public License is intended to guarantee your freedom to+share and change all versions of a program--to make sure it remains free+software for all its users.  We, the Free Software Foundation, use the+GNU General Public License for most of our software; it applies also to+any other work released this way by its authors.  You can apply it to+your programs, too.++  When we speak of free software, we are referring to freedom, not+price.  Our General Public Licenses are designed to make sure that you+have the freedom to distribute copies of free software (and charge for+them if you wish), that you receive source code or can get it if you+want it, that you can change the software or use pieces of it in new+free programs, and that you know you can do these things.++  To protect your rights, we need to prevent others from denying you+these rights or asking you to surrender the rights.  Therefore, you have+certain responsibilities if you distribute copies of the software, or if+you modify it: responsibilities to respect the freedom of others.++  For example, if you distribute copies of such a program, whether+gratis or for a fee, you must pass on to the recipients the same+freedoms that you received.  You must make sure that they, too, receive+or can get the source code.  And you must show them these terms so they+know their rights.++  Developers that use the GNU GPL protect your rights with two steps:+(1) assert copyright on the software, and (2) offer you this License+giving you legal permission to copy, distribute and/or modify it.++  For the developers' and authors' protection, the GPL clearly explains+that there is no warranty for this free software.  For both users' and+authors' sake, the GPL requires that modified versions be marked as+changed, so that their problems will not be attributed erroneously to+authors of previous versions.++  Some devices are designed to deny users access to install or run+modified versions of the software inside them, although the manufacturer+can do so.  This is fundamentally incompatible with the aim of+protecting users' freedom to change the software.  The systematic+pattern of such abuse occurs in the area of products for individuals to+use, which is precisely where it is most unacceptable.  Therefore, we+have designed this version of the GPL to prohibit the practice for those+products.  If such problems arise substantially in other domains, we+stand ready to extend this provision to those domains in future versions+of the GPL, as needed to protect the freedom of users.++  Finally, every program is threatened constantly by software patents.+States should not allow patents to restrict development and use of+software on general-purpose computers, but in those that do, we wish to+avoid the special danger that patents applied to a free program could+make it effectively proprietary.  To prevent this, the GPL assures that+patents cannot be used to render the program non-free.++  The precise terms and conditions for copying, distribution and+modification follow.++                       TERMS AND CONDITIONS++  0. Definitions.++  "This License" refers to version 3 of the GNU General Public License.++  "Copyright" also means copyright-like laws that apply to other kinds of+works, such as semiconductor masks.++  "The Program" refers to any copyrightable work licensed under this+License.  Each licensee is addressed as "you".  "Licensees" and+"recipients" may be individuals or organizations.++  To "modify" a work means to copy from or adapt all or part of the work+in a fashion requiring copyright permission, other than the making of an+exact copy.  The resulting work is called a "modified version" of the+earlier work or a work "based on" the earlier work.++  A "covered work" means either the unmodified Program or a work based+on the Program.++  To "propagate" a work means to do anything with it that, without+permission, would make you directly or secondarily liable for+infringement under applicable copyright law, except executing it on a+computer or modifying a private copy.  Propagation includes copying,+distribution (with or without modification), making available to the+public, and in some countries other activities as well.++  To "convey" a work means any kind of propagation that enables other+parties to make or receive copies.  Mere interaction with a user through+a computer network, with no transfer of a copy, is not conveying.++  An interactive user interface displays "Appropriate Legal Notices"+to the extent that it includes a convenient and prominently visible+feature that (1) displays an appropriate copyright notice, and (2)+tells the user that there is no warranty for the work (except to the+extent that warranties are provided), that licensees may convey the+work under this License, and how to view a copy of this License.  If+the interface presents a list of user commands or options, such as a+menu, a prominent item in the list meets this criterion.++  1. Source Code.++  The "source code" for a work means the preferred form of the work+for making modifications to it.  "Object code" means any non-source+form of a work.++  A "Standard Interface" means an interface that either is an official+standard defined by a recognized standards body, or, in the case of+interfaces specified for a particular programming language, one that+is widely used among developers working in that language.++  The "System Libraries" of an executable work include anything, other+than the work as a whole, that (a) is included in the normal form of+packaging a Major Component, but which is not part of that Major+Component, and (b) serves only to enable use of the work with that+Major Component, or to implement a Standard Interface for which an+implementation is available to the public in source code form.  A+"Major Component", in this context, means a major essential component+(kernel, window system, and so on) of the specific operating system+(if any) on which the executable work runs, or a compiler used to+produce the work, or an object code interpreter used to run it.++  The "Corresponding Source" for a work in object code form means all+the source code needed to generate, install, and (for an executable+work) run the object code and to modify the work, including scripts to+control those activities.  However, it does not include the work's+System Libraries, or general-purpose tools or generally available free+programs which are used unmodified in performing those activities but+which are not part of the work.  For example, Corresponding Source+includes interface definition files associated with source files for+the work, and the source code for shared libraries and dynamically+linked subprograms that the work is specifically designed to require,+such as by intimate data communication or control flow between those+subprograms and other parts of the work.++  The Corresponding Source need not include anything that users+can regenerate automatically from other parts of the Corresponding+Source.++  The Corresponding Source for a work in source code form is that+same work.++  2. Basic Permissions.++  All rights granted under this License are granted for the term of+copyright on the Program, and are irrevocable provided the stated+conditions are met.  This License explicitly affirms your unlimited+permission to run the unmodified Program.  The output from running a+covered work is covered by this License only if the output, given its+content, constitutes a covered work.  This License acknowledges your+rights of fair use or other equivalent, as provided by copyright law.++  You may make, run and propagate covered works that you do not+convey, without conditions so long as your license otherwise remains+in force.  You may convey covered works to others for the sole purpose+of having them make modifications exclusively for you, or provide you+with facilities for running those works, provided that you comply with+the terms of this License in conveying all material for which you do+not control copyright.  Those thus making or running the covered works+for you must do so exclusively on your behalf, under your direction+and control, on terms that prohibit them from making any copies of+your copyrighted material outside their relationship with you.++  Conveying under any other circumstances is permitted solely under+the conditions stated below.  Sublicensing is not allowed; section 10+makes it unnecessary.++  3. Protecting Users' Legal Rights From Anti-Circumvention Law.++  No covered work shall be deemed part of an effective technological+measure under any applicable law fulfilling obligations under article+11 of the WIPO copyright treaty adopted on 20 December 1996, or+similar laws prohibiting or restricting circumvention of such+measures.++  When you convey a covered work, you waive any legal power to forbid+circumvention of technological measures to the extent such circumvention+is effected by exercising rights under this License with respect to+the covered work, and you disclaim any intention to limit operation or+modification of the work as a means of enforcing, against the work's+users, your or third parties' legal rights to forbid circumvention of+technological measures.++  4. Conveying Verbatim Copies.++  You may convey verbatim copies of the Program's source code as you+receive it, in any medium, provided that you conspicuously and+appropriately publish on each copy an appropriate copyright notice;+keep intact all notices stating that this License and any+non-permissive terms added in accord with section 7 apply to the code;+keep intact all notices of the absence of any warranty; and give all+recipients a copy of this License along with the Program.++  You may charge any price or no price for each copy that you convey,+and you may offer support or warranty protection for a fee.++  5. Conveying Modified Source Versions.++  You may convey a work based on the Program, or the modifications to+produce it from the Program, in the form of source code under the+terms of section 4, provided that you also meet all of these conditions:++    a) The work must carry prominent notices stating that you modified+    it, and giving a relevant date.++    b) The work must carry prominent notices stating that it is+    released under this License and any conditions added under section+    7.  This requirement modifies the requirement in section 4 to+    "keep intact all notices".++    c) You must license the entire work, as a whole, under this+    License to anyone who comes into possession of a copy.  This+    License will therefore apply, along with any applicable section 7+    additional terms, to the whole of the work, and all its parts,+    regardless of how they are packaged.  This License gives no+    permission to license the work in any other way, but it does not+    invalidate such permission if you have separately received it.++    d) If the work has interactive user interfaces, each must display+    Appropriate Legal Notices; however, if the Program has interactive+    interfaces that do not display Appropriate Legal Notices, your+    work need not make them do so.++  A compilation of a covered work with other separate and independent+works, which are not by their nature extensions of the covered work,+and which are not combined with it such as to form a larger program,+in or on a volume of a storage or distribution medium, is called an+"aggregate" if the compilation and its resulting copyright are not+used to limit the access or legal rights of the compilation's users+beyond what the individual works permit.  Inclusion of a covered work+in an aggregate does not cause this License to apply to the other+parts of the aggregate.++  6. Conveying Non-Source Forms.++  You may convey a covered work in object code form under the terms+of sections 4 and 5, provided that you also convey the+machine-readable Corresponding Source under the terms of this License,+in one of these ways:++    a) Convey the object code in, or embodied in, a physical product+    (including a physical distribution medium), accompanied by the+    Corresponding Source fixed on a durable physical medium+    customarily used for software interchange.++    b) Convey the object code in, or embodied in, a physical product+    (including a physical distribution medium), accompanied by a+    written offer, valid for at least three years and valid for as+    long as you offer spare parts or customer support for that product+    model, to give anyone who possesses the object code either (1) a+    copy of the Corresponding Source for all the software in the+    product that is covered by this License, on a durable physical+    medium customarily used for software interchange, for a price no+    more than your reasonable cost of physically performing this+    conveying of source, or (2) access to copy the+    Corresponding Source from a network server at no charge.++    c) Convey individual copies of the object code with a copy of the+    written offer to provide the Corresponding Source.  This+    alternative is allowed only occasionally and noncommercially, and+    only if you received the object code with such an offer, in accord+    with subsection 6b.++    d) Convey the object code by offering access from a designated+    place (gratis or for a charge), and offer equivalent access to the+    Corresponding Source in the same way through the same place at no+    further charge.  You need not require recipients to copy the+    Corresponding Source along with the object code.  If the place to+    copy the object code is a network server, the Corresponding Source+    may be on a different server (operated by you or a third party)+    that supports equivalent copying facilities, provided you maintain+    clear directions next to the object code saying where to find the+    Corresponding Source.  Regardless of what server hosts the+    Corresponding Source, you remain obligated to ensure that it is+    available for as long as needed to satisfy these requirements.++    e) Convey the object code using peer-to-peer transmission, provided+    you inform other peers where the object code and Corresponding+    Source of the work are being offered to the general public at no+    charge under subsection 6d.++  A separable portion of the object code, whose source code is excluded+from the Corresponding Source as a System Library, need not be+included in conveying the object code work.++  A "User Product" is either (1) a "consumer product", which means any+tangible personal property which is normally used for personal, family,+or household purposes, or (2) anything designed or sold for incorporation+into a dwelling.  In determining whether a product is a consumer product,+doubtful cases shall be resolved in favor of coverage.  For a particular+product received by a particular user, "normally used" refers to a+typical or common use of that class of product, regardless of the status+of the particular user or of the way in which the particular user+actually uses, or expects or is expected to use, the product.  A product+is a consumer product regardless of whether the product has substantial+commercial, industrial or non-consumer uses, unless such uses represent+the only significant mode of use of the product.++  "Installation Information" for a User Product means any methods,+procedures, authorization keys, or other information required to install+and execute modified versions of a covered work in that User Product from+a modified version of its Corresponding Source.  The information must+suffice to ensure that the continued functioning of the modified object+code is in no case prevented or interfered with solely because+modification has been made.++  If you convey an object code work under this section in, or with, or+specifically for use in, a User Product, and the conveying occurs as+part of a transaction in which the right of possession and use of the+User Product is transferred to the recipient in perpetuity or for a+fixed term (regardless of how the transaction is characterized), the+Corresponding Source conveyed under this section must be accompanied+by the Installation Information.  But this requirement does not apply+if neither you nor any third party retains the ability to install+modified object code on the User Product (for example, the work has+been installed in ROM).++  The requirement to provide Installation Information does not include a+requirement to continue to provide support service, warranty, or updates+for a work that has been modified or installed by the recipient, or for+the User Product in which it has been modified or installed.  Access to a+network may be denied when the modification itself materially and+adversely affects the operation of the network or violates the rules and+protocols for communication across the network.++  Corresponding Source conveyed, and Installation Information provided,+in accord with this section must be in a format that is publicly+documented (and with an implementation available to the public in+source code form), and must require no special password or key for+unpacking, reading or copying.++  7. Additional Terms.++  "Additional permissions" are terms that supplement the terms of this+License by making exceptions from one or more of its conditions.+Additional permissions that are applicable to the entire Program shall+be treated as though they were included in this License, to the extent+that they are valid under applicable law.  If additional permissions+apply only to part of the Program, that part may be used separately+under those permissions, but the entire Program remains governed by+this License without regard to the additional permissions.++  When you convey a copy of a covered work, you may at your option+remove any additional permissions from that copy, or from any part of+it.  (Additional permissions may be written to require their own+removal in certain cases when you modify the work.)  You may place+additional permissions on material, added by you to a covered work,+for which you have or can give appropriate copyright permission.++  Notwithstanding any other provision of this License, for material you+add to a covered work, you may (if authorized by the copyright holders of+that material) supplement the terms of this License with terms:++    a) Disclaiming warranty or limiting liability differently from the+    terms of sections 15 and 16 of this License; or++    b) Requiring preservation of specified reasonable legal notices or+    author attributions in that material or in the Appropriate Legal+    Notices displayed by works containing it; or++    c) Prohibiting misrepresentation of the origin of that material, or+    requiring that modified versions of such material be marked in+    reasonable ways as different from the original version; or++    d) Limiting the use for publicity purposes of names of licensors or+    authors of the material; or++    e) Declining to grant rights under trademark law for use of some+    trade names, trademarks, or service marks; or++    f) Requiring indemnification of licensors and authors of that+    material by anyone who conveys the material (or modified versions of+    it) with contractual assumptions of liability to the recipient, for+    any liability that these contractual assumptions directly impose on+    those licensors and authors.++  All other non-permissive additional terms are considered "further+restrictions" within the meaning of section 10.  If the Program as you+received it, or any part of it, contains a notice stating that it is+governed by this License along with a term that is a further+restriction, you may remove that term.  If a license document contains+a further restriction but permits relicensing or conveying under this+License, you may add to a covered work material governed by the terms+of that license document, provided that the further restriction does+not survive such relicensing or conveying.++  If you add terms to a covered work in accord with this section, you+must place, in the relevant source files, a statement of the+additional terms that apply to those files, or a notice indicating+where to find the applicable terms.++  Additional terms, permissive or non-permissive, may be stated in the+form of a separately written license, or stated as exceptions;+the above requirements apply either way.++  8. Termination.++  You may not propagate or modify a covered work except as expressly+provided under this License.  Any attempt otherwise to propagate or+modify it is void, and will automatically terminate your rights under+this License (including any patent licenses granted under the third+paragraph of section 11).++  However, if you cease all violation of this License, then your+license from a particular copyright holder is reinstated (a)+provisionally, unless and until the copyright holder explicitly and+finally terminates your license, and (b) permanently, if the copyright+holder fails to notify you of the violation by some reasonable means+prior to 60 days after the cessation.++  Moreover, your license from a particular copyright holder is+reinstated permanently if the copyright holder notifies you of the+violation by some reasonable means, this is the first time you have+received notice of violation of this License (for any work) from that+copyright holder, and you cure the violation prior to 30 days after+your receipt of the notice.++  Termination of your rights under this section does not terminate the+licenses of parties who have received copies or rights from you under+this License.  If your rights have been terminated and not permanently+reinstated, you do not qualify to receive new licenses for the same+material under section 10.++  9. Acceptance Not Required for Having Copies.++  You are not required to accept this License in order to receive or+run a copy of the Program.  Ancillary propagation of a covered work+occurring solely as a consequence of using peer-to-peer transmission+to receive a copy likewise does not require acceptance.  However,+nothing other than this License grants you permission to propagate or+modify any covered work.  These actions infringe copyright if you do+not accept this License.  Therefore, by modifying or propagating a+covered work, you indicate your acceptance of this License to do so.++  10. Automatic Licensing of Downstream Recipients.++  Each time you convey a covered work, the recipient automatically+receives a license from the original licensors, to run, modify and+propagate that work, subject to this License.  You are not responsible+for enforcing compliance by third parties with this License.++  An "entity transaction" is a transaction transferring control of an+organization, or substantially all assets of one, or subdividing an+organization, or merging organizations.  If propagation of a covered+work results from an entity transaction, each party to that+transaction who receives a copy of the work also receives whatever+licenses to the work the party's predecessor in interest had or could+give under the previous paragraph, plus a right to possession of the+Corresponding Source of the work from the predecessor in interest, if+the predecessor has it or can get it with reasonable efforts.++  You may not impose any further restrictions on the exercise of the+rights granted or affirmed under this License.  For example, you may+not impose a license fee, royalty, or other charge for exercise of+rights granted under this License, and you may not initiate litigation+(including a cross-claim or counterclaim in a lawsuit) alleging that+any patent claim is infringed by making, using, selling, offering for+sale, or importing the Program or any portion of it.++  11. Patents.++  A "contributor" is a copyright holder who authorizes use under this+License of the Program or a work on which the Program is based.  The+work thus licensed is called the contributor's "contributor version".++  A contributor's "essential patent claims" are all patent claims+owned or controlled by the contributor, whether already acquired or+hereafter acquired, that would be infringed by some manner, permitted+by this License, of making, using, or selling its contributor version,+but do not include claims that would be infringed only as a+consequence of further modification of the contributor version.  For+purposes of this definition, "control" includes the right to grant+patent sublicenses in a manner consistent with the requirements of+this License.++  Each contributor grants you a non-exclusive, worldwide, royalty-free+patent license under the contributor's essential patent claims, to+make, use, sell, offer for sale, import and otherwise run, modify and+propagate the contents of its contributor version.++  In the following three paragraphs, a "patent license" is any express+agreement or commitment, however denominated, not to enforce a patent+(such as an express permission to practice a patent or covenant not to+sue for patent infringement).  To "grant" such a patent license to a+party means to make such an agreement or commitment not to enforce a+patent against the party.++  If you convey a covered work, knowingly relying on a patent license,+and the Corresponding Source of the work is not available for anyone+to copy, free of charge and under the terms of this License, through a+publicly available network server or other readily accessible means,+then you must either (1) cause the Corresponding Source to be so+available, or (2) arrange to deprive yourself of the benefit of the+patent license for this particular work, or (3) arrange, in a manner+consistent with the requirements of this License, to extend the patent+license to downstream recipients.  "Knowingly relying" means you have+actual knowledge that, but for the patent license, your conveying the+covered work in a country, or your recipient's use of the covered work+in a country, would infringe one or more identifiable patents in that+country that you have reason to believe are valid.++  If, pursuant to or in connection with a single transaction or+arrangement, you convey, or propagate by procuring conveyance of, a+covered work, and grant a patent license to some of the parties+receiving the covered work authorizing them to use, propagate, modify+or convey a specific copy of the covered work, then the patent license+you grant is automatically extended to all recipients of the covered+work and works based on it.++  A patent license is "discriminatory" if it does not include within+the scope of its coverage, prohibits the exercise of, or is+conditioned on the non-exercise of one or more of the rights that are+specifically granted under this License.  You may not convey a covered+work if you are a party to an arrangement with a third party that is+in the business of distributing software, under which you make payment+to the third party based on the extent of your activity of conveying+the work, and under which the third party grants, to any of the+parties who would receive the covered work from you, a discriminatory+patent license (a) in connection with copies of the covered work+conveyed by you (or copies made from those copies), or (b) primarily+for and in connection with specific products or compilations that+contain the covered work, unless you entered into that arrangement,+or that patent license was granted, prior to 28 March 2007.++  Nothing in this License shall be construed as excluding or limiting+any implied license or other defenses to infringement that may+otherwise be available to you under applicable patent law.++  12. No Surrender of Others' Freedom.++  If conditions are imposed on you (whether by court order, agreement or+otherwise) that contradict the conditions of this License, they do not+excuse you from the conditions of this License.  If you cannot convey a+covered work so as to satisfy simultaneously your obligations under this+License and any other pertinent obligations, then as a consequence you may+not convey it at all.  For example, if you agree to terms that obligate you+to collect a royalty for further conveying from those to whom you convey+the Program, the only way you could satisfy both those terms and this+License would be to refrain entirely from conveying the Program.++  13. Use with the GNU Affero General Public License.++  Notwithstanding any other provision of this License, you have+permission to link or combine any covered work with a work licensed+under version 3 of the GNU Affero General Public License into a single+combined work, and to convey the resulting work.  The terms of this+License will continue to apply to the part which is the covered work,+but the special requirements of the GNU Affero General Public License,+section 13, concerning interaction through a network will apply to the+combination as such.++  14. Revised Versions of this License.++  The Free Software Foundation may publish revised and/or new versions of+the GNU General Public License from time to time.  Such new versions will+be similar in spirit to the present version, but may differ in detail to+address new problems or concerns.++  Each version is given a distinguishing version number.  If the+Program specifies that a certain numbered version of the GNU General+Public License "or any later version" applies to it, you have the+option of following the terms and conditions either of that numbered+version or of any later version published by the Free Software+Foundation.  If the Program does not specify a version number of the+GNU General Public License, you may choose any version ever published+by the Free Software Foundation.++  If the Program specifies that a proxy can decide which future+versions of the GNU General Public License can be used, that proxy's+public statement of acceptance of a version permanently authorizes you+to choose that version for the Program.++  Later license versions may give you additional or different+permissions.  However, no additional obligations are imposed on any+author or copyright holder as a result of your choosing to follow a+later version.++  15. Disclaimer of Warranty.++  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.++  16. Limitation of Liability.++  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF+SUCH DAMAGES.++  17. Interpretation of Sections 15 and 16.++  If the disclaimer of warranty and limitation of liability provided+above cannot be given local legal effect according to their terms,+reviewing courts shall apply local law that most closely approximates+an absolute waiver of all civil liability in connection with the+Program, unless a warranty or assumption of liability accompanies a+copy of the Program in return for a fee.++                     END OF TERMS AND CONDITIONS++            How to Apply These Terms to Your New Programs++  If you develop a new program, and you want it to be of the greatest+possible use to the public, the best way to achieve this is to make it+free software which everyone can redistribute and change under these terms.++  To do so, attach the following notices to the program.  It is safest+to attach them to the start of each source file to most effectively+state the exclusion of warranty; and each file should have at least+the "copyright" line and a pointer to where the full notice is found.++    <one line to give the program's name and a brief idea of what it does.>+    Copyright (C) <year>  <name of author>++    This program is free software: you can redistribute it and/or modify+    it under the terms of the GNU General Public License as published by+    the Free Software Foundation, either version 3 of the License, or+    (at your option) any later version.++    This program is distributed in the hope that it will be useful,+    but WITHOUT ANY WARRANTY; without even the implied warranty of+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the+    GNU General Public License for more details.++    You should have received a copy of the GNU General Public License+    along with this program.  If not, see <http://www.gnu.org/licenses/>.++Also add information on how to contact you by electronic and paper mail.++  If the program does terminal interaction, make it output a short+notice like this when it starts in an interactive mode:++    <program>  Copyright (C) <year>  <name of author>+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.+    This is free software, and you are welcome to redistribute it+    under certain conditions; type `show c' for details.++The hypothetical commands `show w' and `show c' should show the appropriate+parts of the General Public License.  Of course, your program's commands+might be different; for a GUI interface, you would use an "about box".++  You should also get your employer (if you work as a programmer) or school,+if any, to sign a "copyright disclaimer" for the program, if necessary.+For more information on this, and how to apply and follow the GNU GPL, see+<http://www.gnu.org/licenses/>.++  The GNU General Public License does not permit incorporating your program+into proprietary programs.  If your program is a subroutine library, you+may consider it more useful to permit linking proprietary applications with+the library.  If this is what you want to do, use the GNU Lesser General+Public License instead of this License.  But first, please read+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

@@ -1,21 +1,22 @@ Name:              hosc-Version:           0.18.1+Version:           0.19 Synopsis:          Haskell Open Sound Control Description:       @hosc@ implements a subset of the Open Sound Control                    byte protocol, <http://opensoundcontrol.org/>.                    .                    See "Sound.OSC.Core" or "Sound.OSC" or "Sound.OSC.FD". License:           GPL-3+License-File:      contrib/LICENSE Category:          Sound-Copyright:         (c) Rohan Drape, Stefan Kersten and others, 2007-2020+Copyright:         (c) Rohan Drape, Stefan Kersten and others, 2007-2021 Author:            Rohan Drape, Stefan Kersten Maintainer:        rd@rohandrape.net Stability:         Experimental Homepage:          http://rohandrape.net/t/hosc-Tested-With:       GHC == 8.6.5+Tested-With:       GHC == 8.8.4 Build-Type:        Simple Cabal-Version:     >= 1.10-Data-Files:        README+Data-Files:        README.md  Library   Build-Depends:   base >= 4.8 && < 5,@@ -28,8 +29,6 @@                    transformers   Default-Language:Haskell2010   GHC-Options:     -Wall -fwarn-tabs-  if impl(ghc < 8.4)-    cpp-options: -DIMPORT_SEMIGROUP   Exposed-modules: Sound.OSC                    Sound.OSC.Coding.Byte                    Sound.OSC.Coding.Cast@@ -51,4 +50,4 @@  Source-Repository  head   Type:            git-  Location:        https://github.com/rd--/hosc.git+  Location:        https://gitlab.com/rd--/hosc