jwetzell/osc-go
1
0
Fork 0
mirror of https://github.com/jwetzell/osc-go.git synced 2026-08-22 06:48:59 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

clean out error return from funcs that don't return error

Browse Source 
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
Joel Wetzell
2026-04-29 13:46:43 -05:00
parent 0c4d36b376
commit d8dff0794a
2 changed files with 33 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundle.go
+2 -8
View File
@@ -8,10 +8,7 @@ func (b *OSCBundle) ToBytes() ([]byte, error) {
bytes := stringToOSCBytes("#bundle") bytes := stringToOSCBytes("#bundle")
timeTagBytes, err := timeTagToOSCBytes(b.TimeTag) timeTagBytes := timeTagToOSCBytes(b.TimeTag)
if err != nil {
return nil, err
}
bytes = append(bytes, timeTagBytes...) bytes = append(bytes, timeTagBytes...)
for _, packet := range b.Contents { for _, packet := range b.Contents {
@@ -21,10 +18,7 @@ func (b *OSCBundle) ToBytes() ([]byte, error) {
} }
packetLength := len(packetBytes) packetLength := len(packetBytes)
packetLengthBytes, err := int32ToOSCBytes(int32(packetLength)) packetLengthBytes := int32ToOSCBytes(int32(packetLength))
if err != nil {
return nil, err
}
bytes = append(bytes, packetLengthBytes...) bytes = append(bytes, packetLengthBytes...)
bytes = append(bytes, packetBytes...) bytes = append(bytes, packetBytes...)
} }
osc.go
+31 -88
View File
@@ -25,16 +25,16 @@ func stringToOSCBytes(rawString string) []byte {
return []byte(sb.String()) return []byte(sb.String())
} }
func int32ToOSCBytes(number int32) ([]byte, error) { func int32ToOSCBytes(number int32) []byte {
bytes := make([]byte, 4) bytes := make([]byte, 4)
bytes[0] = byte((number >> 24) & 0xFF) bytes[0] = byte((number >> 24) & 0xFF)
bytes[1] = byte((number >> 16) & 0xFF) bytes[1] = byte((number >> 16) & 0xFF)
bytes[2] = byte((number >> 8) & 0xFF) bytes[2] = byte((number >> 8) & 0xFF)
bytes[3] = byte(number & 0xFF) bytes[3] = byte(number & 0xFF)
return bytes, nil return bytes
} }
func int64ToOSCBytes(number int64) ([]byte, error) { func int64ToOSCBytes(number int64) []byte {
bytes := make([]byte, 8) bytes := make([]byte, 8)
bytes[0] = byte((number >> 56) & 0xFF) bytes[0] = byte((number >> 56) & 0xFF)
bytes[1] = byte((number >> 48) & 0xFF) bytes[1] = byte((number >> 48) & 0xFF)
@@ -44,29 +44,26 @@ func int64ToOSCBytes(number int64) ([]byte, error) {
bytes[5] = byte((number >> 16) & 0xFF) bytes[5] = byte((number >> 16) & 0xFF)
bytes[6] = byte((number >> 8) & 0xFF) bytes[6] = byte((number >> 8) & 0xFF)
bytes[7] = byte(number & 0xFF) bytes[7] = byte(number & 0xFF)
return bytes, nil return bytes
} }
func float32ToOSCBytes(number float32) ([]byte, error) { func float32ToOSCBytes(number float32) []byte {
bytes := make([]byte, 4) bytes := make([]byte, 4)
binary.BigEndian.PutUint32(bytes, math.Float32bits(number)) binary.BigEndian.PutUint32(bytes, math.Float32bits(number))
return bytes, nil return bytes
} }
func float64ToOSCBytes(number float64) ([]byte, error) { func float64ToOSCBytes(number float64) []byte {
bytes := make([]byte, 8) bytes := make([]byte, 8)
binary.BigEndian.PutUint64(bytes, math.Float64bits(number)) binary.BigEndian.PutUint64(bytes, math.Float64bits(number))
return bytes, nil return bytes
} }
func byteArrayToOSCBytes(bytes []byte) ([]byte, error) { func byteArrayToOSCBytes(bytes []byte) []byte {
oscBytes := []byte{} oscBytes := []byte{}
bytesSize := len(bytes) bytesSize := len(bytes)
bytesSizeBytes, err := int32ToOSCBytes(int32(bytesSize)) bytesSizeBytes := int32ToOSCBytes(int32(bytesSize))
if err != nil {
return nil, err
}
oscBytes = append(oscBytes, bytesSizeBytes...) oscBytes = append(oscBytes, bytesSizeBytes...)
oscBytes = append(oscBytes, bytes...) oscBytes = append(oscBytes, bytes...)
@@ -77,21 +74,15 @@ func byteArrayToOSCBytes(bytes []byte) ([]byte, error) {
} }
} }
return oscBytes, nil return oscBytes
} }
func timeTagToOSCBytes(timeTag OSCTimeTag) ([]byte, error) { func timeTagToOSCBytes(timeTag OSCTimeTag) []byte {
timeTagBytes, err := int32ToOSCBytes(timeTag.seconds) timeTagBytes := int32ToOSCBytes(timeTag.seconds)
if err != nil { fractionalSecondsBytes := int32ToOSCBytes(timeTag.fractionalSeconds)
return nil, err
}
fractionalSecondsBytes, err := int32ToOSCBytes(timeTag.fractionalSeconds)
if err != nil {
return nil, err
}
timeTagBytes = append(timeTagBytes, fractionalSecondsBytes...) timeTagBytes = append(timeTagBytes, fractionalSecondsBytes...)
return timeTagBytes, nil return timeTagBytes
} }
func argsToBuffer(args []OSCArg) ([]byte, error) { func argsToBuffer(args []OSCArg) ([]byte, error) {
@@ -108,60 +99,36 @@ func argsToBuffer(args []OSCArg) ([]byte, error) {
} }
case "i": case "i":
if value, ok := arg.Value.(int); ok { if value, ok := arg.Value.(int); ok {
valueBytes, err := int32ToOSCBytes(int32(value)) valueBytes := int32ToOSCBytes(int32(value))
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else if value, ok := arg.Value.(int32); ok { } else if value, ok := arg.Value.(int32); ok {
valueBytes, err := int32ToOSCBytes(int32(value)) valueBytes := int32ToOSCBytes(int32(value))
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else { } else {
return nil, errors.New("OSC arg had int32 type but non-number value") return nil, errors.New("OSC arg had int32 type but non-number value")
} }
case "f": case "f":
if value, ok := arg.Value.(float32); ok { if value, ok := arg.Value.(float32); ok {
valueBytes, err := float32ToOSCBytes(value) valueBytes := float32ToOSCBytes(value)
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else if value, ok := arg.Value.(float64); ok { } else if value, ok := arg.Value.(float64); ok {
valueBytes, err := float32ToOSCBytes(float32(value)) valueBytes := float32ToOSCBytes(float32(value))
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else if value, ok := arg.Value.(int); ok { } else if value, ok := arg.Value.(int); ok {
valueBytes, err := float32ToOSCBytes(float32(value)) valueBytes := float32ToOSCBytes(float32(value))
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else if value, ok := arg.Value.(int32); ok { } else if value, ok := arg.Value.(int32); ok {
valueBytes, err := float32ToOSCBytes(float32(value)) valueBytes := float32ToOSCBytes(float32(value))
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else if value, ok := arg.Value.(int64); ok { } else if value, ok := arg.Value.(int64); ok {
valueBytes, err := float32ToOSCBytes(float32(value)) valueBytes := float32ToOSCBytes(float32(value))
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else { } else {
return nil, errors.New("OSC arg had float32 type but non-number value") return nil, errors.New("OSC arg had float32 type but non-number value")
} }
case "b": case "b":
if value, ok := arg.Value.([]byte); ok { if value, ok := arg.Value.([]byte); ok {
valueBytes, err := byteArrayToOSCBytes(value) valueBytes := byteArrayToOSCBytes(value)
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else { } else {
return nil, errors.New("OSC arg had blob type but non-blob value") return nil, errors.New("OSC arg had blob type but non-blob value")
@@ -185,56 +152,32 @@ func argsToBuffer(args []OSCArg) ([]byte, error) {
} }
case "h": case "h":
if value, ok := arg.Value.(int); ok { if value, ok := arg.Value.(int); ok {
valueBytes, err := int64ToOSCBytes(int64(value)) valueBytes := int64ToOSCBytes(int64(value))
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else if value, ok := arg.Value.(int32); ok { } else if value, ok := arg.Value.(int32); ok {
valueBytes, err := int64ToOSCBytes(int64(value)) valueBytes := int64ToOSCBytes(int64(value))
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else if value, ok := arg.Value.(int64); ok { } else if value, ok := arg.Value.(int64); ok {
valueBytes, err := int64ToOSCBytes(value) valueBytes := int64ToOSCBytes(value)
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else { } else {
return nil, errors.New("OSC arg had int64 type but non-number value") return nil, errors.New("OSC arg had int64 type but non-number value")
} }
case "d": case "d":
if value, ok := arg.Value.(float32); ok { if value, ok := arg.Value.(float32); ok {
valueBytes, err := float64ToOSCBytes(float64(value)) valueBytes := float64ToOSCBytes(float64(value))
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else if value, ok := arg.Value.(float64); ok { } else if value, ok := arg.Value.(float64); ok {
valueBytes, err := float64ToOSCBytes(value) valueBytes := float64ToOSCBytes(value)
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else if value, ok := arg.Value.(int); ok { } else if value, ok := arg.Value.(int); ok {
valueBytes, err := float64ToOSCBytes(float64(value)) valueBytes := float64ToOSCBytes(float64(value))
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else if value, ok := arg.Value.(int32); ok { } else if value, ok := arg.Value.(int32); ok {
valueBytes, err := float64ToOSCBytes(float64(value)) valueBytes := float64ToOSCBytes(float64(value))
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else if value, ok := arg.Value.(int64); ok { } else if value, ok := arg.Value.(int64); ok {
valueBytes, err := float64ToOSCBytes(float64(value)) valueBytes := float64ToOSCBytes(float64(value))
if err != nil {
return nil, err
}
argBuffers = append(argBuffers, valueBytes...) argBuffers = append(argBuffers, valueBytes...)
} else { } else {
return nil, errors.New("OSC arg had float64 type but non-number value") return nil, errors.New("OSC arg had float64 type but non-number value")