fixed push-to-talk delay hotkey (wasn't working because everything us…

…es nanosecond timing rather than millisecond)
jp9000 · Oct 20, 2013 · b146feb · b146feb
1 parent f7a512f
commit b146feb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Source/OBS.h b/Source/OBS.h
@@ -769,7 +769,7 @@ class OBS
     HANDLE hHotkeyThread;
 
     bool bUsingPushToTalk, bPushToTalkDown, bPushToTalkOn;
-    int pushToTalkDelay, pushToTalkTimeLeft;
+    long long pushToTalkDelay, pushToTalkTimeLeft;
 
     UINT pushToTalkHotkeyID;
     UINT muteMicHotkeyID;

diff --git a/Source/OBSHotkeyHandlers.cpp b/Source/OBSHotkeyHandlers.cpp
@@ -56,7 +56,7 @@ void STDCALL OBS::PushToTalkHotkey(DWORD hotkey, UPARAM param, bool bDown)
     else if(App->pushToTalkDelay <= 0)
         App->bPushToTalkOn = false;
 
-    App->pushToTalkTimeLeft = App->pushToTalkDelay;
+    App->pushToTalkTimeLeft = App->pushToTalkDelay*1000000;
     OSDebugOut(TEXT("Actual delay: %d"), App->pushToTalkDelay);
 }
 

diff --git a/Source/SettingsAudio.cpp b/Source/SettingsAudio.cpp
@@ -98,7 +98,7 @@ void SettingsAudio::ApplySettings()
     AppConfig->SetInt(TEXT("Audio"), TEXT("UsePushToTalk"), App->bUsingPushToTalk);
     AppConfig->SetInt(TEXT("Audio"), TEXT("PushToTalkHotkey"), hotkey);
     AppConfig->SetInt(TEXT("Audio"), TEXT("PushToTalkHotkey2"), hotkey2);
-    AppConfig->SetInt(TEXT("Audio"), TEXT("PushToTalkDelay"), App->pushToTalkDelay);
+    AppConfig->SetInt(TEXT("Audio"), TEXT("PushToTalkDelay"), (int)App->pushToTalkDelay);
 
     if(App->pushToTalkHotkeyID)
     {