removed const declaration to allow locking in DisplayDriverPainter, as I think access to this needs to be serialized
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12137 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -439,14 +439,14 @@ status_t DirectDriver::SetDPMSMode(const uint32 &state)
|
||||
return BScreen().SetDPMS(state);
|
||||
}
|
||||
|
||||
uint32 DirectDriver::DPMSMode() const
|
||||
uint32 DirectDriver::DPMSMode()
|
||||
{
|
||||
STRACE(("DirectDriver::DPMSMode\n"));
|
||||
// This is a hack, but should do enough to be ok for our purposes
|
||||
return BScreen().DPMSState();
|
||||
}
|
||||
|
||||
uint32 DirectDriver::DPMSCapabilities() const
|
||||
uint32 DirectDriver::DPMSCapabilities()
|
||||
{
|
||||
STRACE(("DirectDriver::DPMSCapabilities\n"));
|
||||
|
||||
|
||||
@@ -135,8 +135,8 @@ public:
|
||||
virtual bool DumpToFile(const char *path);
|
||||
|
||||
virtual status_t SetDPMSMode(const uint32 &state);
|
||||
virtual uint32 DPMSMode() const;
|
||||
virtual uint32 DPMSCapabilities() const;
|
||||
virtual uint32 DPMSMode();
|
||||
virtual uint32 DPMSCapabilities();
|
||||
virtual status_t GetDeviceInfo(accelerant_device_info *info);
|
||||
virtual status_t GetModeList(display_mode **mode_list, uint32 *count);
|
||||
virtual status_t GetPixelClockLimits(display_mode *mode, uint32 *low, uint32 *high);
|
||||
|
||||
@@ -133,7 +133,7 @@ DisplayDriver::SetDPMSMode(const uint32 &state)
|
||||
\return The driver's current DPMS state
|
||||
*/
|
||||
uint32
|
||||
DisplayDriver::DPMSMode() const
|
||||
DisplayDriver::DPMSMode()
|
||||
{
|
||||
return fDPMSState;
|
||||
}
|
||||
@@ -146,7 +146,7 @@ DisplayDriver::DPMSMode() const
|
||||
allows only B_DPMS_ON. Other possible states are B_DPMS_STANDBY, SUSPEND, and OFF.
|
||||
*/
|
||||
uint32
|
||||
DisplayDriver::DPMSCapabilities() const
|
||||
DisplayDriver::DPMSCapabilities()
|
||||
{
|
||||
return fDPMSCaps;
|
||||
}
|
||||
|
||||
@@ -917,7 +917,7 @@ DisplayDriverPainter::SetDPMSMode(const uint32 &state)
|
||||
|
||||
// DPMSMode
|
||||
uint32
|
||||
DisplayDriverPainter::DPMSMode() const
|
||||
DisplayDriverPainter::DPMSMode()
|
||||
{
|
||||
uint32 mode = 0;
|
||||
if (Lock()) {
|
||||
@@ -929,7 +929,7 @@ DisplayDriverPainter::DPMSMode() const
|
||||
|
||||
// DPMSCapabilities
|
||||
uint32
|
||||
DisplayDriverPainter::DPMSCapabilities() const
|
||||
DisplayDriverPainter::DPMSCapabilities()
|
||||
{
|
||||
uint32 caps = 0;
|
||||
if (Lock()) {
|
||||
|
||||
@@ -243,8 +243,8 @@ class DisplayDriverPainter : public DisplayDriver {
|
||||
const DrawData *d);
|
||||
|
||||
virtual status_t SetDPMSMode(const uint32 &state);
|
||||
virtual uint32 DPMSMode() const;
|
||||
virtual uint32 DPMSCapabilities() const;
|
||||
virtual uint32 DPMSMode();
|
||||
virtual uint32 DPMSCapabilities();
|
||||
virtual status_t GetDeviceInfo(accelerant_device_info *info);
|
||||
|
||||
virtual status_t GetModeList(display_mode **mode_list,
|
||||
|
||||
@@ -679,13 +679,13 @@ status_t ViewDriver::SetDPMSMode(const uint32 &state)
|
||||
return BScreen().SetDPMS(state);
|
||||
}
|
||||
|
||||
uint32 ViewDriver::DPMSMode() const
|
||||
uint32 ViewDriver::DPMSMode()
|
||||
{
|
||||
// See note for SetDPMSMode if there are questions
|
||||
return BScreen().DPMSState();
|
||||
}
|
||||
|
||||
uint32 ViewDriver::DPMSCapabilities() const
|
||||
uint32 ViewDriver::DPMSCapabilities()
|
||||
{
|
||||
// See note for SetDPMSMode if there are questions
|
||||
return BScreen().DPMSCapabilites();
|
||||
|
||||
@@ -121,8 +121,8 @@ public:
|
||||
VDWindow *screenwin;
|
||||
|
||||
virtual status_t SetDPMSMode(const uint32 &state);
|
||||
virtual uint32 DPMSMode() const;
|
||||
virtual uint32 DPMSCapabilities() const;
|
||||
virtual uint32 DPMSMode();
|
||||
virtual uint32 DPMSCapabilities();
|
||||
virtual status_t GetDeviceInfo(accelerant_device_info *info);
|
||||
virtual status_t GetModeList(display_mode **mode_list, uint32 *count);
|
||||
virtual status_t GetPixelClockLimits(display_mode *mode, uint32 *low, uint32 *high);
|
||||
|
||||
Reference in New Issue
Block a user