i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved the CPU speed "clearing" function from Pulse to cpu_type.h header.

Browse Source 
It's now also used by AboutHaiku.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13569 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-07-09 21:01:23 +00:00
parent 04d45bdb27
commit 26ca407bfc
4 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/pulse/NormalPulseView.cpp
+8 -31
View File
@@ -124,29 +124,6 @@ NormalPulseView::CalculateFontSize()
}
int
NormalPulseView::CalculateCPUSpeed()
{
system_info sys_info;
get_system_info(&sys_info);
int target = sys_info.cpu_clock_speed / 1000000;
int frac = target % 100;
int delta = -frac;
int at = 0;
int freqs[] = { 100, 50, 25, 75, 33, 67, 20, 40, 60, 80, 10, 30, 70, 90 };
for (uint x = 0; x < sizeof(freqs) / sizeof(freqs[0]); x++) {
int ndelta = freqs[x] - frac;
if (abs(ndelta) < abs(delta)) {
at = freqs[x];
delta = ndelta;
}
}
return target + delta;
}
void
NormalPulseView::DetermineVendorAndProcessor()
{
@@ -215,12 +192,12 @@ NormalPulseView::Draw(BRect rect)
#endif
// Draw processor type and speed
char buf[500];
int cpu_speed = CalculateCPUSpeed();
if (cpu_speed > 1000 && (cpu_speed % 10) == 0)
sprintf(buf, "%.2f GHz", cpu_speed / 1000.0f);
char buffer[64];
int32 cpuSpeed = get_rounded_cpu_speed();
if (cpuSpeed > 1000 && (cpuSpeed % 10) == 0)
snprintf(buffer, sizeof(buffer), "%.2f GHz", cpuSpeed / 1000.0f);
else
sprintf(buf, "%d MHz", cpu_speed);
snprintf(buffer, sizeof(buffer), "%d MHz", cpuSpeed);
SetDrawingMode(B_OP_OVER);
SetHighColor(240, 240, 240);
SetFontSize(fProcessorFontSize);
@@ -229,10 +206,10 @@ NormalPulseView::Draw(BRect rect)
MovePenTo(10 + (32 - width / 2), 48);
DrawString(fProcessor);
width = StringWidth(buf);
width = StringWidth(buffer);
MovePenTo(10 + (32 - width / 2), 60);
DrawString(buf);
DrawString(buffer);
PopState();
}