Merge pull request #2 from ExtReMLapin/revert-1-feature-autopause

Revert "Feature autopause"
ExtReMLapin · Feb 8, 2020 · 4a33baa · 4a33baa
2 parents 2640540 + 3daceaa
commit 4a33baa
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 68 deletions.
diff --git a/LuteBot/Config/PropertyItem.cs b/LuteBot/Config/PropertyItem.cs
@@ -23,7 +23,7 @@ public enum PropertyItem
         NoteCooldown,
         DebugMode,
         ZeroingOnPlay,
-        PauseWhenRequired,
+        DontPlayNoteWhenRequired,
 
         //keybinds
         Play,

diff --git a/LuteBot/IO/KB/ActionManager.cs b/LuteBot/IO/KB/ActionManager.cs
@@ -117,57 +117,38 @@ struct CURSORINFO
         private static extern IntPtr GetForegroundWindow();
         #endregion
 
-        public static event EventHandler PauseFromGameEvent = delegate { };
+
+
 
         private static void InputCommand(int noteId)
         {
+
             Process[] processes = Process.GetProcessesByName("Mordhau-Win64-Shipping"); // i refresh it on each call because it may get closed or rebooted etc
             if (processes.Length != 1) // if there is no game detected then fuck off
                 return;
             IntPtr winhandle = processes[0].MainWindowHandle;
             if (winhandle != GetForegroundWindow()) // if the game has no focus, then fuck off
                 return;
 
-            /*
-             * If the cursor is showing, it has 2 possibilities:
-             * 
-             * 1. Console is still up from previously sent note
-             * 2. User initiated action (e.g., typing, menu)
-             * 
-             * To avoid case 1, we check again after brief timeout to give console enough time to close;
-             * if the cursor is still up, we know with high confidence it's case 2.
-             */
-
             CURSORINFO pci = new CURSORINFO();
             pci.cbSize = Marshal.SizeOf(typeof(CURSORINFO));
             GetCursorInfo(ref pci); // it stores the cursordata to the struct
 
-            if (pci.flags == CURSOR_SHOWING)
+
+
+            /*
+             * If the cursor is showing, it means the user is typing or doesn't have the required state to play lute.
+             */
+
+            if (ConfigManager.GetBooleanProperty(PropertyItem.DontPlayNoteWhenRequired) == true)
             {
-                Thread.Sleep(20);
-                // refetch cursor info
-                CURSORINFO pci_1 = new CURSORINFO();
-                pci_1.cbSize = Marshal.SizeOf(typeof(CURSORINFO));
-                GetCursorInfo(ref pci_1);
-                if (pci_1.flags == CURSOR_SHOWING)
-                {
-                    if (ConfigManager.GetBooleanProperty(PropertyItem.PauseWhenRequired) == true)
-                    {
-                        PauseFromGameEvent(null, EventArgs.Empty);
-                    }
+                if (pci.flags == CURSOR_SHOWING)
                     return;
-                }
-            }
 
-            if (((Control.ModifierKeys & Keys.Control) == Keys.Control) ||
-                ((Control.ModifierKeys & Keys.Shift) == Keys.Shift) ||
-                (Control.ModifierKeys & Keys.Alt) == Keys.Alt)
-            {
-                if (ConfigManager.GetBooleanProperty(PropertyItem.PauseWhenRequired) == true)
-                {
-                    PauseFromGameEvent(null, EventArgs.Empty);
-                }
-                return;
+                if (((Control.ModifierKeys & Keys.Control) == Keys.Control) ||
+                    ((Control.ModifierKeys & Keys.Shift) == Keys.Shift) ||
+                    (Control.ModifierKeys & Keys.Alt) == Keys.Alt)
+                    return;
             }
 
 

diff --git a/LuteBot/Resources/DefaultConfig.txt b/LuteBot/Resources/DefaultConfig.txt
@@ -129,7 +129,7 @@
       "Value": "false"
     },
 	{
-      "Item": "PauseWhenRequired",
+      "Item": "DontPlayNoteWhenRequired",
       "Value": "true"
     }
   ]

