diff --git a/debian/changelog b/debian/changelog index cd52a0c2190389dd241750191b5e5b3dc4547897..7a8e8a56958bc533931ac99b53e1d4a025c509dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +autoradio (0.2-2) unstable; urgency=low + + * Attempt to increase compatibility of the generated icecast configuration. + + -- ale <ale@incal.net> Sun, 22 Dec 2013 19:07:30 +0000 + autoradio (0.2-1) unstable; urgency=low * Fixes to packaging scripts. diff --git a/node/icecast_config.go b/node/icecast_config.go index 895df028d470dcb3dddf1ced89039caa253ee378..de2edc0051523cfafc3635c1184eb83be44ad07c 100644 --- a/node/icecast_config.go +++ b/node/icecast_config.go @@ -21,12 +21,12 @@ var ( type iceLimitsConfig struct { Clients int `xml:"clients"` Sources int `xml:"sources"` - Threadpool int `xml:"threadpool"` + // Threadpool int `xml:"threadpool"` QueueSize int `xml:"queue-size"` ClientTimeout int `xml:"client-timeout"` HeaderTimeout int `xml:"header-timeout"` SourceTimeout int `xml:"source-timeout"` - BurstOnConnect int `xml:"burst-on-connect"` + // BurstOnConnect int `xml:"burst-on-connect"` BurstSize int `xml:"burst-size"` } @@ -79,7 +79,7 @@ type iceMountConfig struct { FallbackMount string `xml:"fallback-mount,omitempty"` FallbackOverride int `xml:"fallback-override,omitempty"` Hidden int `xml:"hidden"` - NoYp int `xml:"no-yp"` + // NoYp int `xml:"no-yp"` OnConnect string `xml:"on-connect,omitempty"` OnDisconnect string `xml:"on-disconnect,omitempty"` } @@ -125,12 +125,12 @@ func defaultDebianConfig(publicIp string) *icecastConfig { Limits: iceLimitsConfig{ Clients: maxClients, Sources: maxClients / 2, - Threadpool: 16, + // Threadpool: 16, QueueSize: 1 << 20, ClientTimeout: 30, HeaderTimeout: 15, SourceTimeout: 60, - BurstOnConnect: 1, + // BurstOnConnect: 1, BurstSize: 65535, }, Auth: iceAuthenticationConfig{ @@ -200,9 +200,9 @@ func mountToConfig(m *autoradio.Mount) iceMountConfig { Name: m.Name, Username: m.Username, Password: m.Password, + Hidden: 0, // MaxListeners: 1000, - Hidden: 0, - NoYp: 1, + // NoYp: 1, } if m.Fallback != "" { mconfig.FallbackMount = m.Fallback