chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Birunthan Mohanathas
2012-10-09 18:33:49 +03:00
parent 7348f5eb6e
commit b2d245016a
8 changed files with 79 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Library/MeasureNet.cpp
View File

@ -35,8 +35,11 @@ extern CRainmeter* Rainmeter;
** The constructor. This is the base class for the net-meters.
**
*/
CMeasureNet::CMeasureNet(CMeterWindow* meterWindow, const WCHAR* name) : CMeasure(meterWindow, name),
CMeasureNet::CMeasureNet(CMeterWindow* meterWindow, const WCHAR* name, NET type) : CMeasure(meterWindow, name),
m_Net(type),
m_Interface(),
m_Octets(),
m_FirstTime(true),
m_Cumulative(false)
{
}
@ -408,25 +411,68 @@ ULONG64 CMeasureNet::GetNetStatsValue(NET net)
}
/*
** Read the options specified in the ini file. Base implementation for In/Out/Total.
** Updates the current value.
**
*/
void CMeasureNet::ReadOptions(CConfigParser& parser, const WCHAR* section, NET net)
void CMeasureNet::UpdateValue()
{
if (c_Table == NULL) return;
if (m_Cumulative)
{
m_Value = (double)(__int64)GetNetStatsValue(m_Net);
}
else
{
ULONG64 value = 0;
if (!m_FirstTime)
{
value = GetNetOctets(m_Net);
if (value > m_Octets)
{
ULONG64 tmpValue = value;
value -= m_Octets;
m_Octets = tmpValue;
}
else
{
m_Octets = value;
value = 0;
}
}
else
{
m_Octets = GetNetOctets(m_Net);
m_FirstTime = false;
}
m_Value = (double)(__int64)value;
}
}
/*
** Read the options specified in the ini file.
**
*/
void CMeasureNet::ReadOptions(CConfigParser& parser, const WCHAR* section)
{
CMeasure::ReadOptions(parser, section);
double value;
const WCHAR* netName = NULL;
if (net == NET_IN)
if (m_Net == NET_IN)
{
netName = L"NetInSpeed";
value = Rainmeter->GetGlobalOptions().netInSpeed;
}
else if (net == NET_OUT)
else if (m_Net == NET_OUT)
{
netName = L"NetOutSpeed";
value = Rainmeter->GetGlobalOptions().netOutSpeed;
}
else
else // if (m_Net == NET_TOTAL)
{
netName = L"NetTotalSpeed";
value = Rainmeter->GetGlobalOptions().netInSpeed + Rainmeter->GetGlobalOptions().netOutSpeed;