forked from cafeberry/cafeberry
feat(Windows64): miniaudio
This commit is contained in:
@@ -254,11 +254,11 @@ UIController::UIController()
|
||||
}
|
||||
|
||||
#ifdef _WINDOWS64
|
||||
if(!ms_bControllerPollCSInitialised)
|
||||
{
|
||||
InitializeCriticalSection(&ms_controllerPollCS);
|
||||
ms_bControllerPollCSInitialised = true;
|
||||
}
|
||||
//if(!ms_bControllerPollCSInitialised)
|
||||
//{
|
||||
// InitializeCriticalSection(&ms_controllerPollCS);
|
||||
// ms_bControllerPollCSInitialised = true;
|
||||
//}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -313,8 +313,8 @@ void UIController::postInit()
|
||||
m_LastControllerType = UNKNOWN;
|
||||
m_bControllerTypeChanged = false;
|
||||
|
||||
m_controllerPollThread = new C4JThread(controllerPollThreadProc, (void*)this, "Controller poll thread");
|
||||
m_controllerPollThread->Run();
|
||||
//m_controllerPollThread = new C4JThread(controllerPollThreadProc, (void*)this, "Controller poll thread");
|
||||
//m_controllerPollThread->Run();
|
||||
#endif
|
||||
|
||||
for(unsigned int i = 0; i < eUIGroup_COUNT; ++i)
|
||||
@@ -525,11 +525,12 @@ void UIController::tick()
|
||||
}
|
||||
|
||||
#ifdef _WINDOWS64
|
||||
fetchControlTooltipSWF();
|
||||
//fetchControlTooltipSWF();
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef _WINDOWS64
|
||||
/*
|
||||
int UIController::controllerPollThreadProc(void* lpParam)
|
||||
{
|
||||
UIController *controller = (UIController *)lpParam;
|
||||
@@ -598,9 +599,9 @@ UIController::EControllerType UIController::GetControllerType(const char* contro
|
||||
if (strcmp(controllerType, "STANDARD") == 0) return EControllerType::STANDARD;
|
||||
|
||||
return EControllerType::UNKNOWN;
|
||||
}
|
||||
}*/
|
||||
|
||||
void UIController::fetchControlTooltipSWF()
|
||||
/*void UIController::fetchControlTooltipSWF()
|
||||
{
|
||||
if (!m_bControllerTypeChanged)
|
||||
return;
|
||||
@@ -626,7 +627,7 @@ void UIController::fetchControlTooltipSWF()
|
||||
skinName = (m_fScreenHeight >= 1080.0f) ? L"skinControlTooltipsHD.swf" : L"skinControlTooltips.swf";
|
||||
|
||||
reloadSingleSkin(eLibrary_ControlTooltips, controlTooltipsPath, skinName);
|
||||
}
|
||||
}*/
|
||||
#endif
|
||||
|
||||
void UIController::loadSkins()
|
||||
@@ -641,12 +642,12 @@ void UIController::loadSkins()
|
||||
if(m_fScreenWidth >= 1920.0f)
|
||||
{
|
||||
platformSkinPath = L"skinHDWin.swf";
|
||||
controlTooltipsPath = GetControlTooltipsPath();
|
||||
controlTooltipsPath = L"ControlTooltips\\HD\\Windows64HDControls.swf";
|
||||
}
|
||||
else
|
||||
{
|
||||
platformSkinPath = L"skinWin.swf";
|
||||
controlTooltipsPath = GetControlTooltipsPath();
|
||||
controlTooltipsPath = L"ControlTooltips\\Windows64Controls.swf";
|
||||
}
|
||||
#elif defined _DURANGO
|
||||
if(m_fScreenHeight==1080.0f)
|
||||
|
||||
Reference in New Issue
Block a user