Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
V
VIZ.H2V
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
刘龙飞
VIZ.H2V
Commits
661c1d35
Commit
661c1d35
authored
Sep 07, 2022
by
liulongfei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 修复NDI流选空时的逻辑问题
parent
cb9d3722
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
10 deletions
+11
-10
VIZ.H2V.Module/NDISettingView/ViewModel/NDISettingPanelViewModel.cs
+11
-10
No files found.
VIZ.H2V.Module/NDISettingView/ViewModel/NDISettingPanelViewModel.cs
View file @
661c1d35
...
@@ -187,8 +187,6 @@ namespace VIZ.H2V.Module
...
@@ -187,8 +187,6 @@ namespace VIZ.H2V.Module
private
void
LoadNdiStreamInfo
()
private
void
LoadNdiStreamInfo
()
{
{
NDIStream
ndiStream
=
VideoStreamManager
.
Get
<
NDIStream
>(
this
.
ViewKey
);
NDIStream
ndiStream
=
VideoStreamManager
.
Get
<
NDIStream
>(
this
.
ViewKey
);
if
(
ndiStream
.
StreamInfos
==
null
||
ndiStream
.
StreamInfos
.
Count
==
0
)
return
;
List
<
NDIStreamInfoModel
>
list
=
new
List
<
NDIStreamInfoModel
>();
List
<
NDIStreamInfoModel
>
list
=
new
List
<
NDIStreamInfoModel
>();
NDIStreamInfoModel
none
=
new
NDIStreamInfoModel
();
NDIStreamInfoModel
none
=
new
NDIStreamInfoModel
();
...
@@ -196,16 +194,19 @@ namespace VIZ.H2V.Module
...
@@ -196,16 +194,19 @@ namespace VIZ.H2V.Module
NDIStreamInfoModel
selected
=
none
;
NDIStreamInfoModel
selected
=
none
;
foreach
(
NDIStreamInfo
info
in
ndiStream
.
StreamInfos
)
if
(
ndiStream
.
StreamInfos
!=
null
&&
ndiStream
.
StreamInfos
.
Count
>
0
)
{
{
NDIStreamInfoModel
model
=
new
NDIStreamInfoModel
();
foreach
(
NDIStreamInfo
info
in
ndiStream
.
StreamInfos
)
model
.
FullName
=
info
.
FullName
;
if
(
model
.
FullName
==
ndiStream
.
RemoteSenderName
)
{
{
selected
=
model
;
NDIStreamInfoModel
model
=
new
NDIStreamInfoModel
();
model
.
FullName
=
info
.
FullName
;
if
(
model
.
FullName
==
ndiStream
.
RemoteSenderName
)
{
selected
=
model
;
}
list
.
Add
(
model
);
}
}
list
.
Add
(
model
);
}
}
this
.
NDIStreamInfos
=
list
;
this
.
NDIStreamInfos
=
list
;
...
@@ -361,7 +362,7 @@ namespace VIZ.H2V.Module
...
@@ -361,7 +362,7 @@ namespace VIZ.H2V.Module
&&
p
.
IsSendToCrop
==
true
&&
p
.
IsSendToCrop
==
true
&&
p
.
ViewKey
!=
this
.
ViewKey
);
&&
p
.
ViewKey
!=
this
.
ViewKey
);
if
(
viewConfig
==
null
)
if
(
viewConfig
==
null
||
string
.
IsNullOrWhiteSpace
(
viewConfig
.
StreamName
)
)
return
true
;
return
true
;
this
.
IsSendToCrop
=
false
;
this
.
IsSendToCrop
=
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment