GUI fields now trim leading and trailing whitespace:
This commit is contained in:
+28
-1
@@ -22,7 +22,7 @@ import (
|
||||
|
||||
const (
|
||||
APP_NAME = "MXL Player"
|
||||
APP_VER = "0.1.0"
|
||||
APP_VER = "1.0.0"
|
||||
WIN_WIDTH int32 = 1280
|
||||
WIN_HEIGHT int32 = 720
|
||||
)
|
||||
@@ -377,6 +377,8 @@ func main() {
|
||||
}
|
||||
}
|
||||
doReconnect := func() {
|
||||
videoDomainStr, videoStr = normalizeFeedInput(videoDomainStr, videoStr)
|
||||
audioDomainStr, audioStr = normalizeFeedInput(audioDomainStr, audioStr)
|
||||
videoActive = videoStr != ""
|
||||
audioActive = audioStr != ""
|
||||
|
||||
@@ -470,6 +472,8 @@ func main() {
|
||||
displayedVideoWidth uint32 = placeholderWidth
|
||||
displayedVideoHeight uint32 = placeholderHeight
|
||||
displayedVideoStride uint32 = placeholderStride
|
||||
displayedVideoSource playback.FeedConfig
|
||||
hasDisplayedVideo bool
|
||||
|
||||
fps float64
|
||||
dropTracker videoDropTracker
|
||||
@@ -575,6 +579,16 @@ func main() {
|
||||
}
|
||||
|
||||
snapshot, hasSnapshot := player.Controller.Snapshot()
|
||||
desiredVideo := desiredVideoFeed(snapshot, hasSnapshot)
|
||||
if !desiredVideo.Active ||
|
||||
desiredVideo.Domain != displayedVideoSource.Domain ||
|
||||
desiredVideo.UUID != displayedVideoSource.UUID {
|
||||
hasDisplayedVideo = false
|
||||
}
|
||||
if hasFrame {
|
||||
displayedVideoSource = shownSource
|
||||
hasDisplayedVideo = shouldShowVideo(desiredVideo, shownSource)
|
||||
}
|
||||
|
||||
// stats
|
||||
if hasFrame {
|
||||
@@ -722,7 +736,13 @@ func main() {
|
||||
drawFeedsSections := func() {
|
||||
cimgui.SeparatorText("Video")
|
||||
cimgui.InputTextWithHint("Video domain", "/dev/shm/mxl", &videoDomainStr, 0, nil)
|
||||
if cimgui.IsItemDeactivatedAfterEdit() {
|
||||
videoDomainStr, _ = normalizeFeedInput(videoDomainStr, "")
|
||||
}
|
||||
cimgui.InputTextWithHint("Video UUID", "", &videoStr, 0, nil)
|
||||
if cimgui.IsItemDeactivatedAfterEdit() {
|
||||
_, videoStr = normalizeFeedInput("", videoStr)
|
||||
}
|
||||
if videoActive {
|
||||
cimgui.SameLine()
|
||||
if cimgui.Button("Stop##video") {
|
||||
@@ -747,7 +767,13 @@ func main() {
|
||||
}
|
||||
cimgui.SeparatorText("Audio")
|
||||
cimgui.InputTextWithHint("Audio domain", "/dev/shm/mxl", &audioDomainStr, 0, nil)
|
||||
if cimgui.IsItemDeactivatedAfterEdit() {
|
||||
audioDomainStr, _ = normalizeFeedInput(audioDomainStr, "")
|
||||
}
|
||||
cimgui.InputTextWithHint("Audio UUID", "", &audioStr, 0, nil)
|
||||
if cimgui.IsItemDeactivatedAfterEdit() {
|
||||
_, audioStr = normalizeFeedInput("", audioStr)
|
||||
}
|
||||
if audioActive {
|
||||
cimgui.SameLine()
|
||||
if cimgui.Button("Stop##audio") {
|
||||
@@ -1062,6 +1088,7 @@ func main() {
|
||||
displayedVideoWidth,
|
||||
displayedVideoHeight,
|
||||
displayedVideoStride,
|
||||
hasDisplayedVideo,
|
||||
)
|
||||
if errors.Is(err, renderer.ErrOutOfDate) {
|
||||
if rerr := r.RecreateSwapchain(); rerr != nil {
|
||||
|
||||
Reference in New Issue
Block a user