jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aja: Adjust whitespace for consistency

master
Paul Hindt 2022-01-27 14:45:21 -08:00 committed by Colin Edwards
parent 8d051c6a1c
commit 3fbd5d9179
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/aja/aja-card-manager.cpp
View File

@ -180,7 +180,6 @@ NTV2DeviceID CardEntry::GetDeviceID() const
bool CardEntry::ChannelReady(NTV2Channel chan, const std::string &owner) const
{
const std::lock_guard<std::mutex> lock(mMutex);
for (const auto &pwn : mChannelPwnz) {
if (pwn.second & (1 << static_cast<int32_t>(chan))) {
return pwn.first == owner;
@ -197,7 +196,6 @@ bool CardEntry::AcquireChannel(NTV2Channel chan, NTV2Mode mode,
if (ChannelReady(chan, owner)) {
const std::lock_guard<std::mutex> lock(mMutex);
if (mChannelPwnz.find(owner) != mChannelPwnz.end()) {
if (mChannelPwnz[owner] &
(1 << static_cast<int32_t>(chan))) {
@ -232,7 +230,6 @@ bool CardEntry::ReleaseChannel(NTV2Channel chan, NTV2Mode mode,
const std::string &owner)
{
const std::lock_guard<std::mutex> lock(mMutex);
for (const auto &pwn : mChannelPwnz) {
if (pwn.first == owner) {
if (mChannelPwnz[owner] &
@ -270,7 +267,6 @@ bool CardEntry::InputSelectionReady(IOSelection io, NTV2DeviceID id,
NTV2InputSourceSet inputSources;
aja::IOSelectionToInputSources(io, inputSources);
if (inputSources.size() > 0) {
size_t channelsReady = 0;
@ -487,7 +483,6 @@ bool CardEntry::UpdateChannelOwnerName(const std::string &oldName,
const std::string &newName)
{
const std::lock_guard<std::mutex> lock(mMutex);
for (const auto &pwn : mChannelPwnz) {
if (pwn.first == oldName) {
mChannelPwnz.insert(std::pair<std::string, int32_t>{
@ -523,7 +518,6 @@ bool CardEntry::isAutoCirculateRunning(NTV2Channel chan)
void CardManager::ClearCardEntries()
{
const std::lock_guard<std::mutex> lock(mMutex);
for (auto &&entry : mCardEntries) {
CNTV2Card *card = entry.second->GetCard();
if (card) {
@ -550,7 +544,6 @@ void CardManager::ClearCardEntries()
void CardManager::EnumerateCards()
{
const std::lock_guard<std::mutex> lock(mMutex);
CNTV2DeviceScanner scanner;
for (const auto &iter : scanner.GetDeviceInfoList()) {
CNTV2Card card((UWord)iter.deviceIndex);

7
plugins/aja/aja-common.cpp
View File

@ -14,7 +14,6 @@ void filter_io_selection_input_list(const std::string &cardID,
obs_property_t *list)
{
auto &cardManager = aja::CardManager::Instance();
auto cardEntry = cardManager.GetCardEntry(cardID);
if (!cardEntry) {
blog(LOG_DEBUG,
@ -52,7 +51,6 @@ void filter_io_selection_output_list(const std::string &cardID,
obs_property_t *list)
{
auto &cardManager = aja::CardManager::Instance();
auto cardEntry = cardManager.GetCardEntry(cardID);
if (!cardEntry) {
blog(LOG_DEBUG,
@ -90,7 +88,6 @@ void populate_io_selection_input_list(const std::string &cardID,
obs_property_t *list)
{
obs_property_list_clear(list);
obs_property_list_add_int(list,
obs_module_text(kUIPropIOSelectNone.text),
static_cast<long long>(IOSelection::Invalid));
@ -115,7 +112,6 @@ void populate_io_selection_output_list(const std::string &cardID,
obs_property_t *list)
{
obs_property_list_clear(list);
obs_property_list_add_int(list,
obs_module_text(kUIPropIOSelectNone.text),
static_cast<long long>(IOSelection::Invalid));
@ -129,7 +125,6 @@ void populate_io_selection_output_list(const std::string &cardID,
i < static_cast<int32_t>(IOSelection::NumIOSelections);
i++) {
auto ioSelect = static_cast<IOSelection>(i);
if (ioSelect == IOSelection::Invalid)
continue;
@ -246,10 +241,8 @@ bool aja_video_format_changed(obs_properties_t *props, obs_property_t *list,
auto vid_fmt = static_cast<NTV2VideoFormat>(
obs_data_get_int(settings, kUIPropVideoFormatSelect.id));
size_t itemCount = obs_property_list_item_count(list);
bool itemFound = false;
for (size_t i = 0; i < itemCount; i++) {
int itemFormat = obs_property_list_item_int(list, i);
if (itemFormat == vid_fmt) {