Skip to content

Commit

Permalink
debugging, wip
Browse files Browse the repository at this point in the history
  • Loading branch information
dmisol committed Sep 20, 2022
1 parent 11eb4b3 commit 25c9981
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 1 deletion.
8 changes: 8 additions & 0 deletions debugserver/srv.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@ func main() {
}
// Close the listener when the application closes.
defer l.Close()
log.Println("waiting for connections")
for {
// Listen for an incoming connection.
conn, err := l.Accept()
if err != nil {
log.Println("accepting: ", err.Error())
os.Exit(1)
}
log.Println("accepted", conn.RemoteAddr())
// Handle connections in a new goroutine.
go handler(conn)
}
Expand All @@ -47,11 +49,15 @@ func handler(conn net.Conn) {
}
var init *defs.InitialJson

log.Println("initial json read")

if err := json.Unmarshal(buf, init); err != nil {
log.Println("initial json", err)
return
}

log.Println("unmarshalled")

var started chan bool
go func() {
// wait for the first "audio" file
Expand All @@ -69,6 +75,7 @@ func handler(conn net.Conn) {
t := time.NewTicker(time.Nanosecond * time.Duration(dt))
defer t.Stop()

log.Println("image created")
index := 0
for {
<-t.C
Expand All @@ -79,6 +86,7 @@ func handler(conn net.Conn) {
log.Println("senging png", err)
return
}
log.Println("file sent", name)
}
}()

Expand Down
3 changes: 2 additions & 1 deletion dummyclient/play.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ func Play(ctx context.Context, roomName string, botname string, filename string,
log.Println("audio pub", err)
return
}

<-ctx.Done()
room.Disconnect()
}

func publishFile(room *lksdk.Room, filename string, dur time.Duration) error {
Expand Down
4 changes: 4 additions & 0 deletions portal.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"io/ioutil"
"log"
"os"
"path"
"sync/atomic"
Expand Down Expand Up @@ -39,6 +40,7 @@ func NewPortal(name string) (ap *AnimationPortal, err error) {
PortalConf: &defs.PortalConf{},
}
if err = yaml.Unmarshal(cont, ap.PortalConf); err != nil {
log.Println("yaml err", name, err)
return
}

Expand All @@ -47,9 +49,11 @@ func NewPortal(name string) (ap *AnimationPortal, err error) {
jn = ap.PortalConf.DefaultInitJson
}
if cont, err = ioutil.ReadFile(jn); err != nil {
log.Println("file read err", jn, err)
return
}
if err = json.Unmarshal(cont, &ap.PortalConf.InitialJson); err != nil {
log.Println("json err", jn, err)
return
}
ap.PortalConf.InitialJson.Ftar = ap.PortalConf.DefaultFtar
Expand Down
Binary file added testdata/audio.ogg
Binary file not shown.
5 changes: 5 additions & 0 deletions testdata/init.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"fps": 24,
"width": 300,
"height": 500
}

0 comments on commit 25c9981

Please sign in to comment.