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

Fix a few formatting issues

Browse Source 
Fixed a few files that went over 80 columns, mostly just a nitpack on my
part.

libobs/obs-nix.c had a rather bad case of leading whitespace.

Also, fixed the x86 obs-studio project files so that it would properly
output to the right directory.  It couldn't find libobs.lib because
obs-studio's project settings had it outputting to a different place
than the rest of the projects.
This commit is contained in:
jp9000
2014-01-24 12:52:22 -07:00
parent 017a16ac7f
commit 9f1249326b
4 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libobs/obs-nix.c
View File

@@ -22,7 +22,8 @@
#include "util/dstr.h"
#include "obs.h"
static inline bool check_path(const char* data, const char *path, struct dstr * output)
static inline bool check_path(const char* data, const char *path,
struct dstr * output)
{
dstr_copy(output, path);
dstr_cat(output, data);
@@ -32,7 +33,8 @@ static inline bool check_path(const char* data, const char *path, struct dstr *
return access(output->array, R_OK) == 0;
}
static inline bool check_lib_path(const char* data, const char *path, struct dstr *output)
static inline bool check_lib_path(const char* data, const char *path,
struct dstr *output)
{
bool result = false;
struct dstr tmp;
@@ -59,7 +61,8 @@ char *find_plugin(const char *plugin)
if (check_lib_path(plugin, "obs-plugins/", &output))
return output.array;
if (check_lib_path(plugin, OBS_INSTALL_PREFIX "lib/obs-plugins", &output))
if (check_lib_path(plugin, OBS_INSTALL_PREFIX "lib/obs-plugins",
&output))
return output.array;
dstr_free(&output);
@@ -78,7 +81,8 @@ char *find_libobs_data_file(const char *file)
if (check_path(file, OBS_DATA_PATH "/libobs/", &output))
return output.array;
if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/libobs/", &output))
if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/libobs/",
&output))
return output.array;
dstr_free(&output);
@@ -97,7 +101,8 @@ char *obs_find_plugin_file(const char *file)
if (check_path(file, OBS_DATA_PATH "/obs-plugins/", &output))
return output.array;
if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/obs-plugins/", &output))
if (check_path(file, OBS_INSTALL_PREFIX OBS_DATA_PATH "/obs-plugins/",
&output))
return output.array;
dstr_free(&output);