From f3689dfdfa052be977c88cd5775c52c06453e097 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sat, 13 Apr 2019 12:04:37 +0100
Subject: [PATCH] Proto changes to go with the previous commit
---
proto/status.pb.go | 103 ++++++++++++++++++++++++++++-----------------
proto/status.proto | 11 +++--
2 files changed, 71 insertions(+), 43 deletions(-)
diff --git a/proto/status.pb.go b/proto/status.pb.go
index 1e903abe..70556b33 100644
--- a/proto/status.pb.go
+++ b/proto/status.pb.go
@@ -26,10 +26,13 @@ type IcecastMount struct {
Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"`
Listeners int32 `protobuf:"varint,2,opt,name=listeners,proto3" json:"listeners,omitempty"`
BitRate int32 `protobuf:"varint,3,opt,name=bit_rate,json=bitRate,proto3" json:"bit_rate,omitempty"`
- Quality float32 `protobuf:"fixed32,4,opt,name=quality,proto3" json:"quality,omitempty"`
- VideoQuality float32 `protobuf:"fixed32,5,opt,name=video_quality,json=videoQuality,proto3" json:"video_quality,omitempty"`
- FrameSize string `protobuf:"bytes,6,opt,name=frame_size,json=frameSize,proto3" json:"frame_size,omitempty"`
- FrameRate float32 `protobuf:"fixed32,7,opt,name=frame_rate,json=frameRate,proto3" json:"frame_rate,omitempty"`
+ SampleRate int32 `protobuf:"varint,4,opt,name=sample_rate,json=sampleRate,proto3" json:"sample_rate,omitempty"`
+ Quality float32 `protobuf:"fixed32,5,opt,name=quality,proto3" json:"quality,omitempty"`
+ Channels int32 `protobuf:"varint,6,opt,name=channels,proto3" json:"channels,omitempty"`
+ Artist string `protobuf:"bytes,7,opt,name=artist,proto3" json:"artist,omitempty"`
+ Title string `protobuf:"bytes,8,opt,name=title,proto3" json:"title,omitempty"`
+ Name string `protobuf:"bytes,9,opt,name=name,proto3" json:"name,omitempty"`
+ Description string `protobuf:"bytes,10,opt,name=description,proto3" json:"description,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -81,6 +84,13 @@ func (m *IcecastMount) GetBitRate() int32 {
return 0
}
+func (m *IcecastMount) GetSampleRate() int32 {
+ if m != nil {
+ return m.SampleRate
+ }
+ return 0
+}
+
func (m *IcecastMount) GetQuality() float32 {
if m != nil {
return m.Quality
@@ -88,25 +98,39 @@ func (m *IcecastMount) GetQuality() float32 {
return 0
}
-func (m *IcecastMount) GetVideoQuality() float32 {
+func (m *IcecastMount) GetChannels() int32 {
if m != nil {
- return m.VideoQuality
+ return m.Channels
}
return 0
}
-func (m *IcecastMount) GetFrameSize() string {
+func (m *IcecastMount) GetArtist() string {
if m != nil {
- return m.FrameSize
+ return m.Artist
}
return ""
}
-func (m *IcecastMount) GetFrameRate() float32 {
+func (m *IcecastMount) GetTitle() string {
if m != nil {
- return m.FrameRate
+ return m.Title
}
- return 0
+ return ""
+}
+
+func (m *IcecastMount) GetName() string {
+ if m != nil {
+ return m.Name
+ }
+ return ""
+}
+
+func (m *IcecastMount) GetDescription() string {
+ if m != nil {
+ return m.Description
+ }
+ return ""
}
type Status struct {
@@ -292,34 +316,35 @@ func init() {
func init() { proto.RegisterFile("status.proto", fileDescriptor_dfe4fce6682daf5b) }
var fileDescriptor_dfe4fce6682daf5b = []byte{
- // 418 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x4d, 0x8f, 0xd3, 0x30,
- 0x10, 0x86, 0x49, 0xb7, 0x5f, 0x19, 0x5a, 0x3e, 0x7c, 0x21, 0x2c, 0x20, 0x55, 0xd9, 0x03, 0x3d,
- 0xf5, 0xb0, 0xdc, 0x40, 0xe2, 0x80, 0xb4, 0x42, 0x48, 0x20, 0x84, 0x2b, 0x71, 0x8d, 0xdc, 0x64,
- 0xa0, 0xd6, 0xae, 0xed, 0xac, 0x3d, 0x5e, 0xca, 0xfe, 0x27, 0xfe, 0x0f, 0x3f, 0x07, 0xd9, 0x69,
- 0x3e, 0x04, 0x1c, 0xf6, 0x16, 0xbf, 0xef, 0x3b, 0x33, 0x7e, 0xc6, 0x81, 0x85, 0x23, 0x41, 0xde,
- 0x6d, 0x6a, 0x6b, 0xc8, 0xb0, 0x54, 0x78, 0x32, 0x56, 0x54, 0xd2, 0xe4, 0xbf, 0x13, 0x58, 0x7c,
- 0x28, 0xb1, 0x14, 0x8e, 0x3e, 0x19, 0xaf, 0x89, 0x31, 0x18, 0xd7, 0x82, 0xf6, 0x59, 0xb2, 0x4a,
- 0xd6, 0x29, 0x8f, 0xdf, 0xec, 0x39, 0xa4, 0x57, 0xd2, 0x11, 0x6a, 0xb4, 0x2e, 0x1b, 0xad, 0x92,
- 0xf5, 0x84, 0xf7, 0x02, 0x7b, 0x0a, 0xf3, 0x9d, 0xa4, 0xc2, 0x0a, 0xc2, 0xec, 0x24, 0x9a, 0xb3,
- 0x9d, 0x24, 0x2e, 0x08, 0x59, 0x06, 0xb3, 0x6b, 0x2f, 0xae, 0x24, 0xfd, 0xcc, 0xc6, 0xab, 0x64,
- 0x3d, 0xe2, 0xed, 0x91, 0x9d, 0xc1, 0xf2, 0x46, 0x56, 0x68, 0x8a, 0xd6, 0x9f, 0x44, 0x7f, 0x11,
- 0xc5, 0x2f, 0xc7, 0xd0, 0x0b, 0x80, 0x6f, 0x56, 0x28, 0x2c, 0x9c, 0xbc, 0xc5, 0x6c, 0x1a, 0x6f,
- 0x94, 0x46, 0x65, 0x2b, 0x6f, 0xb1, 0xb7, 0xe3, 0xe8, 0x59, 0x6c, 0xd0, 0xd8, 0x61, 0x78, 0xfe,
- 0x6b, 0x04, 0xd3, 0x6d, 0xc4, 0x0e, 0x50, 0x5a, 0x28, 0x6c, 0xa1, 0xc2, 0x77, 0x80, 0x22, 0xa9,
- 0xd0, 0x91, 0x50, 0x75, 0x84, 0x1a, 0xf3, 0x5e, 0x08, 0xbd, 0x65, 0xb3, 0x96, 0xc2, 0x5c, 0x46,
- 0xac, 0x39, 0x4f, 0x8f, 0xca, 0xe7, 0x4b, 0xf6, 0x16, 0x1e, 0xb4, 0xb6, 0x0a, 0x6b, 0x73, 0xd9,
- 0x78, 0x75, 0xb2, 0xbe, 0x7f, 0xfe, 0x64, 0xd3, 0xad, 0x76, 0x33, 0x5c, 0x2b, 0x5f, 0xca, 0xc1,
- 0xc9, 0x05, 0xfc, 0xd2, 0xdb, 0x62, 0x27, 0x74, 0xf5, 0x43, 0x56, 0xb4, 0x8f, 0xf8, 0x13, 0xbe,
- 0x28, 0xbd, 0x7d, 0xd7, 0x6a, 0x21, 0xa4, 0xc4, 0x61, 0x10, 0x9a, 0x36, 0x21, 0x25, 0x0e, 0xff,
- 0x84, 0xfa, 0xf7, 0x99, 0x75, 0xa1, 0x8f, 0xdd, 0x13, 0x9d, 0xc1, 0x52, 0x7b, 0x35, 0x08, 0xcd,
- 0x9b, 0x90, 0xf6, 0xaa, 0x0b, 0xe5, 0xaf, 0xe1, 0xe1, 0xc5, 0xa1, 0xdc, 0x0b, 0xfd, 0x1d, 0x39,
- 0x5e, 0x7b, 0x74, 0xc4, 0x5e, 0xc2, 0x44, 0x9b, 0x0a, 0x5d, 0x96, 0x44, 0xba, 0xc7, 0x03, 0xba,
- 0x66, 0xb3, 0xbc, 0xf1, 0xf3, 0x37, 0xf0, 0xa8, 0xaf, 0x75, 0xb5, 0xd1, 0x0e, 0xef, 0x5c, 0x7c,
- 0xfe, 0x15, 0x96, 0xef, 0x8d, 0x73, 0xb2, 0xde, 0xa2, 0xbd, 0x91, 0x25, 0xb2, 0x0b, 0x98, 0xb7,
- 0xdd, 0xd8, 0xe9, 0xa0, 0xec, 0xaf, 0xeb, 0x9d, 0x3e, 0xfb, 0xaf, 0xd7, 0x8c, 0xcf, 0xef, 0xed,
- 0xa6, 0xf1, 0x6f, 0x7f, 0xf5, 0x27, 0x00, 0x00, 0xff, 0xff, 0x9d, 0xc8, 0xe4, 0xa7, 0xfd, 0x02,
- 0x00, 0x00,
+ // 445 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcd, 0x8e, 0xd3, 0x30,
+ 0x10, 0x26, 0xdd, 0xa6, 0x4d, 0xa6, 0x2d, 0x3f, 0x16, 0x02, 0x53, 0x16, 0x11, 0x65, 0x0f, 0xf4,
+ 0xd4, 0xc3, 0x72, 0x03, 0x89, 0x03, 0xd2, 0x0a, 0x21, 0x81, 0x90, 0xbc, 0x12, 0xd7, 0xca, 0x4d,
+ 0x2c, 0x6a, 0x6d, 0x62, 0x67, 0x33, 0x63, 0x28, 0x2f, 0xc2, 0x5b, 0xf0, 0x8e, 0x28, 0x76, 0x9b,
+ 0x46, 0xc0, 0x61, 0x6f, 0xfe, 0x7e, 0xc6, 0xf1, 0x7c, 0x9f, 0x02, 0x73, 0x24, 0x49, 0x0e, 0xd7,
+ 0x4d, 0x6b, 0xc9, 0xb2, 0x54, 0x3a, 0xb2, 0xad, 0x2c, 0xb5, 0xcd, 0x7f, 0x8d, 0x60, 0xfe, 0xb1,
+ 0x50, 0x85, 0x44, 0xfa, 0x6c, 0x9d, 0x21, 0xc6, 0x60, 0xdc, 0x48, 0xda, 0xf1, 0x28, 0x8b, 0x56,
+ 0xa9, 0xf0, 0x67, 0x76, 0x0e, 0x69, 0xa5, 0x91, 0x94, 0x51, 0x2d, 0xf2, 0x51, 0x16, 0xad, 0x62,
+ 0x71, 0x22, 0xd8, 0x33, 0x48, 0xb6, 0x9a, 0x36, 0xad, 0x24, 0xc5, 0xcf, 0xbc, 0x38, 0xdd, 0x6a,
+ 0x12, 0x92, 0x14, 0x7b, 0x09, 0x33, 0x94, 0x75, 0x53, 0xa9, 0xa0, 0x8e, 0xbd, 0x0a, 0x81, 0xf2,
+ 0x06, 0x0e, 0xd3, 0x5b, 0x27, 0x2b, 0x4d, 0x3f, 0x79, 0x9c, 0x45, 0xab, 0x91, 0x38, 0x42, 0xb6,
+ 0x84, 0xa4, 0xd8, 0x49, 0x63, 0x54, 0x85, 0x7c, 0xe2, 0xe7, 0x7a, 0xcc, 0x9e, 0xc0, 0x44, 0xb6,
+ 0xa4, 0x91, 0xf8, 0xd4, 0xbf, 0xf2, 0x80, 0xd8, 0x63, 0x88, 0x49, 0x53, 0xa5, 0x78, 0xe2, 0xe9,
+ 0x00, 0xba, 0x8d, 0x8c, 0xac, 0x15, 0x4f, 0xc3, 0x46, 0xdd, 0x99, 0x65, 0x30, 0x2b, 0x15, 0x16,
+ 0xad, 0x6e, 0x48, 0x5b, 0xc3, 0xc1, 0x4b, 0x43, 0x2a, 0xff, 0x3d, 0x82, 0xc9, 0xb5, 0x0f, 0xad,
+ 0xbf, 0x20, 0x1a, 0x5c, 0x70, 0x0e, 0x29, 0xe9, 0x5a, 0x21, 0xc9, 0xba, 0xf1, 0x91, 0x8c, 0xc5,
+ 0x89, 0x60, 0x2f, 0x00, 0x74, 0x08, 0x75, 0x63, 0x6f, 0x7c, 0x28, 0x89, 0x48, 0x0f, 0xcc, 0x97,
+ 0x1b, 0xf6, 0x0e, 0xee, 0x1f, 0xe5, 0xba, 0x0b, 0x1d, 0xf9, 0x38, 0x3b, 0x5b, 0xcd, 0x2e, 0x9f,
+ 0xae, 0xfb, 0x62, 0xd6, 0xc3, 0x52, 0xc4, 0x42, 0x0f, 0x10, 0xb2, 0x0b, 0x58, 0x14, 0xae, 0xdd,
+ 0x6c, 0xa5, 0x29, 0x7f, 0xe8, 0x92, 0x76, 0x3e, 0xbb, 0x58, 0xcc, 0x0b, 0xd7, 0xbe, 0x3f, 0x72,
+ 0x9d, 0xa9, 0x96, 0xfb, 0x81, 0x29, 0xa4, 0x38, 0xaf, 0xe5, 0xfe, 0x1f, 0xd3, 0xa9, 0xdd, 0x69,
+ 0x6f, 0xfa, 0xd4, 0x17, 0x7c, 0x01, 0x0b, 0xe3, 0xea, 0x81, 0x29, 0x09, 0x26, 0xe3, 0xea, 0xde,
+ 0x94, 0xbf, 0x81, 0x07, 0x57, 0xfb, 0xae, 0xa1, 0x6f, 0x4a, 0xa8, 0x5b, 0xa7, 0x90, 0xd8, 0x2b,
+ 0x88, 0x8d, 0x2d, 0x15, 0xf2, 0xc8, 0x6f, 0xf7, 0x68, 0xb0, 0x5d, 0x48, 0x56, 0x04, 0x3d, 0x7f,
+ 0x0b, 0x0f, 0x4f, 0xb3, 0xd8, 0x58, 0x83, 0xea, 0xce, 0xc3, 0x97, 0x5f, 0x61, 0xf1, 0xc1, 0x22,
+ 0xea, 0xe6, 0x5a, 0xb5, 0xdf, 0x75, 0xa1, 0xd8, 0x15, 0x24, 0xc7, 0xdb, 0xd8, 0x72, 0x30, 0xf6,
+ 0xd7, 0xf3, 0x96, 0xcf, 0xff, 0xab, 0x85, 0xcf, 0xe7, 0xf7, 0xb6, 0x13, 0xff, 0xaf, 0xbc, 0xfe,
+ 0x13, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x9e, 0xa9, 0x9e, 0x3b, 0x03, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/status.proto b/proto/status.proto
index a2a49810..8eb77e5e 100644
--- a/proto/status.proto
+++ b/proto/status.proto
@@ -11,10 +11,13 @@ message IcecastMount {
string path = 1;
int32 listeners = 2;
int32 bit_rate = 3;
- float quality = 4;
- float video_quality = 5;
- string frame_size = 6;
- float frame_rate = 7;
+ int32 sample_rate = 4;
+ float quality = 5;
+ int32 channels = 6;
+ string artist = 7;
+ string title = 8;
+ string name = 9;
+ string description = 10;
}
message Status {
--
GitLab