OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Add hotkey to toggle preview

Browse source
This commit is contained in:
Clayton Groeneveld 2019-03-04 17:29:37 -06:00 committed by jp9000
parent 397f3733cf
commit e89283d172
3 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
UI/data/locale/en-US.ini
View file

@ -342,6 +342,9 @@ Basic.DisplayCapture="Display Capture"
# display context menu
Basic.Main.PreviewConextMenu.Enable="Enable Preview"
# disable preview
Basic.Main.Preview.Disable="Disable Preview"
# scale filtering
ScaleFiltering="Scale Filtering"
ScaleFiltering.Point="Point"

31
UI/window-basic-main.cpp
View file

@ -2182,6 +2182,19 @@ void OBSBasic::CreateHotkeys()
this, this);
LoadHotkeyPair(replayBufHotkeys,
"OBSBasic.StartReplayBuffer", "OBSBasic.StopReplayBuffer");
togglePreviewHotkeys = obs_hotkey_pair_register_frontend(
"OBSBasic.EnablePreview",
Str("Basic.Main.PreviewConextMenu.Enable"),
"OBSBasic.DisablePreview",
Str("Basic.Main.Preview.Disable"),
MAKE_CALLBACK(!basic.previewEnabled,
basic.EnablePreview, "Enabling preview"),
MAKE_CALLBACK(basic.previewEnabled,
basic.DisablePreview, "Disabling preview"),
this, this);
LoadHotkeyPair(togglePreviewHotkeys,
"OBSBasic.EnablePreview", "OBSBasic.DisablePreview");
#undef MAKE_CALLBACK
auto togglePreviewProgram = [] (void *data, obs_hotkey_id,
@ -6192,6 +6205,24 @@ void OBSBasic::TogglePreview()
EnablePreviewDisplay(previewEnabled);
}
void OBSBasic::EnablePreview()
{
if (previewProgramMode)
return;
previewEnabled = true;
EnablePreviewDisplay(true);
}
void OBSBasic::DisablePreview()
{
if (previewProgramMode)
return;
previewEnabled = false;
EnablePreviewDisplay(false);
}
static bool nudge_callback(obs_scene_t*, obs_sceneitem_t *item, void *param)
{
if (obs_sceneitem_locked(item))

5
UI/window-basic-main.hpp
View file

@ -324,7 +324,7 @@ private:
int GetTopSelectedSourceItem();
obs_hotkey_pair_id streamingHotkeys, recordingHotkeys,
replayBufHotkeys;
replayBufHotkeys, togglePreviewHotkeys;
obs_hotkey_id forceStreamingStopHotkey;
void InitDefaultTransitions();
@ -526,6 +526,9 @@ private slots:
void AudioMixerCopyFilters();
void AudioMixerPasteFilters();
void EnablePreview();
void DisablePreview();
private:
/* OBS Callbacks */
static void SceneReordered(void *data, calldata_t *params);