Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 3.1.0 #1

Merged
merged 35 commits into from
Feb 5, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3b53adc
[3.x] - Redesigned OSC networking objects with more comprehensive del…
sammysmallman Jul 18, 2021
68fea6e
Merge pull request #36 from sammysmallman/TUB-#26
sammysmallman Jul 18, 2021
cfdee58
[3.x] - Updated Readme
sammysmallman Jul 19, 2021
1b8f9bc
Merge pull request #37 from sammysmallman/readme
sammysmallman Jul 19, 2021
15f537e
Linting
sammysmallman Jul 18, 2021
56344d7
Merge pull request #38 from sammysmallman/linting
sammysmallman Jul 19, 2021
43c45e8
OSCUdpServer & OSCUdpClient conform to NSSecureCoding
sammysmallman Jul 20, 2021
0bef77d
Update README.md
sammysmallman Jul 20, 2021
9bd0112
Merge pull request #39 from sammysmallman/readme-patch
sammysmallman Jul 20, 2021
aea509b
Updated readme
sammysmallman Jul 20, 2021
379a3c5
Merge pull request #40 from sammysmallman/readme
sammysmallman Jul 20, 2021
b0e6cba
OSCTcpServer & OSCTcpClient conform to NSSecureCoding
sammysmallman Jul 20, 2021
a9df1f4
Merge pull request #41 from sammysmallman/NSSecureCoding
sammysmallman Jul 20, 2021
0790e98
Remove core OSC from transport
sammysmallman Jul 21, 2021
83f82c8
Send raw OSCPacket data from clients and TCP server
sammysmallman Jul 21, 2021
cfadb9c
Pulled out core OSC objects and depend on CoreOSC
sammysmallman Jul 22, 2021
d940876
Updated readme
sammysmallman Aug 9, 2021
c9a3811
Updated Tests and minor optimising
sammysmallman Aug 9, 2021
4e42acd
Added direction towards CoreOSC
sammysmallman Aug 14, 2021
20469ed
Added OSCUdpPeer with configuration and delegate
sammysmallman Sep 8, 2021
0a53f33
Minor tidy
sammysmallman Sep 8, 2021
f9d2888
Minor Tidy
sammysmallman Sep 8, 2021
092223a
Peers can send to a different port number as their sockets
sammysmallman Sep 12, 2021
1f11886
Added OSCUdpPeer with configuration and delegate
sammysmallman Oct 5, 2021
da2d388
Merge remote-tracking branch 'origin/OSCK-#42' into OSCK-#42
sammysmallman Oct 5, 2021
f76594e
Merge pull request #43 from sammysmallman/OSCK-#42
sammysmallman Oct 5, 2021
b10634a
Merge pull request #44 from sammysmallman/develop
sammysmallman Oct 5, 2021
8657543
Depend on stable version of CoreOSC
sammysmallman Oct 5, 2021
b19b862
Adding a parenthesis to a print statement
Jan 12, 2022
fbf67e8
Missed another parenthesis
Jan 12, 2022
7717e1d
Merge pull request #46 from maeganwilson/master
sammysmallman Jan 16, 2022
84dc82d
Create swift.yml
sammysmallman Jan 23, 2022
0ae6f86
First attempt at making UDPServer thread safe
sammysmallman Jan 21, 2022
7bce35d
Merge pull request #51 from sammysmallman/Issue-#48
sammysmallman Feb 3, 2022
d9ba6bf
Version 3.1.0
sammysmallman Feb 3, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated readme
  • Loading branch information
sammysmallman committed Aug 9, 2021
commit d9408764b0eaa645a41c2e65ecb8036bbd77ddbd
17 changes: 13 additions & 4 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,26 @@
"repositoryURL": "https://github.com/robbiehanson/CocoaAsyncSocket",
"state": {
"branch": null,
"revision": "0e00c967a010fc43ce528bd633d032f17158d393",
"version": "7.6.4"
"revision": "dbdc00669c1ced63b27c3c5f052ee4d28f10150c",
"version": "7.6.5"
}
},
{
"package": "CoreOSC",
"repositoryURL": "https://github.com/sammysmallman/CoreOSC",
"state": {
"branch": "main",
"revision": "8d2c689bea5928796057c917040c9cd6605c26f8",
"version": null
}
},
{
"package": "NetUtils",
"repositoryURL": "https://github.com/svdo/swift-netutils",
"state": {
"branch": null,
"revision": "d1251a380f41088547e4cfc8dc718a90c861a42b",
"version": "4.1.0"
"revision": "776909ce0b37bd9ea1fa0f2156e4e5ad07a592b8",
"version": "4.2.0"
}
}
]
Expand Down
21 changes: 15 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,13 @@ func client(_ client: OSCTcpClient,

Create an OSCPacket e.g. An OSC message:
```swift
let message = OSCMessage(with: "/osc/kit", arguments: [1,
3.142,
"hello world!"])
do {
let message = try OSCMessage(with: "/osc/kit", arguments: [1,
3.142,
"hello world!"])
} catch {
print("Unable to create OSCMessage: \(error.localizedDescription)")
}
```

<h4>Step 5</h4>
Expand Down Expand Up @@ -236,9 +240,14 @@ func client(_ client: OSCUdpClient,

Create an OSCPacket e.g. An OSC message:
```swift
let message = OSCMessage(with: "/osc/kit", arguments: [1,
3.142,
"hello world!"])
do {
let message = try OSCMessage(with: "/osc/kit", arguments: [1,
3.142,
"hello world!"])
} catch {
print("Unable to create OSCMessage: \(error.localizedDescription)")
}

```

<h4>Step 5</h4>
Expand Down
2 changes: 1 addition & 1 deletion Sources/OSCKit/OSCTcp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public enum OSCTcpStreamFraming: Int, Codable {

/// A helper object for OSC TCP operations.
internal struct OSCTcp {

private static let slipEnd: UInt8 = 0o0300 // indicates end of packet
private static let slipEsc: UInt8 = 0o0333 // indicates byte stuffing
private static let slipEscEnd: UInt8 = 0o0334 // ESC ESC_END means END data byte
Expand Down