From 4e132b827e79a66c52dc83cd9247efc304e04f62 Mon Sep 17 00:00:00 2001
From: Matt Kane <mkb-prime@hydrogenproject.com>
Date: Wed, 1 Jun 2011 08:34:42 -0400
Subject: [PATCH] lib and client both compile

---
 client/example_client.go | 44 ++++++++++++++++++----------------------
 lib/osc.go               | 30 ++++++++++++++++++++++++---
 2 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/client/example_client.go b/client/example_client.go
index 0e128cf..dc12029 100644
--- a/client/example_client.go
+++ b/client/example_client.go
@@ -6,7 +6,6 @@ import (
 	"osc"
 	"flag"
 	"fmt"
-	"unsafe"
 )
 
 var testdata string = "ABCDE"
@@ -28,35 +27,32 @@ func main() {
 			fmt.Printf("OSC error %d: %s\n", t.Errno(), t.Errstr())
 		}
 	} else {
-	    m := make(osc.Message, 0)
-	    m = append(m, 0.12345678)
-	    C.lo_message_add_float(m, _Ctype_float(23.0))
-		if C.lo_send_message(t, C.CString("/foo/bar"), m) == -1 {
-			fmt.Printf("OSC error %d: %s\n", C.lo_address_errno(t), C.GoString(C.lo_address_errstr(t)))
+	    m := new(osc.Message)
+	    *m = make(osc.Message, 0)
+	    m = m.Add(0.12345678)
+	    m = m.Add(23.0)
+		if m.Send(t, "/foo/bar") == -1 {
+			fmt.Printf("OSC error %d: %s\n", t.Errno(), t.Errstr())
 		}
-		C.lo_message_free(m)
 
-	    m = C.lo_message_new()
+	    *m = make(osc.Message, 0)
 		/* send a message to /a/b/c/d with a mixtrure of float and string
 		 * arguments */
-		 C.lo_message_add_string(m, C.CString("one"))
- 	    C.lo_message_add_float(m, _Ctype_float(0.12345678))
-		 C.lo_message_add_string(m, C.CString("three"))
- 	    C.lo_message_add_float(m, _Ctype_float(0.00000023001))
- 	    C.lo_message_add_float(m, _Ctype_float(1.0))
-		C.lo_send_message(t, C.CString("/a/b/c/d"), m)
-		C.lo_message_free(m)
-
-	    m = C.lo_message_new()
+		m = m.Add("one")
+    	m = m.Add(0.12345678)
+		m = m.Add("three")
+ 	    m = m.Add(0.00000023001)
+ 	    m = m.Add(1.0)
+		m.Send(t, "/a/b/c/d")
+
+	    *m = make(osc.Message, 0)
 		/* send a 'blob' object to /a/b/c/d */
-		C.lo_message_add_blob(m, btest)
-		C.lo_send_message(t, C.CString("/a/b/c/d"), m)
-		C.lo_message_free(m)
+		m = m.Add(btest)
+		m.Send(t, "/a/b/c/d")
 
 		/* send a jamin scene change instruction with a 32bit integer argument */
-	    m = C.lo_message_new()
-	    C.lo_message_add_int32(m, _Ctypedef_int32_t(2))
-		C.lo_send_message(t, C.CString("/jamin/scene"), m)
-		C.lo_message_free(m)
+	    *m = make(osc.Message, 0)
+	    m = m.Add(2)
+		m.Send(t, "/jamin/scene")
 	}
 }
diff --git a/lib/osc.go b/lib/osc.go
index 5870117..672d42f 100644
--- a/lib/osc.go
+++ b/lib/osc.go
@@ -51,10 +51,21 @@ func (this *InfinitumType) GetValue() interface{} {
 type goTypeWrapper struct {
     Arg
     value interface{} 
+    vtype OscType
 }
 
-func (this *goTypeWrapper) GetType() (o OscType) {
-    switch i := this.value.(type) {
+func (this *goTypeWrapper) GetType() OscType {
+    return this.vtype
+}
+
+func (this *goTypeWrapper) GetValue() (interface{}) {
+    return this.value
+}
+
+func newWrapper(in interface{}) (out *goTypeWrapper) {
+    out = new(goTypeWrapper)
+    var o OscType
+    switch i := in.(type) {
     case int32:
         o = Int32
     case float32:
@@ -75,7 +86,7 @@ func (this *goTypeWrapper) GetType() (o OscType) {
     case MidiMsg:
         o = MidiMsgCode
     case bool:
-        if i, _ := this.value.(bool); i {
+        if ii, _ := in.(bool); ii {
             o = True
         } else {
             o = False
@@ -83,7 +94,11 @@ func (this *goTypeWrapper) GetType() (o OscType) {
     case nil:
         o = Nil
         // no way to detect infinitum
+    default:
+        return nil
     }
+    out.value = in
+    out.vtype = o
     return
 }
 
@@ -196,6 +211,15 @@ type Blob []byte
 /* why use the message type before it's time to send it? */
 type Message []Arg
  
+func (this *Message) Add(e interface{}) (out *Message) {
+    ee := newWrapper(e)
+    if ee != nil {
+        m := append(*this, ee)
+        return &m
+    }
+    return this
+}
+
 func (this *Message) Send(targ *Address, path string) (ret int) {
     ret = this.SendTimestamped(targ, Now, path)
     return