Revision: 8963
http://playerstage.svn.sourceforge.net/playerstage/?rev=8963&view=rev
Author: jpgr87
Date: 2010-11-12 04:02:25 +0000 (Fri, 12 Nov 2010)
Log Message:
-----------
Fixed oceanserver compile errors against Gearbox 9.11
Modified Paths:
--------------
code/player/trunk/server/drivers/power/oceanserver.cc
Modified: code/player/trunk/server/drivers/power/oceanserver.cc
===================================================================
--- code/player/trunk/server/drivers/power/oceanserver.cc 2010-11-12
02:11:13 UTC (rev 8962)
+++ code/player/trunk/server/drivers/power/oceanserver.cc 2010-11-12
04:02:25 UTC (rev 8963)
@@ -185,13 +185,13 @@
player_power_data_t powerData;
memset (&powerData, 0, sizeof (powerData));
- powerData.percent = data.percentCharge;
+ powerData.percent = data.percentCharge();
powerData.valid |= PLAYER_POWER_MASK_PERCENT;
float lowVoltage = -1;
for (unsigned int ii = 0; ii < 8; ii++)
{
- if (!data.availableBatteries[ii])
+ if (!data.availableBatteries()[ii])
continue;
powerData.valid |= PLAYER_POWER_MASK_VOLTS;
if (data.battery (ii).has (gbxsmartbatteryacfr::Voltage))
@@ -207,10 +207,10 @@
// First check if any batteries are charging
for (unsigned int ii = 0; ii < 8; ii++)
{
- if (!data.availableBatteries[ii])
+ if (!data.availableBatteries()[ii])
continue;
powerData.valid |= PLAYER_POWER_MASK_CHARGING;
- if (data.chargingStates[ii])
+ if (data.chargingStates()[ii])
powerData.charging = 1;
}
// Next check if any are discharing - because we have to squeeze
@@ -218,10 +218,10 @@
// charging.
for (unsigned int ii = 0; ii < 8; ii++)
{
- if (!data.availableBatteries[ii])
+ if (!data.availableBatteries()[ii])
continue;
powerData.valid |= PLAYER_POWER_MASK_CHARGING;
- if (data.supplyingPowerStates[ii])
+ if (data.supplyingPowerStates()[ii])
powerData.charging = -1;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
