From f5bb702a9c741176066d8a6ebe647b498aec10bd Mon Sep 17 00:00:00 2001 From: Benjamin Jemlich Date: Sun, 2 Jan 2011 11:14:42 +0800 Subject: [PATCH] Select highest codec & hex output for version numbers The original implementation depends on Qt's behaviour that the items in a QMap are always sorted by their key. --- server.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server.go b/server.go index fddef92..6567f34 100644 --- a/server.go +++ b/server.go @@ -381,6 +381,9 @@ func (server *Server) updateCodecVersions() { count = users winner = codec } + if users == count && codec > winner { + winner = codec + } } var current int32 @@ -416,7 +419,7 @@ func (server *Server) updateCodecVersions() { return } - log.Printf("CELT codec switch %v %v (PreferAlpha %v)", server.AlphaCodec, server.BetaCodec, server.PreferAlphaCodec) + log.Printf("CELT codec switch %#x %#x (PreferAlpha %v)", uint32(server.AlphaCodec), uint32(server.BetaCodec), server.PreferAlphaCodec) return }