summaryrefslogtreecommitdiff
path: root/src/protocols/core/Output.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/protocols/core/Output.cpp')
-rw-r--r--src/protocols/core/Output.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/protocols/core/Output.cpp b/src/protocols/core/Output.cpp
index 8ebf87eb..d0f057e3 100644
--- a/src/protocols/core/Output.cpp
+++ b/src/protocols/core/Output.cpp
@@ -51,7 +51,7 @@ CWLOutputResource::CWLOutputResource(SP<CWlOutput> resource_, PHLMONITOR pMonito
}
SP<CWLOutputResource> CWLOutputResource::fromResource(wl_resource* res) {
- auto data = (CWLOutputResource*)(((CWlOutput*)wl_resource_get_user_data(res))->data());
+ auto data = sc<CWLOutputResource*>(sc<CWlOutput*>(wl_resource_get_user_data(res))->data());
return data ? data->m_self.lock() : nullptr;
}
@@ -74,10 +74,10 @@ void CWLOutputResource::updateState() {
if (m_resource->version() >= 2)
m_resource->sendScale(std::ceil(m_monitor->m_scale));
- m_resource->sendMode((wl_output_mode)(WL_OUTPUT_MODE_CURRENT), m_monitor->m_pixelSize.x, m_monitor->m_pixelSize.y, m_monitor->m_refreshRate * 1000.0);
+ m_resource->sendMode(WL_OUTPUT_MODE_CURRENT, m_monitor->m_pixelSize.x, m_monitor->m_pixelSize.y, m_monitor->m_refreshRate * 1000.0);
- m_resource->sendGeometry(0, 0, m_monitor->m_output->physicalSize.x, m_monitor->m_output->physicalSize.y, (wl_output_subpixel)m_monitor->m_output->subpixel,
- m_monitor->m_output->make.c_str(), m_monitor->m_output->model.c_str(), m_monitor->m_transform);
+ m_resource->sendGeometry(0, 0, m_monitor->m_output->physicalSize.x, m_monitor->m_output->physicalSize.y, m_monitor->m_output->subpixel, m_monitor->m_output->make.c_str(),
+ m_monitor->m_output->model.c_str(), m_monitor->m_transform);
if (m_resource->version() >= 2)
m_resource->sendDone();