Remove Title field from Media object

This commit is contained in:
Alexey Khit
2023-01-27 19:30:34 +03:00
parent 69dd4d26ec
commit 5243aca8e9
4 changed files with 10 additions and 17 deletions
+4 -6
View File
@@ -15,11 +15,11 @@ func deviceInputSuffix(videoIdx, audioIdx int) string {
audio := findMedia(streamer.KindAudio, audioIdx)
switch {
case video != nil && audio != nil:
return `"` + video.Title + `:` + audio.Title + `"`
return `"` + video.MID + `:` + audio.MID + `"`
case video != nil:
return `"` + video.Title + `"`
return `"` + video.MID + `"`
case audio != nil:
return `"` + audio.Title + `"`
return `"` + audio.MID + `"`
}
return ""
}
@@ -57,7 +57,5 @@ process:
}
func loadMedia(kind, name string) *streamer.Media {
return &streamer.Media{
Kind: kind, Title: name,
}
return &streamer.Media{Kind: kind, MID: name}
}
+2 -4
View File
@@ -13,7 +13,7 @@ const deviceInputPrefix = "-f v4l2"
func deviceInputSuffix(videoIdx, audioIdx int) string {
video := findMedia(streamer.KindVideo, videoIdx)
return video.Title
return video.MID
}
func loadMedias() {
@@ -44,7 +44,5 @@ func loadMedia(kind, name string) *streamer.Media {
return nil
}
return &streamer.Media{
Kind: kind, Title: name,
}
return &streamer.Media{Kind: kind, MID: name}
}
+4 -6
View File
@@ -15,11 +15,11 @@ func deviceInputSuffix(videoIdx, audioIdx int) string {
audio := findMedia(streamer.KindAudio, audioIdx)
switch {
case video != nil && audio != nil:
return `video="` + video.Title + `":audio=` + audio.Title + `"`
return `video="` + video.MID + `":audio=` + audio.MID + `"`
case video != nil:
return `video="` + video.Title + `"`
return `video="` + video.MID + `"`
case audio != nil:
return `audio="` + audio.Title + `"`
return `audio="` + audio.MID + `"`
}
return ""
}
@@ -53,7 +53,5 @@ func loadMedias() {
}
func loadMedia(kind, name string) *streamer.Media {
return &streamer.Media{
Kind: kind, Title: name,
}
return &streamer.Media{Kind: kind, MID: name}
}
-1
View File
@@ -60,7 +60,6 @@ type Media struct {
MID string `json:"mid,omitempty"` // TODO: fixme?
Control string `json:"control,omitempty"` // TODO: fixme?
Title string `json:"title,omitempty"` // TODO: fixme?
}
func (m *Media) String() string {