Skip to content

Commit

Permalink
Bump github.com/sasha-s/go-deadlock from 0.2.0 to 0.3.1
Browse files Browse the repository at this point in the history
Bumps [github.com/sasha-s/go-deadlock](https://github.com/sasha-s/go-deadlock) from 0.2.0 to 0.3.1.
- [Release notes](https://github.com/sasha-s/go-deadlock/releases)
- [Commits](sasha-s/go-deadlock@v0.2.0...v0.3.1)

---
updated-dependencies:
- dependency-name: github.com/sasha-s/go-deadlock
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
  • Loading branch information
dependabot[bot] authored and iphydf committed Dec 28, 2021
1 parent ac58790 commit 06ce683
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
cirrus-ci_task:
container:
image: toxchat/toktok-stack:0.0.27-third_party
image: toxchat/toktok-stack:0.0.31-third_party
cpu: 2
memory: 4G
configure_script:
Expand Down
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module github.com/TokTok/go-toxcore-c
go 1.12

require (
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
github.com/sasha-s/go-deadlock v0.2.0
github.com/sasha-s/go-deadlock v0.3.1
github.com/streamrail/concurrent-map v0.0.0-20160823150647-8bf1e9bacbf6
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
github.com/sasha-s/go-deadlock v0.2.0 h1:lMqc+fUb7RrFS3gQLtoQsJ7/6TV/pAIFvBsqX73DK8Y=
github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10=
github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
github.com/streamrail/concurrent-map v0.0.0-20160823150647-8bf1e9bacbf6 h1:XklXvOrWxWCDX2n4vdEQWkjuIP820XD6C4kF0O0FzH4=
github.com/streamrail/concurrent-map v0.0.0-20160823150647-8bf1e9bacbf6/go.mod h1:yqDD2twFAqxvvH5gtpwwgLsj5L1kbNwtoPoDOwBzXcs=
8 changes: 8 additions & 0 deletions tox_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,10 @@ func TestCommunication(t *testing.T) {
opts.ThreadSafe = true
opts.Tcp_port = 34567
_t1 := NewTox(opts)
if _t1 == nil {
t.Error("NewTox failed")
}
defer _t1.Kill()
log.Println(_t1)
go func() {
for {
Expand All @@ -926,6 +930,10 @@ func TestCommunication(t *testing.T) {
opts2.ThreadSafe = true
opts2.Tcp_port = 34568
_t2 := NewTox(opts2)
if _t2 == nil {
t.Error("NewTox failed")
}
defer _t2.Kill()
log.Println(_t2)
_t2.CallbackGroupInviteAdd(func(_ *Tox, friendNumber uint32, itype uint8, data string, userData interface{}) {
log.Println(friendNumber, itype)
Expand Down
4 changes: 2 additions & 2 deletions toxav.go
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ func callbackAudioForC(m *C.Tox, groupnumber C.uint32_t, peernumber C.uint32_t,
}

func (this *Tox) AddAVGroupChat(cbfn cb_audio_ftype) uint32 {
r := C.toxav_add_av_groupchat(this.toxcore, (*[0]byte)(unsafe.Pointer(C.callbackAudioForC)), nil)
r := C.toxav_add_av_groupchat(this.toxcore, (*C.toxav_audio_data_cb)(unsafe.Pointer(C.callbackAudioForC)), nil)
if cbfn != nil {
this.cb_audios[uint32(r)] = cbfn
}
Expand All @@ -335,7 +335,7 @@ func (this *Tox) JoinAVGroupChat(friendNumber uint32, cookie string, cbfn cb_aud
var _length = C.uint16_t(length)

r := C.toxav_join_av_groupchat(this.toxcore, _fn, _data, _length,
(*[0]byte)(unsafe.Pointer(C.callbackAudioForC)), nil)
(*C.toxav_audio_data_cb)(unsafe.Pointer(C.callbackAudioForC)), nil)
if int(r) == -1 {
return uint32(r), errors.New("Join av group chat failed")
}
Expand Down

0 comments on commit 06ce683

Please sign in to comment.