[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-multimedia
Subject: Re: Review Request 112076: Fix bug where monitor won't powersave even with only audio content
From: "Harald Sitter" <sitter () kde ! org>
Date: 2013-08-27 11:05:05
Message-ID: 20130827110505.15579.95356 () vidsolbach ! de
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
> On Aug. 26, 2013, 9:12 a.m., Harald Sitter wrote:
> > src/app/mainWindow.cpp, lines 866-887
> > <http://git.reviewboard.kde.org/r/112076/diff/5/?file=184675#file184675line866>
> >
> > no unrelated format changes please
>
> James Smith wrote:
> Should I have a separate patch then to fix some of the style issues or just leave \
> it after the bulk of the issues have been ironed out?
just leave it, they are isolated to functions
> On Aug. 26, 2013, 9:12 a.m., Harald Sitter wrote:
> > src/app/mainWindow.cpp, line 864
> > <http://git.reviewboard.kde.org/r/112076/diff/5/?file=184675#file184675line864>
> >
> > the f(bool) signature is not necessary here.
> >
> > you can simply use TheStream::hasVideo() inside the supression function as that \
> > is what the entire logic depends on anyway.
>
> James Smith wrote:
> TheStream::hasVideo() didn't work when I originally attempted a quick patch to fix \
> the issue. Thus I needed to use stateChanged to have the bug fixed.
> > > grep hasVideo src/app/mainWindow.cpp |wc -l
4
I am reasonable certain it works :P
What I just remembered though... Phonon dispatches this information as a signal (i.e. \
state changes to playing; 3 seconds later; signal for hasVideoChanged arrives \
indicating this is audio-only content), so checking hasVideo() at the time of state \
change can lead to wrong behavior (e.g. hasVideo=false; 3 seconds later; \
hasVideo=true).
So yes, likely engineHasVideoChanged() is where you want to have additional logic.
Perhaps something like this:
new function MainWindow::inhibitSleep() [example name :S; contains sleep logic from \
inhibitPowersave()] new function MainWindow::releaseSleep() [contains release for \
sleep logic from releasePowersave()[] new function MainWindow::inhibitScreenSleep() \
[contains screen power management from inhibitPowersave()] new function \
MainWindow::releaseScreenSleep() [contains release for screen power management from \
releasePowersave()] remove function MainWindow::inhibitPowersave() [release can be \
kept around as convenience function) MainWindow::engineStateChanged(...) calls \
MainWindow::inhibitSleep() [assumption: we always have audio, so we always want to \
prevent sleeping] MainWindow::engineHasVideoChanged(...) it calls \
MainWindow::inhibitScreenSleep() if hasVideo=true, or calls \
MainWindow::releaseScreenSleep() if hasVideo=no [overall condition: state must be \
playing] [on state change to !playing we continue to call releasePowersave(), which \
in turn calls both releseSleep() and releaseScreenSleep()]
ultimate result is then that we always prevent sleeping
- Harald
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/112076/#review38595
-----------------------------------------------------------
On Aug. 27, 2013, 1:15 a.m., James Smith wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/112076/
> -----------------------------------------------------------
>
> (Updated Aug. 27, 2013, 1:15 a.m.)
>
>
> Review request for KDE Multimedia and Harald Sitter.
>
>
> Description
> -------
>
> Fixes an issue where playing audio content keeps the screen awake. Video content is \
> supposed to, but with the new play URL button, dragon should allow the monitor to \
> turn off.
>
> Diffs
> -----
>
> src/app/mainWindow.h 51ef72c
> src/app/mainWindow.cpp f850820
> src/app/stateChange.cpp 0edde72
>
> Diff: http://git.reviewboard.kde.org/r/112076/diff/
>
>
> Testing
> -------
>
> Compile, run-test
>
>
> Thanks,
>
> James Smith
>
>
[Attachment #5 (text/html)]
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;"> <tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/112076/">http://git.reviewboard.kde.org/r/112076/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On August 26th, 2013, 9:12 a.m. UTC, <b>Harald \
Sitter</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="http://git.reviewboard.kde.org/r/112076/diff/5/?file=184675#file184675line864" \
style="color: black; font-weight: bold; text-decoration: \
underline;">src/app/mainWindow.cpp</a> <span style="font-weight: normal;">
(Diff revision 5)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
">MainWindow::keyPressEvent( QKeyEvent *e )</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">864</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="n">MainWindow</span><span class="o">::</span><span \
class="n">inhibitPowerSave</span><span class="p">()</span></pre></td> <th \
bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">864</font></th> <td bgcolor="#fdfebc" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="n">MainWindow</span><span class="o">::</span><span \
class="n">inhibitPowerSave</span><span class="p">(</span><span class="hl"> \
</span><span class="kt"><span class="hl">bool</span></span><span class="hl"> \
</span><span class="n"><span class="hl">hasVideo</span></span><span class="hl"> \
</span><span class="p">)</span></pre></td> </tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">the f(bool) signature is \
not necessary here.
you can simply use TheStream::hasVideo() inside the supression function as that is \
what the entire logic depends on anyway.</pre> </blockquote>
<p>On August 26th, 2013, 11:49 p.m. UTC, <b>James Smith</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">TheStream::hasVideo() \
didn't work when I originally attempted a quick patch to fix the issue. Thus I \
needed to use stateChanged to have the bug fixed.</pre> </blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">>>> grep hasVideo src/app/mainWindow.cpp |wc -l 4
I am reasonable certain it works :P
What I just remembered though... Phonon dispatches this information as a signal (i.e. \
state changes to playing; 3 seconds later; signal for hasVideoChanged arrives \
indicating this is audio-only content), so checking hasVideo() at the time of state \
change can lead to wrong behavior (e.g. hasVideo=false; 3 seconds later; \
hasVideo=true).
So yes, likely engineHasVideoChanged() is where you want to have additional logic.
Perhaps something like this:
new function MainWindow::inhibitSleep() [example name :S; contains sleep logic from \
inhibitPowersave()] new function MainWindow::releaseSleep() [contains release for \
sleep logic from releasePowersave()[] new function MainWindow::inhibitScreenSleep() \
[contains screen power management from inhibitPowersave()] new function \
MainWindow::releaseScreenSleep() [contains release for screen power management from \
releasePowersave()] remove function MainWindow::inhibitPowersave() [release can be \
kept around as convenience function) MainWindow::engineStateChanged(...) calls \
MainWindow::inhibitSleep() [assumption: we always have audio, so we always want to \
prevent sleeping] MainWindow::engineHasVideoChanged(...) it calls \
MainWindow::inhibitScreenSleep() if hasVideo=true, or calls \
MainWindow::releaseScreenSleep() if hasVideo=no [overall condition: state must be \
playing] [on state change to !playing we continue to call releasePowersave(), which \
in turn calls both releseSleep() and releaseScreenSleep()]
ultimate result is then that we always prevent sleeping </pre>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On August 26th, 2013, 9:12 a.m. UTC, <b>Harald \
Sitter</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="http://git.reviewboard.kde.org/r/112076/diff/5/?file=184675#file184675line866" \
style="color: black; font-weight: bold; text-decoration: \
underline;">src/app/mainWindow.cpp</a> <span style="font-weight: normal;">
(Diff revision 5)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
">MainWindow::keyPressEvent( QKeyEvent *e )</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">866</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> \
<span class="p">(</span><span class="n">m_stopSleepCookie</span> <span \
class="o">==</span> <span class="o">-</span><span class="mi">1</span><span \
class="p">)</span></pre></td> <th bgcolor="#e9eaa8" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">866</font></th> <td bgcolor="#fdfebc" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span \
class="p">(</span> <span class="n">m_stopSleepCookie</span> <span class="o">==</span> \
<span class="o">-</span><span class="mi">1</span> <span class="p">)</span></pre></td> \
</tr>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">867</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">m_stopSleepCookie</span> <span class="o">=</span> <span \
class="n">Solid</span><span class="o">::</span><span \
class="n">PowerManagement</span><span class="o">::</span><span \
class="n">beginSuppressingSleep</span><span class="p">(</span><span \
class="n">QLatin1String</span><span class="p">(</span> <span class="s">"<span \
class="hl">watch</span>ing <span class="hl">a film</span>"</span> <span \
class="p">));</span></pre></td> <th bgcolor="#e9eaa8" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">867</font></th> <td bgcolor="#fdfebc" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="n">m_stopSleepCookie</span> \
<span class="o">=</span> <span class="n">Solid</span><span class="o">::</span><span \
class="n">PowerManagement</span><span class="o">::</span><span \
class="n">beginSuppressingSleep</span><span class="p">(</span> <span \
class="n">QLatin1String</span><span class="p">(</span> <span class="s">"<span \
class="hl">listen</span>ing <span class="hl">to an audio</span>"</span> <span \
class="p">)</span> <span class="p">);</span></pre></td> </tr>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">868</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> \
<span class="p">(</span><span class="n">m_stopScreenPowerMgmtCookie</span> <span \
class="o">==</span> <span class="o">-</span><span class="mi">1</span><span \
class="p">)</span></pre></td> <th bgcolor="#e9eaa8" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">868</font></th> <td bgcolor="#fdfebc" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span \
class="p">(</span> <span class="n">hasVideo</span> <span class="p">)</span> <span \
class="p">{</span></pre></td> </tr>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">869</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">m_stopScreenPowerMgmtCookie</span> <span class="o">=</span> <span \
class="n">Solid</span><span class="o">::</span><span \
class="n">PowerManagement</span><span class="o">::</span><span \
class="n">beginSuppressingScreenPowerManagement</span><span class="p">(</span><span \
class="n">QLatin1String</span><span class="p">(</span> <span class="s">"watching \
a film"</span> <span class="p">));</span></pre></td> <th bgcolor="#e9eaa8" \
style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">869</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="k">if</span> <span class="p">(</span> <span \
class="n">m_stopScreenPowerMgmtCookie</span> <span class="o">==</span> <span \
class="o">-</span><span class="mi">1</span> <span class="p">)</span></pre></td> \
</tr>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">870</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> \
<span class="p">(</span><span class="o">!</span><span \
class="n">m_stopScreenSaver</span><span class="p">)</span></pre></td> <th \
bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">870</font></th> <td bgcolor="#fdfebc" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> \
<span class="n">m_stopScreenPowerMgmtCookie</span> <span class="o">=</span> <span \
class="n">Solid</span><span class="o">::</span><span \
class="n">PowerManagement</span><span class="o">::</span><span \
class="n">beginSuppressingScreenPowerManagement</span><span class="p">(</span> <span \
class="n">QLatin1String</span><span class="p">(</span> <span class="s">"watching \
a film"</span> <span class="p">)</span> <span class="p">);</span></pre></td> \
</tr>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">871</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">m_stopScreenSaver</span> <span class="o">=</span> <span \
class="k">new</span> <span class="n">KNotificationRestrictions</span><span \
class="p">(</span><span class="n">KNotificationRestrictions</span><span \
class="o">::</span><span class="n">ScreenSaver</span><span \
class="p">);</span></pre></td> <th bgcolor="#e9eaa8" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">871</font></th> <td bgcolor="#fdfebc" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span \
class="p">(</span> <span class="o">!</span><span class="n">m_stopScreenSaver</span> \
<span class="p">)</span></pre></td> </tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">872</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> \
<span class="n">m_stopScreenSaver</span> <span class="o">=</span> <span \
class="k">new</span> <span class="n">KNotificationRestrictions</span><span \
class="p">(</span> <span class="n">KNotificationRestrictions</span><span \
class="o">::</span><span class="n">ScreenSaver</span> <span \
class="p">);</span></pre></td> </tr>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">873</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="p">}</span></pre></td> </tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">872</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="p">}</span></pre></td> <th bgcolor="#f0f0f0" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">874</font></th> <td bgcolor="#ffffff" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "><span class="p">}</span></pre></td> </tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">873</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">875</font></th> <td bgcolor="#ffffff" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> \
</tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">874</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="kt">void</span></pre></td> <th bgcolor="#f0f0f0" style="border-left: 1px \
solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">876</font></th> <td bgcolor="#ffffff" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "><span class="kt">void</span></pre></td> </tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">875</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="n">MainWindow</span><span class="o">::</span><span \
class="n">releasePowerSave</span><span class="p">()</span></pre></td> <th \
bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">877</font></th> <td bgcolor="#ffffff" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="n">MainWindow</span><span class="o">::</span><span \
class="n">releasePowerSave</span><span class="p">()</span></pre></td> </tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">876</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="p">{</span></pre></td> <th bgcolor="#f0f0f0" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">878</font></th> <td bgcolor="#ffffff" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "><span class="p">{</span></pre></td> </tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">877</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="c1">//stop \
supressing sleep</span></pre></td> <th bgcolor="#f0f0f0" style="border-left: 1px \
solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">879</font></th> <td bgcolor="#ffffff" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="c1">//stop supressing \
sleep</span></pre></td> </tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">878</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> \
<span class="p">(</span><span class="n">m_stopSleepCookie</span> <span \
class="o">!=</span> <span class="o">-</span><span class="mi">1</span><span \
class="p">)</span> <span class="p">{</span></pre></td> <th bgcolor="#e9eaa8" \
style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">880</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> \
<span class="p">(</span> <span class="n">m_stopSleepCookie</span> <span \
class="o">!=</span> <span class="o">-</span><span class="mi">1</span> <span \
class="p">)</span> <span class="p">{</span></pre></td> </tr>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">879</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">Solid</span><span class="o">::</span><span \
class="n">PowerManagement</span><span class="o">::</span><span \
class="n">stopSuppressingSleep</span><span class="p">(</span><span \
class="n">m_stopSleepCookie</span><span class="p">);</span></pre></td> <th \
bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">881</font></th> <td bgcolor="#fdfebc" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">Solid</span><span class="o">::</span><span \
class="n">PowerManagement</span><span class="o">::</span><span \
class="n">stopSuppressingSleep</span><span class="p">(</span> <span \
class="n">m_stopSleepCookie</span> <span class="p">);</span></pre></td> </tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">880</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">m_stopSleepCookie</span> <span class="o">=</span> <span \
class="o">-</span><span class="mi">1</span><span class="p">;</span></pre></td> <th \
bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">882</font></th> <td bgcolor="#ffffff" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">m_stopSleepCookie</span> <span class="o">=</span> <span \
class="o">-</span><span class="mi">1</span><span class="p">;</span></pre></td> </tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">881</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="p">}</span></pre></td> <th bgcolor="#f0f0f0" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">883</font></th> <td bgcolor="#ffffff" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; "> <span class="p">}</span></pre></td> </tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">882</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">884</font></th> <td bgcolor="#ffffff" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> \
</tr>
<tr>
<th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">883</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="c1">//stop \
supressing screen power management</span></pre></td> <th bgcolor="#f0f0f0" \
style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">885</font></th> <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="c1">//stop \
supressing screen power management</span></pre></td> </tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">884</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> \
<span class="p">(</span><span class="n">m_stopScreenPowerMgmtCookie</span> <span \
class="o">!=</span> <span class="o">-</span><span class="mi">1</span><span \
class="p">)</span> <span class="p">{</span></pre></td> <th bgcolor="#e9eaa8" \
style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">886</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> \
<span class="p">(</span> <span class="n">m_stopScreenPowerMgmtCookie</span> <span \
class="o">!=</span> <span class="o">-</span><span class="mi">1</span> <span \
class="p">)</span> <span class="p">{</span></pre></td> </tr>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">885</font></th> <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">Solid</span><span class="o">::</span><span \
class="n">PowerManagement</span><span class="o">::</span><span \
class="n">stopSuppressingScreenPowerManagement</span><span class="p">(</span><span \
class="n">m_stopScreenPowerMgmtCookie</span><span class="p">);</span></pre></td> <th \
bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">887</font></th> <td bgcolor="#fdfebc" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">Solid</span><span class="o">::</span><span \
class="n">PowerManagement</span><span class="o">::</span><span \
class="n">stopSuppressingScreenPowerManagement</span><span class="p">(</span> <span \
class="n">m_stopScreenPowerMgmtCookie</span> <span class="p">);</span></pre></td> \
</tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">no unrelated format \
changes please</pre> </blockquote>
<p>On August 26th, 2013, 11:49 p.m. UTC, <b>James Smith</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Should I have a separate \
patch then to fix some of the style issues or just leave it after the bulk of the \
issues have been ironed out?</pre> </blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">just leave \
it, they are isolated to functions</pre> <br />
<p>- Harald</p>
<br />
<p>On August 27th, 2013, 1:15 a.m. UTC, James Smith wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for KDE Multimedia and Harald Sitter.</div>
<div>By James Smith.</div>
<p style="color: grey;"><i>Updated Aug. 27, 2013, 1:15 a.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Fixes an issue where playing audio content keeps the screen awake. Video \
content is supposed to, but with the new play URL button, dragon should allow the \
monitor to turn off.</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Compile, run-test</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>src/app/mainWindow.h <span style="color: grey">(51ef72c)</span></li>
<li>src/app/mainWindow.cpp <span style="color: grey">(f850820)</span></li>
<li>src/app/stateChange.cpp <span style="color: grey">(0edde72)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/112076/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
_______________________________________________
kde-multimedia mailing list
kde-multimedia@kde.org
https://mail.kde.org/mailman/listinfo/kde-multimedia
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic