Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUnderground78 <underground78@users.sourceforge.net>2012-04-09 13:29:58 +0400
committerUnderground78 <underground78@users.sourceforge.net>2012-04-09 13:29:58 +0400
commitc8be36ab2109deb9bc643d554bd6aacc0f715f13 (patch)
tree2bf87a37b49e510e22026bc6de8e20f8c462c41b
parentc7f7674fe94314499e19e3bfeaeb6d25e222066e (diff)
[VSFilter] Remove the feature preventing the screensaver from running when VSFilter is active as it is a job for players not for filters.
This commit partially fixes ticket #1693. git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4305 10f7b99b-c216-0410-bff0-8a66a9350fd8
-rw-r--r--docs/Changelog.txt2
-rw-r--r--src/filters/transform/VSFilter/Systray.cpp16
2 files changed, 2 insertions, 16 deletions
diff --git a/docs/Changelog.txt b/docs/Changelog.txt
index a0873dd9e..a50fb90f4 100644
--- a/docs/Changelog.txt
+++ b/docs/Changelog.txt
@@ -15,6 +15,8 @@ Legend:
* Ticket #734, A unicode encoding will now be used for the ini file. Old ASCII
ini files will be automatically converted to unicode. Favorites with unicode
filenames are now correctly handled when using an ini file
+* Ticket #1693, [VSFilter] Remove the feature preventing the screensaver from
+ running when VSFilter is active as it is a job for players not for filters
* Ticket #1733/#2029, Include subfolders when opening a folder using the command
line or via the explorer context menu
* Ticket #2157, Show the [DXVA] indicator even when playback is paused
diff --git a/src/filters/transform/VSFilter/Systray.cpp b/src/filters/transform/VSFilter/Systray.cpp
index 4e23411b3..d3f2f670a 100644
--- a/src/filters/transform/VSFilter/Systray.cpp
+++ b/src/filters/transform/VSFilter/Systray.cpp
@@ -108,7 +108,6 @@ public:
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
afx_msg void OnClose();
afx_msg void OnDestroy();
- afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg LRESULT OnDVSPrevSub(WPARAM, LPARAM);
afx_msg LRESULT OnDVSNextSub(WPARAM, LPARAM);
afx_msg LRESULT OnDVSHideSub(WPARAM, LPARAM);
@@ -143,8 +142,6 @@ int CSystrayWindow::OnCreate(LPCREATESTRUCT lpCreateStruct)
// g_hHook = SetWindowsHookEx(WH_GETMESSAGE, (HOOKPROC)HookProc, AfxGetInstanceHandle(), 0);
}
- SetTimer(1, 5000, NULL);
-
PostMessage(s_uTaskbarRestart);
return 0;
@@ -172,19 +169,6 @@ void CSystrayWindow::OnDestroy()
PostQuitMessage(0);
}
-void CSystrayWindow::OnTimer(UINT_PTR nIDEvent)
-{
- if (nIDEvent == 1) {
- UINT fScreenSaver = 0;
- if (SystemParametersInfo(SPI_GETSCREENSAVEACTIVE, 0, (PVOID)&fScreenSaver, 0)) {
- SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, 0, 0, SPIF_SENDWININICHANGE); // this might not be needed at all...
- SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, fScreenSaver, 0, SPIF_SENDWININICHANGE);
- }
- }
-
- CWnd::OnTimer(nIDEvent);
-}
-
LRESULT CSystrayWindow::OnDVSPrevSub(WPARAM, LPARAM)
{
StepSub(-1);