jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apply configure video settings on startup

Browse Source
This commit is contained in:
jp9000
2013-12-22 23:40:07 -07:00
parent 991b5739d6
commit 399b0c8d10
9 changed files with 199 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libobs/obs.c
View File

@@ -343,7 +343,7 @@ bool obs_get_video_info(struct obs_video_info *ovi)
struct obs_video *video = &obs->video;
const struct video_info *info;
if (!video->graphics)
if (!obs || !video->graphics)
return false;
info = video_output_getinfo(video->video);
@@ -365,7 +365,7 @@ bool obs_get_audio_info(struct audio_info *ai)
struct obs_audio *audio = &obs->audio;
const struct audio_info *info;
if (!audio->audio)
if (!obs || !audio->audio)
return false;
info = audio_output_getinfo(audio->audio);

6
libobs/util/util.hpp
View File

@@ -89,7 +89,7 @@ public:
config = NULL;
}
inline operator config_t() {return config;}
inline operator config_t() const {return config;}
};
class TextLookup {
@@ -114,9 +114,9 @@ public:
return *this;
}
inline operator lookup_t() {return lookup;}
inline operator lookup_t() const {return lookup;}
inline const char *GetString(const char *lookupVal)
inline const char *GetString(const char *lookupVal) const
{
const char *out;
if (!text_lookup_getstr(lookup, lookupVal, &out))