diff --git a/LuteBot/UI/LuteBotForm.cs b/LuteBot/UI/LuteBotForm.cs
@@ -86,7 +86,6 @@ public LuteBotForm()
             trackSelectionManager.ToggleTrackRequest += new EventHandler<TrackItem>(ToggleTrack);
             liveMidiManager = new LiveMidiManager();
             hotkeyManager.LiveInputManager = liveMidiManager;
-            ActionManager.PauseFromGameEvent += PauseFromGame;
 
             PlayButton.Enabled = false;
             StopButton.Enabled = false;
@@ -407,11 +406,7 @@ private void Play()
             {
                 ActionManager.ToggleConsole(true);
             }
-            // needs to be wrapped to avoid cross-thread issue
-            PlayButton.BeginInvoke(new MethodInvoker(() =>
-            {
-                PlayButton.Text = playButtonStopString;
-            }));
+            PlayButton.Text = playButtonStopString;
             player.Play();
             timer1.Start();
             playButtonIsPlaying = true;
@@ -423,11 +418,7 @@ private void Pause()
             {
                 ActionManager.ToggleConsole(false);
             }
-            // needs to be wrapped to avoid cross-thread issue
-            PlayButton.BeginInvoke(new MethodInvoker(() =>
-            {
-                PlayButton.Text = playButtonStartString;
-            }));
+            PlayButton.Text = playButtonStartString;
             player.Pause();
             timer1.Stop();
             playButtonIsPlaying = false;
@@ -519,12 +510,6 @@ private void TrackFilteringToolStripMenuItem_Click(object sender, EventArgs e)
             }
         }
 
-        private void PauseFromGame(object sender, EventArgs e)
-        {
-            Pause();
-        }
-
-
         private static IntPtr SetHook(LowLevelKeyboardProc proc)
         {
             using (Process curProcess = Process.GetCurrentProcess())

diff --git a/LuteBot/UI/SettingsForm.Designer.cs b/LuteBot/UI/SettingsForm.Designer.cs
diff --git a/LuteBot/UI/SettingsForm.cs b/LuteBot/UI/SettingsForm.cs
@@ -120,7 +120,7 @@ private void InitSettings()
             OnlineSyncCheckBox.Checked = ConfigManager.GetBooleanProperty(PropertyItem.OnlineSync);
             SoundEffectsCheckBox.Checked = ConfigManager.GetBooleanProperty(PropertyItem.SoundEffects);
             ZeroingCheckBox.Checked = ConfigManager.GetBooleanProperty(PropertyItem.ZeroingOnPlay);
-            PauseWhenRequiredCheckbox.Checked = ConfigManager.GetBooleanProperty(PropertyItem.PauseWhenRequired);
+            DontPlayWhenRequiredCheckbox.Checked = ConfigManager.GetBooleanProperty(PropertyItem.DontPlayNoteWhenRequired);
             InitRadioButtons();
 
             NoteConversionMode.SelectedIndex = ConfigManager.GetIntegerProperty(PropertyItem.NoteConversionMode);
@@ -256,9 +256,9 @@ private void ZeroingCheckBox_CheckedChanged(object sender, EventArgs e)
             ConfigManager.SetProperty(PropertyItem.ZeroingOnPlay, (ZeroingCheckBox.Checked.ToString()));
         }
 
-        private void PauseWhenRequiredCheckbox_CheckedChanged(object sender, EventArgs e)
+        private void DontPlayWhenRequiredCheckbox_CheckedChanged(object sender, EventArgs e)
         {
-            ConfigManager.SetProperty(PropertyItem.PauseWhenRequired, (PauseWhenRequiredCheckbox.Checked.ToString()));
+            ConfigManager.SetProperty(PropertyItem.DontPlayNoteWhenRequired, (DontPlayWhenRequiredCheckbox.Checked.ToString()));
         }
     }
 }