Differential D8626 Diff 21788 daemon/backends/upower/ddcutilbrightness.cpp

Changeset View

Standalone View

View Options

daemon/backends/upower/ddcutilbrightness.cpp

Context not available.
23 23​
24DDCutilBrightness::DDCutilBrightness() 24​DDCutilBrightness::DDCutilBrightness()
25{ 25​{
26​ QVector<int> m_usedVcp = {0x10};
broulikUnsubmitted
Done

Use initializer:

DDCutilBrightness::DDCUtilBrightness()
    : m_usedVcp({0x10})
broulik: Use initializer: ``` DDCutilBrightness::DDCUtilBrightness() : m_usedVcp({0x10}) ```
26 m_setBrightnessEventFilter.setInterval(100); 27​ m_setBrightnessEventFilter.setInterval(100);
27 m_setBrightnessEventFilter.setSingleShot(true); 28​ m_setBrightnessEventFilter.setSingleShot(true);
28 connect(&m_setBrightnessEventFilter, &QTimer::timeout, this, &DDCutilBrightness::setBrightnessAfterFilter); 29​ connect(&m_setBrightnessEventFilter, &QTimer::timeout, this, &DDCutilBrightness::setBrightnessAfterFilter);
Context not available.
30 31​
31void DDCutilBrightness::detect() 32​void DDCutilBrightness::detect()
32{ 33​{
33#ifndef WITH_DDCUTIL 34​ #if WITH_DDCUTIL
34 qCInfo(POWERDEVIL) << "[DDCutilBrightness] compiled without DDC/CI support"; ​
35 return; ​
36#else ​
37 DDCA_Status rc; 35​ DDCA_Status rc;
38 36​
39 qCDebug(POWERDEVIL) << "Check for monitors using ddca_get_displays()..."; 37​ qCDebug(POWERDEVIL) << "Check for monitors using ddca_get_displays()...";
broulikUnsubmitted
Not Done

nullptr

broulik: `nullptr`
Context not available.
43 qCInfo(POWERDEVIL) << "[DDCutilBrightness] " << dlist->ct << "display(s) were detected"; 41​ qCInfo(POWERDEVIL) << "[DDCutilBrightness] " << dlist->ct << "display(s) were detected";
44 42​
45 for (int iDisp=0;iDisp<dlist->ct;iDisp++) { 43​ for (int iDisp=0;iDisp<dlist->ct;iDisp++) {
46 DDCA_Display_Identifier did; 44​
47 DDCA_Display_Ref dref; ​
48 DDCA_Display_Handle dh = nullptr; // initialize to avoid clang analyzer warning 45​ DDCA_Display_Handle dh = nullptr; // initialize to avoid clang analyzer warning
49 46​
50 qCDebug(POWERDEVIL) << "Create a Display Identifier for display"<<iDisp << 47​ qCDebug(POWERDEVIL) << "Create a Display Identifier for display"<<iDisp <<
Context not available.
52 49​
53 m_displayInfoList.append(dlist->info[iDisp]); 50​ m_displayInfoList.append(dlist->info[iDisp]);
54 51​
55 rc = ddca_create_dispno_display_identifier(iDisp+1, &did); // ddcutil uses 1 paded indexing for displays ​
56 ​
57 char * did_repr = ddca_did_repr(did); ​
58 ​
59 qCDebug(POWERDEVIL) << "did="<<did_repr; ​
60 ​
61 qCDebug(POWERDEVIL) << "Create a display reference from the display identifier..."; ​
62 rc = ddca_get_display_ref(did, &dref); ​
63 ​
64 if (rc != 0) { ​
65 qCWarning(POWERDEVIL) << "[DDCutilBrightness]: ddct_get_display_ref() returned "<< ​
66 rc<< " ("<<ddca_rc_name(rc) << ​
67 "): "<< ddca_rc_name(rc); ​
68 continue; ​
69 } ​
70 ​
71 char * dref_repr = ddca_dref_repr(dref); ​
72 qCDebug(POWERDEVIL) << "dref= " << dref_repr; ​
73 ​
74 qCDebug(POWERDEVIL) << "Open the display reference, creating a display handle..."; 52​ qCDebug(POWERDEVIL) << "Open the display reference, creating a display handle...";
75 rc = ddca_open_display(dref, &dh); 53​ rc = ddca_open_display(dlist->info[iDisp].dref, &dh);
76 if (rc != 0) { 54​ if (rc != 0) {
77 qCWarning(POWERDEVIL) << "[DDCutilBrightness]: ddct_open_display"<< rc; 55​ qCWarning(POWERDEVIL) << "[DDCutilBrightness]: ddct_open_display"<< rc;
78 continue; 56​ continue;
Context not available.
80 58​
81 qCDebug(POWERDEVIL) << "adding handle to list"; 59​ qCDebug(POWERDEVIL) << "adding handle to list";
82 m_displayHandleList.append(dh); 60​ m_displayHandleList.append(dh);
83 qCDebug(POWERDEVIL) << "handles nb: "<<m_displayHandleList.count(); 61​ m_supportedVcp_perDisp.append(QVector<uint16_t>());
84 char* capabilityString; ​
85 DDCA_Capabilities* parsedCapabilities; ​
86 ddca_get_capabilities_string(dh, &capabilityString); ​
87 ddca_parse_capabilities_string(capabilityString, &parsedCapabilities); ​
88 qCInfo(POWERDEVIL) << "[DDCutilBrightness] " << parsedCapabilities->vcp_code_ct << "capabilities parsed"; ​
89 ​
90 ​
91 m_descrToVcp_perDisp.append(QMap<QString, int>()); ​
92 m_vcpTovcpValueWithDescr_perDisp.append(QMap<int, QMap<int, QString> >() ); ​
93 //fill the feature description to vcp LUT ​
94 ​
95 DDCA_Version_Feature_Info* featureInfo; ​
96 for (int iVcp=0;iVcp<parsedCapabilities->vcp_code_ct;iVcp++) { ​
97 ​
98 int vcpCode=parsedCapabilities->vcp_codes[iVcp].feature_code; ​
99 ​
100 m_vcpTovcpValueWithDescr_perDisp[iDisp].insert(vcpCode, QMap<int, QString>()); ​
101 62​
102 m_descrToVcp_perDisp[iDisp].insert( 63​ for (int iVcp=0; iVcp<m_usedVcp.count();iVcp++) {
broulikUnsubmitted
Done

Coding style:

for (int iVcp = 0; iVcp < m_usedVcp.count(); ++iVcp) {
broulik: Coding style: ``` for (int iVcp = 0; iVcp < m_usedVcp.count(); ++iVcp) { ```
103 QString(ddca_get_feature_name(vcpCode)), vcpCode); 64​ DDCA_Single_Vcp_Value *returnValue;
104 65​ rc = ddca_get_vcp_value(dh, m_usedVcp[iVcp], DDCA_NON_TABLE_VCP_VALUE, &returnValue);
broulikUnsubmitted
Done

Use .value() instead of operator[] which is const

broulik: Use `.value()` instead of `operator[]` which is const
105 66​ if (rc == 0) {
106 ddca_get_feature_info_by_display(m_displayHandleList.at(iDisp), vcpCode, &featureInfo); 67​ qCDebug(POWERDEVIL) << "[DDCutilBrightness]: This monitor does not seam to support " << m_usedVcp[iVcp];
107 if (featureInfo == nullptr) { ​
108 continue; ​
109 } 68​ }
110 qCDebug(POWERDEVIL) << featureInfo->feature_code<<":"<<featureInfo->desc; 69​ else {
broulikUnsubmitted
Done

Coding style: Put on same line

} else {
broulik: Coding style: Put on same line ```} else {```
111 if ((featureInfo->feature_flags & DDCA_SIMPLE_NC) != DDCA_SIMPLE_NC) { 70​ m_supportedVcp_perDisp[iDisp].append(m_usedVcp[iVcp]);
112 continue; ​
113 } ​
114 for (int iVcpVal=0;featureInfo->sl_values[iVcpVal].value_code!=0;++iVcpVal) { ​
115 ​
116 qCDebug(POWERDEVIL) << "\t"<<featureInfo->sl_values[iVcpVal].value_code ​
117 <<":"<< featureInfo->sl_values[iVcpVal].value_name; ​
118 ​
119 bool thisVcpValIsSupported=false; ​
120 ​
121 for (int iSupportedVcpVal=0; iSupportedVcpVal<parsedCapabilities->vcp_codes[iVcp].value_ct; iSupportedVcpVal++) { ​
122 if(parsedCapabilities->vcp_codes[iVcp].values[iSupportedVcpVal] ​
123 ==featureInfo->sl_values[iVcpVal].value_code) { ​
124 thisVcpValIsSupported=true; ​
125 } ​
126 } ​
127 ​
128 if (thisVcpValIsSupported) { ​
129 (m_vcpTovcpValueWithDescr_perDisp[iDisp])[vcpCode].insert( ​
130 featureInfo->sl_values[iVcpVal].value_code, ​
131 featureInfo->sl_values[iVcpVal].value_name); ​
132 } ​
133 } 71​ }
broulikUnsubmitted
Not Done

Remove commented code

broulik: Remove commented code
134 } 72​ }
135 ddca_free_display_identifier(did); ​
136 ddca_free_parsed_capabilities(parsedCapabilities); ​
137 } 73​ }
138#endif 74​
75​ #else
76​ qCInfo(POWERDEVIL) << "[DDCutilBrightness] compiled without DDC/CI support";
77​ return;
78​ #endif
139} 79​}
140 80​
141 81​
142bool DDCutilBrightness::isSupported() const 82​bool DDCutilBrightness::isSupported() const
broulikUnsubmitted
Not Done

Coding style: if (...) {

broulik: Coding style: `if (...) {`
143{ 83​{
144#ifndef WITH_DDCUTIL 84​ #if WITH_DDCUTIL
broulikUnsubmitted
Done

Leave preprocessor directives unindented

broulik: Leave preprocessor directives unindented
145 return false; ​
146#else ​
147 return !m_displayHandleList.isEmpty(); 85​ return !m_displayHandleList.isEmpty();
148#endif 86​ #else
87​ return false;
88​ #endif
149} 89​}
150 90​
151 91​
152long DDCutilBrightness::brightness() 92​long DDCutilBrightness::brightness()
153{ 93​{
154#ifdef WITH_DDCUTIL 94​ #if WITH_DDCUTIL
95​ if (m_supportedVcp_perDisp.at(0).contains(0x10)) {
96​ qCDebug(POWERDEVIL) << "[DDCutilBrightness::brightness]: trying to get brightness for monitor that does not support it";
97​ return 0;
98​ }
155 //we check wether the timer is running, this means we received new values but did not send them yet to the monitor 99​ //we check wether the timer is running, this means we received new values but did not send them yet to the monitor
156 //not checking that results in the brightness slider jump to the previous vqlue when changing. 100​ //not checking that results in the brightness slider jump to the previous value when changing.
157 if(m_setBrightnessEventFilter.isActive()) { 101​ if (m_setBrightnessEventFilter.isActive()) {
158 m_lastBrightnessKnown = m_tmpCurrentBrightness; 102​ m_lastBrightnessKnown = m_tmpCurrentBrightness;
159 } 103​ }
160 else { //FIXME: gets value for display 1 104​ else { //FIXME: gets value for display 1
Context not available.
162 DDCA_Single_Vcp_Value *returnValue; 106​ DDCA_Single_Vcp_Value *returnValue;
163 107​
164 rc = ddca_get_vcp_value(m_displayHandleList.at(0), 108​ rc = ddca_get_vcp_value(m_displayHandleList.at(0),
165 m_descrToVcp_perDisp.at(0).value("Brightness"), 109​ 0x10,
166 DDCA_NON_TABLE_VCP_VALUE, &returnValue); 110​ DDCA_NON_TABLE_VCP_VALUE, &returnValue);
167 qCDebug(POWERDEVIL) << "[DDCutilBrightness::brightness]: ddca_get_vcp_value returned" << rc; 111​ qCDebug(POWERDEVIL) << "[DDCutilBrightness::brightness]: ddca_get_vcp_value returned" << rc;
168 112​
Context not available.
172 } 116​ }
173 } 117​ }
174 return m_lastBrightnessKnown; 118​ return m_lastBrightnessKnown;
175#else 119​ #else
176 return 0; 120​ return 0;
177#endif 121​ #endif
178} 122​}
179 123​
180long DDCutilBrightness::brightnessMax() 124​long DDCutilBrightness::brightnessMax()
181{ 125​{
182#ifdef WITH_DDCUTIL 126​ #if WITH_DDCUTIL
127​ if (m_supportedVcp_perDisp.at(0).contains(0x10)) {
128​ qCDebug(POWERDEVIL) << "[DDCutilBrightness::brightnessMax]: trying to set brightness for monitor that does not support it";
129​ return 0;
130​ }
131​
183 DDCA_Status rc; 132​ DDCA_Status rc;
184 DDCA_Single_Vcp_Value *returnValue; 133​ DDCA_Single_Vcp_Value *returnValue;
185 134​
186 rc = ddca_get_vcp_value(m_displayHandleList.at(0), 135​ rc = ddca_get_vcp_value(m_displayHandleList.at(0), 0x10,
187 m_descrToVcp_perDisp.at(0).value("Brightness"), ​
188 DDCA_NON_TABLE_VCP_VALUE, &returnValue); 136​ DDCA_NON_TABLE_VCP_VALUE, &returnValue);
189 qCDebug(POWERDEVIL) << "[DDCutilBrightness::brightnessMax]: ddca_get_vcp_value returned" << rc; 137​ qCDebug(POWERDEVIL) << "[DDCutilBrightness::brightnessMax]: ddca_get_vcp_value returned" << rc;
190 138​
Context not available.
194 } 142​ }
195 143​
196 return m_lastMaxBrightnessKnown; 144​ return m_lastMaxBrightnessKnown;
197#else 145​ #else
198 return 100.0; 146​ return 100.0;
199#endif 147​ #endif
200} 148​}
201 149​
202void DDCutilBrightness::setBrightness(long value) 150​void DDCutilBrightness::setBrightness(long value)
Context not available.
208 156​
209void DDCutilBrightness::setBrightnessAfterFilter() 157​void DDCutilBrightness::setBrightnessAfterFilter()
210{ 158​{
211#ifdef WITH_DDCUTIL 159​ #if WITH_DDCUTIL
160​ if (m_supportedVcp_perDisp.at(0).contains(0x10)) {
broulikUnsubmitted
Not Done

Can m_supportedVcp_perDisp be empty? .at(0) will assert if so.

broulik: Can `m_supportedVcp_perDisp` be empty? `.at(0)` will assert if so.
161​ qCDebug(POWERDEVIL) << "[DDCutilBrightness::brightness]: trying to set brightness for monitor that does not support it";
162​ return;
163​ }
164​
212 DDCA_Status rc; 165​ DDCA_Status rc;
213 for (int iDisp=0;iDisp<m_displayHandleList.count();iDisp++) { //FIXME: we set the same brightness to all monitors, plugin architecture needed 166​ for (int iDisp=0;iDisp<m_displayHandleList.count();iDisp++) { //FIXME: we set the same brightness to all monitors, plugin architecture needed
214 qCDebug(POWERDEVIL) << "[DDCutilBrightness]: setting brightness "<<m_tmpCurrentBrightness; 167​ qCDebug(POWERDEVIL) << "[DDCutilBrightness]: setting brightness "<<m_tmpCurrentBrightness;
215 rc = ddca_set_continuous_vcp_value(m_displayHandleList.at(iDisp), 168​ rc = ddca_set_continuous_vcp_value(m_displayHandleList.at(iDisp), 0x10,
216 m_descrToVcp_perDisp.at(iDisp).value("Brightness"), 169​ (int)m_tmpCurrentBrightness);
217 (int)m_tmpCurrentBrightness); ​
218 170​
219 if (rc != 0) { 171​ if (rc != 0) {
220 qCWarning(POWERDEVIL) << "[DDCutilBrightness::setBrightness] failed, trying to detect()"; 172​ qCWarning(POWERDEVIL) << "[DDCutilBrightness::setBrightness] failed, trying to detect()";
Context not available.
223 m_lastBrightnessKnown = m_tmpCurrentBrightness; 175​ m_lastBrightnessKnown = m_tmpCurrentBrightness;
224 } 176​ }
225 } 177​ }
226#else 178​ #else
227 return; 179​ return;
228#endif 180​ #endif
229} 181​}
Context not available.