ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gsdx-osd: Rename log speed to log timeout 

Linux/Windows GUI to be updated in later commits.
This commit is contained in:
Kojin 2018-12-14 08:33:05 -05:00 committed by lightningterror
parent 038ae8c7fc
commit 1b0112de22
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/GSdx/Renderers/Common/GSOsdManager.cpp
View File

@ -59,7 +59,7 @@ GSOsdManager::GSOsdManager() : m_atlas_h(0)
, m_texture_dirty(true) , m_texture_dirty(true)
{ {
m_log_enabled = theApp.GetConfigB("osd_log_enabled"); m_log_enabled = theApp.GetConfigB("osd_log_enabled");
m_log_speed = std::max(2, std::min(theApp.GetConfigI("osd_log_speed"), 10)); m_log_timeout = std::max(2, std::min(theApp.GetConfigI("osd_log_timeout"), 10));
m_monitor_enabled = theApp.GetConfigB("osd_monitor_enabled"); m_monitor_enabled = theApp.GetConfigB("osd_monitor_enabled");
m_opacity = std::max(0, std::min(theApp.GetConfigI("osd_color_opacity"), 100)); m_opacity = std::max(0, std::min(theApp.GetConfigI("osd_color_opacity"), 100));
m_max_onscreen_messages = theApp.GetConfigI("osd_max_log_messages"); m_max_onscreen_messages = theApp.GetConfigI("osd_max_log_messages");
@ -294,12 +294,12 @@ size_t GSOsdManager::Size() {
elapsed = std::chrono::seconds(0); elapsed = std::chrono::seconds(0);
} else { } else {
elapsed = std::chrono::system_clock::now() - it->OnScreen; elapsed = std::chrono::system_clock::now() - it->OnScreen;
if(elapsed > std::chrono::seconds(m_log_speed) || m_onscreen_messages > m_max_onscreen_messages) { if(elapsed > std::chrono::seconds(m_log_timeout) || m_onscreen_messages > m_max_onscreen_messages) {
continue; continue;
} }
} }
float ratio = (elapsed - std::chrono::seconds(m_log_speed/2)).count() / std::chrono::seconds(m_log_speed/2).count(); float ratio = (elapsed - std::chrono::seconds(m_log_timeout/2)).count() / std::chrono::seconds(m_log_timeout/2).count();
ratio = ratio > 1.0f ? 1.0f : ratio < 0.0f ? 0.0f : ratio; ratio = ratio > 1.0f ? 1.0f : ratio < 0.0f ? 0.0f : ratio;
y += offset += ((m_size+2) * (2.0f/m_real_size.y)) * ratio; y += offset += ((m_size+2) * (2.0f/m_real_size.y)) * ratio;
@ -352,7 +352,7 @@ size_t GSOsdManager::GeneratePrimitives(GSVertexPT1* dst, size_t count) {
it->OnScreen = std::chrono::system_clock::now(); it->OnScreen = std::chrono::system_clock::now();
std::chrono::duration<float> elapsed = std::chrono::system_clock::now() - it->OnScreen; std::chrono::duration<float> elapsed = std::chrono::system_clock::now() - it->OnScreen;
if(elapsed > std::chrono::seconds(m_log_speed) || m_onscreen_messages > m_max_onscreen_messages) { if(elapsed > std::chrono::seconds(m_log_timeout) || m_onscreen_messages > m_max_onscreen_messages) {
m_onscreen_messages--; m_onscreen_messages--;
it = m_log.erase(it); it = m_log.erase(it);
continue; continue;
@ -360,7 +360,7 @@ size_t GSOsdManager::GeneratePrimitives(GSVertexPT1* dst, size_t count) {
if(it->msg.size() * 6 > count - drawn) break; if(it->msg.size() * 6 > count - drawn) break;
float ratio = (elapsed - std::chrono::seconds(m_log_speed/2)).count() / std::chrono::seconds(m_log_speed/2).count(); float ratio = (elapsed - std::chrono::seconds(m_log_timeout/2)).count() / std::chrono::seconds(m_log_timeout/2).count();
ratio = ratio > 1.0f ? 1.0f : ratio < 0.0f ? 0.0f : ratio; ratio = ratio > 1.0f ? 1.0f : ratio < 0.0f ? 0.0f : ratio;
y += offset += ((m_size+2) * (2.0f/m_real_size.y)) * ratio; y += offset += ((m_size+2) * (2.0f/m_real_size.y)) * ratio;

2
plugins/GSdx/Renderers/Common/GSOsdManager.h
View File

@ -71,7 +71,7 @@ class GSOsdManager {
float StringSize(const std::u32string msg); float StringSize(const std::u32string msg);
bool m_log_enabled; bool m_log_enabled;
int m_log_speed; int m_log_timeout;
bool m_monitor_enabled; bool m_monitor_enabled;
int m_opacity; int m_opacity;
int m_max_onscreen_messages; int m_max_onscreen_messages;