repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added ActivateSource action to cectray
[deb_libcec.git]
/
src
/
LibCecTray
/
ui
/
CECTray.cs
diff --git
a/src/LibCecTray/ui/CECTray.cs
b/src/LibCecTray/ui/CECTray.cs
index bf4e05a746af9a0282af435e19f08a4d289767eb..3f7c09422aa0a86e9aa21ab2da6714c135ccdf44 100644
(file)
--- a/
src/LibCecTray/ui/CECTray.cs
+++ b/
src/LibCecTray/ui/CECTray.cs
@@
-55,7
+55,7
@@
namespace LibCECTray.ui
Text = Resources.app_name;
InitializeComponent();
Text = Resources.app_name;
InitializeComponent();
- _sstimer.Interval =
1
000;
+ _sstimer.Interval =
5
000;
_sstimer.Tick += ScreensaverActiveCheck;
_sstimer.Enabled = false;
_sstimer.Tick += ScreensaverActiveCheck;
_sstimer.Enabled = false;
@@
-112,9
+112,11
@@
namespace LibCECTray.ui
if (msg.Msg == WM_SYSCOMMAND && (msg.WParam.ToInt32() & 0xfff0) == SC_SCREENSAVE)
{
// there's no event for screensaver exit
if (msg.Msg == WM_SYSCOMMAND && (msg.WParam.ToInt32() & 0xfff0) == SC_SCREENSAVE)
{
// there's no event for screensaver exit
- _sstimer.Enabled = true;
- OnSleep();
- return;
+ if (!_sstimer.Enabled)
+ {
+ _sstimer.Enabled = true;
+ Controller.CECActions.SendStandby(CecLogicalAddress.Broadcast);
+ }
}
else if (msg.Msg == WM_POWERBROADCAST)
{
}
else if (msg.Msg == WM_POWERBROADCAST)
{
@@
-164,7
+166,7
@@
namespace LibCECTray.ui
if (!IsScreensaverActive())
{
_sstimer.Enabled = false;
if (!IsScreensaverActive())
{
_sstimer.Enabled = false;
-
OnWak
e();
+
Controller.CECActions.ActivateSourc
e();
}
}
}
}
@@
-182,7
+184,9
@@
namespace LibCECTray.ui
private void OnSleep()
{
private void OnSleep()
{
- Controller.Close();
+ Controller.CECActions.SuppressUpdates = true;
+ AsyncDisconnect dc = new AsyncDisconnect(Controller);
+ (new Thread(dc.Process)).Start();
}
public override sealed string Text
}
public override sealed string Text
@@
-201,9
+205,7
@@
namespace LibCECTray.ui
Hide();
if (disposing)
{
Hide();
if (disposing)
{
- Controller.CECActions.SuppressUpdates = true;
- AsyncDisconnect dc = new AsyncDisconnect(Controller);
- (new Thread(dc.Process)).Start();
+ OnSleep();
}
if (disposing && (components != null))
{
}
if (disposing && (components != null))
{
@@
-299,7
+301,7
@@
namespace LibCECTray.ui
private void BActivateSourceClick(object sender, EventArgs e)
{
private void BActivateSourceClick(object sender, EventArgs e)
{
- Controller.CECActions.
ActivateSource
(GetTargetDevice());
+ Controller.CECActions.
SetStreamPath
(GetTargetDevice());
}
private void CbCommandDestinationSelectedIndexChanged(object sender, EventArgs e)
}
private void CbCommandDestinationSelectedIndexChanged(object sender, EventArgs e)