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: Always create a display capture on first run

Browse source 
For the sake of consistency, always create a display capture source on
the very first run of the program, just to have something displayed.

(NOTE: The only exception here is on windows 7/vista, which isn't ideal
for display capture, so it'll continue to be left blank)
This commit is contained in:
jp9000 2015-09-11 21:49:21 -07:00
parent f10fb07f0e
commit 35b2ce565a
2 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
obs/window-basic-main.cpp
View file

@ -350,13 +350,44 @@ static inline bool HasAudioDevices(const char *source_id)
return count != 0;
}
void OBSBasic::CreateFirstRunSources(obs_scene_t *scene)
{
bool hasDesktopAudio = HasAudioDevices(App()->OutputAudioSource());
bool hasInputAudio = HasAudioDevices(App()->InputAudioSource());
const char *displayCaptureType = nullptr;
obs_source_t *source = nullptr;
#ifdef __APPLE__
displayCaptureType = "display_capture";
#elif _WIN32
if (GetWindowsVersion() >= 0x602)
displayCaptureType = "monitor_capture";
#else //X11
displayCaptureType = "xshm_input";
#endif
if (displayCaptureType) {
source = obs_source_create(OBS_SOURCE_TYPE_INPUT,
displayCaptureType, Str("Basic.DisplayCapture"),
NULL, nullptr);
}
if (source) {
obs_scene_add(scene, source);
obs_add_source(source);
obs_source_release(source);
}
if (hasDesktopAudio)
ResetAudioDevice(App()->OutputAudioSource(), "default",
Str("Basic.DesktopDevice1"), 1);
if (hasInputAudio)
ResetAudioDevice(App()->InputAudioSource(), "default",
Str("Basic.AuxDevice1"), 3);
}
void OBSBasic::CreateDefaultScene()
{
disableSaving++;
bool hasDesktopAudio = HasAudioDevices(App()->OutputAudioSource());
bool hasInputAudio = HasAudioDevices(App()->InputAudioSource());
ClearSceneData();
obs_scene_t *scene = obs_scene_create(Str("Basic.Scene"));
@ -364,27 +395,11 @@ void OBSBasic::CreateDefaultScene()
obs_add_source(source);
#ifdef __APPLE__
source = obs_source_create(OBS_SOURCE_TYPE_INPUT, "display_capture",
Str("Basic.DisplayCapture"), NULL, nullptr);
if (source) {
obs_scene_add(scene, source);
obs_add_source(source);
obs_source_release(source);
}
#endif
CreateFirstRunSources(scene);
obs_set_output_source(0, obs_scene_get_source(scene));
obs_scene_release(scene);
if (hasDesktopAudio)
ResetAudioDevice(App()->OutputAudioSource(), "default",
Str("Basic.DesktopDevice1"), 1);
if (hasInputAudio)
ResetAudioDevice(App()->InputAudioSource(), "default",
Str("Basic.AuxDevice1"), 3);
disableSaving--;
}

1
obs/window-basic-main.hpp
View file

@ -113,6 +113,7 @@ private:
void SetupEncoders();
void CreateFirstRunSources(obs_scene_t *scene);
void CreateDefaultScene();
void ClearVolumeControls();