aja: Static analysis bug fixes

* aja: Use inline const for header initializations

Avoids duplicating across compilation units. Detected by PVS Studio.

* aja: Avoid unnecessary type conversions

Detected by PVS Studio.

* aja: Remove duplicate assignments

Detected by PVS Studio.

* aja: Fix return value of aja_output_create

Detected by PVS Studio.

* aja: Remove unused variable

Detected by PVS Studio.

* aja: Fix compiler warning

* aja: Remove unreachable if branch in aja routing

* aja; Cleanup return in card manager

Co-authored-by: Colin Edwards <colin@recursivepenguin.com>
This commit is contained in:
Richard StanwayandColin Edwards authored and GitHub committed 2021-12-05 22:17:39 -06:00
1 parent 904083a259
commit fad299f99f
13 files changed
+1060 -1069

No files matched your search

+2 -3
View File
@@ -919,8 +919,7 @@ static void aja_source_update(void *data, obs_data_t *settings)
auto prevCardEntry = cardManager.GetCardEntry(currentCardID);
if (prevCardEntry) {
const std::string &ioSelectStr =
aja::IOSelectionToString(curr_props.ioSelect)
.c_str();
aja::IOSelectionToString(curr_props.ioSelect);
if (!prevCardEntry->ReleaseInputSelection(
curr_props.ioSelect, curr_props.deviceID,
ajaSource->GetName())) {
@@ -985,7 +984,7 @@ static void aja_source_update(void *data, obs_data_t *settings)
// Release Channels if IOSelection changes
if (want_props.ioSelect != curr_props.ioSelect) {
const std::string &ioSelectStr =
aja::IOSelectionToString(curr_props.ioSelect).c_str();
aja::IOSelectionToString(curr_props.ioSelect);
if (!cardEntry->ReleaseInputSelection(curr_props.ioSelect,
curr_props.deviceID,
ajaSource->GetName())) {