mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 16:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake+ci: run clang-tidy (#512)

Browse Source 
* cmake+ci: run clang-tidy

* Remove DESCRIPTION from LEGO1/LegoOmni.mingw.def

* Add initial .clang-tidy and fixes

* fix file perms

* Comment out DESCRIPTION

* Remove LegoEntity::~LegoEntity and MxPresenter::~MxPresenter from mingw's LEGO1.def

* Looks like clang is allergic to the libs in the directx5 SDK

* Update .clang-tidy

* Fix typo in .clang-tidy

* Attempt to generate an action error

* Revert "Attempt to generate an action error"

This reverts commit 96c4c65fed.

* cmake: test with -Wparentheses + optionally with -Werror

* ci: -k0 is a Ninja argument

* Use -Werror only for msys2 builds

* cmake: only emit warnings for specific warnings

* cmake: and don't do -Werror/-WX anymore

* Fix warnings

* Fix mingw warnings

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Anonymous Maarten
2024-02-01 21:42:10 +01:00
committed by GitHub
parent 97d1ba7c71
commit 9e686e2a87
308 changed files with 2863 additions and 1995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
LEGO1/lego/legoomni/src/common/mxcompositemediapresenter.cpp
View File

@@ -57,10 +57,12 @@ MxResult MxCompositeMediaPresenter::StartAction(MxStreamController* p_controller
if (presenter->StartAction(p_controller, action) == SUCCESS) {
presenter->SetTickleState(e_idle);
if (presenter->IsA("MxVideoPresenter"))
if (presenter->IsA("MxVideoPresenter")) {
VideoManager()->UnregisterPresenter(*presenter);
else if (presenter->IsA("MxAudioPresenter"))
}
else if (presenter->IsA("MxAudioPresenter")) {
SoundManager()->UnregisterPresenter(*presenter);
}
success = TRUE;
}
@@ -70,8 +72,9 @@ MxResult MxCompositeMediaPresenter::StartAction(MxStreamController* p_controller
action->SetOrigin(this);
m_list.push_back(presenter);
}
else if (presenter)
else if (presenter) {
delete presenter;
}
}
if (!m_compositePresenter) {
@@ -97,8 +100,9 @@ void MxCompositeMediaPresenter::StartingTickle()
(*it)->Tickle();
if ((*it)->GetCurrentTickleState() == e_streaming ||
((*it)->GetAction() && (*it)->GetAction()->GetStartTime()))
((*it)->GetAction() && (*it)->GetAction()->GetStartTime())) {
m_unk0x4c++;
}
}
}
@@ -107,8 +111,9 @@ void MxCompositeMediaPresenter::StartingTickle()
m_unk0x4c = 0;
for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
if (!(*it)->GetAction()->GetStartTime())
if (!(*it)->GetAction()->GetStartTime()) {
m_unk0x4c++;
}
}
}
}
@@ -145,8 +150,9 @@ MxResult MxCompositeMediaPresenter::Tickle()
case e_repeating:
case e_unk5:
case e_done: {
for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++)
for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
(*it)->Tickle();
}
break;
}
default:
@@ -162,8 +168,9 @@ MxResult MxCompositeMediaPresenter::PutData()
MxAutoLocker lock(&m_criticalSection);
if (m_currentTickleState >= e_streaming && m_currentTickleState <= e_done) {
for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++)
for (MxCompositePresenterList::iterator it = m_list.begin(); it != m_list.end(); it++) {
(*it)->PutData();
}
}
return SUCCESS;