From 5243aca8e9bc24612585bf01d06daacbc83348f8 Mon Sep 17 00:00:00 2001 From: Alexey Khit Date: Fri, 27 Jan 2023 19:30:34 +0300 Subject: [PATCH] Remove Title field from Media object --- cmd/ffmpeg/device/device_darwin.go | 10 ++++------ cmd/ffmpeg/device/device_linux.go | 6 ++---- cmd/ffmpeg/device/device_windows.go | 10 ++++------ pkg/streamer/media.go | 1 - 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/cmd/ffmpeg/device/device_darwin.go b/cmd/ffmpeg/device/device_darwin.go index 78ea152f..d277a12b 100644 --- a/cmd/ffmpeg/device/device_darwin.go +++ b/cmd/ffmpeg/device/device_darwin.go @@ -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} } diff --git a/cmd/ffmpeg/device/device_linux.go b/cmd/ffmpeg/device/device_linux.go index 9c17c7b6..84736c0c 100644 --- a/cmd/ffmpeg/device/device_linux.go +++ b/cmd/ffmpeg/device/device_linux.go @@ -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} } diff --git a/cmd/ffmpeg/device/device_windows.go b/cmd/ffmpeg/device/device_windows.go index 9b7c0190..cb294048 100644 --- a/cmd/ffmpeg/device/device_windows.go +++ b/cmd/ffmpeg/device/device_windows.go @@ -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} } diff --git a/pkg/streamer/media.go b/pkg/streamer/media.go index c321ac44..bb74660a 100644 --- a/pkg/streamer/media.go +++ b/pkg/streamer/media.go @@ -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 {