update due to gumble API changes

diff --git a/barnard.go b/barnard.go
index 949c14dd80e3db9e383299956dd248cbe8f29d28..ef263f76035c6d6c5ef98ae7bee4bba98693f099 100644 (file)
--- a/barnard.go
+++ b/barnard.go
@@ -1,6 +1,8 @@
 package barnard
 
 import (
 package barnard
 
 import (

+       "crypto/tls"
+

        "github.com/layeh/barnard/uiterm"
        "github.com/layeh/gumble/gumble"
        "github.com/layeh/gumble/gumbleopenal"
        "github.com/layeh/barnard/uiterm"
        "github.com/layeh/gumble/gumble"
        "github.com/layeh/gumble/gumbleopenal"


@@ -10,6 +12,9 @@ type Barnard struct {
        Config *gumble.Config
        Client *gumble.Client
 
        Config *gumble.Config
        Client *gumble.Client
 

+       Address   string
+       TLSConfig tls.Config
+

        Stream *gumbleopenal.Stream
 
        Ui            *uiterm.Ui
        Stream *gumbleopenal.Stream
 
        Ui            *uiterm.Ui

diff --git a/client.go b/client.go
index 9ede8ced0313c2454f6edafdf16a4ed14976d739..8ef6d362e0fe362dc0221351ed2d4f07feb644c5 100644 (file)
--- a/client.go
+++ b/client.go
@@ -2,11 +2,40 @@ package barnard
 
 import (
        "fmt"
 
 import (
        "fmt"

+       "net"
+       "os"

 
        "github.com/layeh/gumble/gumble"
 
        "github.com/layeh/gumble/gumble"

+       "github.com/layeh/gumble/gumbleopenal"
+       "github.com/layeh/gumble/gumbleutil"

 )
 
 )
 

+func (b *Barnard) start() {
+       b.Config.Attach(gumbleutil.AutoBitrate)
+       b.Config.Attach(b)
+
+       var err error
+       _, err = gumble.DialWithDialer(new(net.Dialer), b.Address, b.Config, &b.TLSConfig)
+       if err != nil {
+               fmt.Fprintf(os.Stderr, "%s\n", err)
+               os.Exit(1)
+       }
+
+       // Audio
+       if os.Getenv("ALSOFT_LOGLEVEL") == "" {
+               os.Setenv("ALSOFT_LOGLEVEL", "0")
+       }
+       if stream, err := gumbleopenal.New(b.Client); err != nil {
+               fmt.Fprintf(os.Stderr, "%s\n", err)
+               os.Exit(1)
+       } else {
+               b.Stream = stream
+       }
+}
+

 func (b *Barnard) OnConnect(e *gumble.ConnectEvent) {
 func (b *Barnard) OnConnect(e *gumble.ConnectEvent) {

+       b.Client = e.Client
+

        b.Ui.SetActive(uiViewInput)
        b.UiTree.Rebuild()
        b.Ui.Refresh()
        b.Ui.SetActive(uiViewInput)
        b.UiTree.Rebuild()
        b.Ui.Refresh()


@@ -23,24 +52,6 @@ func (b *Barnard) OnDisconnect(e *gumble.DisconnectEvent) {
        switch e.Type {
        case gumble.DisconnectError:
                reason = "connection error"
        switch e.Type {
        case gumble.DisconnectError:
                reason = "connection error"

-       case gumble.DisconnectOther:
-               reason = e.String
-       case gumble.DisconnectVersion:
-               reason = "invalid version number"
-       case gumble.DisconnectUserName:
-               reason = "invalid user name"
-       case gumble.DisconnectUserCredentials:
-               reason = "incorrect user password/certificate"
-       case gumble.DisconnectServerPassword:
-               reason = "incorrect server password"
-       case gumble.DisconnectUsernameInUse:
-               reason = "user name in use"
-       case gumble.DisconnectServerFull:
-               reason = "server full"
-       case gumble.DisconnectNoCertificate:
-               reason = "missing certificate"
-       case gumble.DisconnectAuthenticatorFail:
-               reason = "authenticator verification failed"

        }
        if reason == "" {
                b.AddOutputLine("Disconnected")
        }
        if reason == "" {
                b.AddOutputLine("Disconnected")

diff --git a/cmd/barnard/main.go b/cmd/barnard/main.go
index 37a7baa9ffb0c5176ed62f3c0eaeb18018a6c59e..c23c2d620af92ccabe72c7476edfdb647a8e0e88 100644 (file)
--- a/cmd/barnard/main.go
+++ b/cmd/barnard/main.go
@@ -9,8 +9,6 @@ import (
        "github.com/layeh/barnard"
        "github.com/layeh/barnard/uiterm"
        "github.com/layeh/gumble/gumble"
        "github.com/layeh/barnard"
        "github.com/layeh/barnard/uiterm"
        "github.com/layeh/gumble/gumble"

-       "github.com/layeh/gumble/gumbleutil"
-       "github.com/layeh/gumble/gumbleopenal"

        _ "github.com/layeh/gumble/opus"
 )
 
        _ "github.com/layeh/gumble/opus"
 )
 


@@ -24,43 +22,25 @@ func main() {
        flag.Parse()
 
        // Initialize
        flag.Parse()
 
        // Initialize

-       b := barnard.Barnard{}
-       b.Ui = uiterm.New(&b)
+       b := barnard.Barnard{
+               Config: gumble.NewConfig(),
+               Address: *server,
+       }

 
 

-       // Gumble
-       b.Config = gumble.NewConfig()

        b.Config.Username = *username
        b.Config.Username = *username

-       b.Config.Address = *server
+

        if *insecure {
        if *insecure {

-               b.Config.TLSConfig.InsecureSkipVerify = true
+               b.TLSConfig.InsecureSkipVerify = true

        }
        if *certificate != "" {
        }
        if *certificate != "" {

-               if cert, err := tls.LoadX509KeyPair(*certificate, *certificate); err != nil {
+               cert, err := tls.LoadX509KeyPair(*certificate, *certificate)
+               if err != nil {

                        fmt.Fprintf(os.Stderr, "%s\n", err)
                        os.Exit(1)
                        fmt.Fprintf(os.Stderr, "%s\n", err)
                        os.Exit(1)

-               } else {
-                       b.Config.TLSConfig.Certificates = []tls.Certificate{cert}

                }
                }

+               b.TLSConfig.Certificates = append(b.TLSConfig.Certificates, cert)

        }
 
        }
 

-       b.Client = gumble.NewClient(b.Config)
-       b.Client.Attach(gumbleutil.AutoBitrate)
-       b.Client.Attach(&b)
-       // Audio
-       if os.Getenv("ALSOFT_LOGLEVEL") == "" {
-               os.Setenv("ALSOFT_LOGLEVEL", "0")
-       }
-       if stream, err := gumbleopenal.New(b.Client); err != nil {
-               fmt.Fprintf(os.Stderr, "%s\n", err)
-               os.Exit(1)
-       } else {
-               b.Stream = stream
-       }
-
-       if err := b.Client.Connect(); err != nil {
-               fmt.Fprintf(os.Stderr, "%s\n", err)
-               os.Exit(1)
-       }
-
+       b.Ui = uiterm.New(&b)

        b.Ui.Run()
 }
        b.Ui.Run()
 }

diff --git a/ui.go b/ui.go
index c1dc6a897b39cd69da5c564142c8c770ced6da4b..824dc8572afa9c3cb8fdb7e549931224c3a6e49b 100644 (file)
--- a/ui.go
+++ b/ui.go
@@ -156,6 +156,8 @@ func (b *Barnard) OnUiInitialize(ui *uiterm.Ui) {
        b.Ui.AddKeyListener(b.OnScrollOutputDown, uiterm.KeyPgdn)
        b.Ui.AddKeyListener(b.OnScrollOutputTop, uiterm.KeyHome)
        b.Ui.AddKeyListener(b.OnScrollOutputBottom, uiterm.KeyEnd)
        b.Ui.AddKeyListener(b.OnScrollOutputDown, uiterm.KeyPgdn)
        b.Ui.AddKeyListener(b.OnScrollOutputTop, uiterm.KeyHome)
        b.Ui.AddKeyListener(b.OnScrollOutputBottom, uiterm.KeyEnd)

+
+       b.start()

 }
 
 func (b *Barnard) OnUiResize(ui *uiterm.Ui, width, height int) {
 }
 
 func (b *Barnard) OnUiResize(ui *uiterm.Ui, width, height int) {

diff --git a/ui_tree.go b/ui_tree.go
index d164cbd23f234151fbd0c98ad79abdee26ae0c0d..c3abff94beac23e372b7f0b9dcd488aace764166 100644 (file)
--- a/ui_tree.go
+++ b/ui_tree.go
@@ -38,6 +38,10 @@ func (b *Barnard) TreeItemSelect(ui *uiterm.Ui, tree *uiterm.Tree, item uiterm.T
 }
 
 func (b *Barnard) TreeItem(item uiterm.TreeItem) []uiterm.TreeItem {
 }
 
 func (b *Barnard) TreeItem(item uiterm.TreeItem) []uiterm.TreeItem {

+       if b.Client == nil {
+               return nil
+       }
+

        var treeItem TreeItem
        if ti, ok := item.(TreeItem); !ok {
                root := b.Client.Channels[0]
        var treeItem TreeItem
        if ti, ok := item.(TreeItem); !ok {
                root := b.Client.Channels[0]