diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt index 20e4e498ee23dd9fa5bf1e765032bbc04591ea3d..f458947d928085a388f8ebf30e73a2102767c2f5 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt @@ -146,7 +146,7 @@ set(libobs_libobs_HEADERS obs-defs.h obs-encoder.h obs-service.h - obs-data.h + obs-internal.h obs.h obs-module.h obs-scene.h diff --git a/libobs/obs-cocoa.c b/libobs/obs-cocoa.c index 3eaaffec562a2691e2e36fc10d3122a44cd7f782..3f9b93d1e2d66ad0bae826f46fa40dbb77ddf5ef 100644 --- a/libobs/obs-cocoa.c +++ b/libobs/obs-cocoa.c @@ -18,7 +18,7 @@ #include "util/platform.h" #include "util/dstr.h" #include "obs.h" -#include "obs-data.h" +#include "obs-internal.h" #include diff --git a/libobs/obs-display.c b/libobs/obs-display.c index 1d04877c2a7f40d47f5643147fb893b77fe0d6f0..4a66bc5ac3cfef818262bd8f8cd71e8148afd34d 100644 --- a/libobs/obs-display.c +++ b/libobs/obs-display.c @@ -16,7 +16,7 @@ ******************************************************************************/ #include "obs.h" -#include "obs-data.h" +#include "obs-internal.h" obs_display_t obs_display_create(struct gs_init_data *graphics_data) { diff --git a/libobs/obs-encoder.c b/libobs/obs-encoder.c index 095751e032cebeca18e8d823e2a23c45f8ccdfd7..0e643ef6e213c081b1f22f7bc18ba37c8264b6cd 100644 --- a/libobs/obs-encoder.c +++ b/libobs/obs-encoder.c @@ -16,7 +16,7 @@ ******************************************************************************/ #include "obs.h" -#include "obs-data.h" +#include "obs-internal.h" bool load_encoder_info(void *module, const char *module_name, const char *id, struct encoder_info *info) diff --git a/libobs/obs-data.h b/libobs/obs-internal.h similarity index 100% rename from libobs/obs-data.h rename to libobs/obs-internal.h diff --git a/libobs/obs-module.c b/libobs/obs-module.c index a9cdf6b4c09d4d3874a211feb1902880882ee035..6b55289ca0af4acad4c19e2da4d2670997a964a3 100644 --- a/libobs/obs-module.c +++ b/libobs/obs-module.c @@ -19,7 +19,7 @@ #include "util/dstr.h" #include "obs-defs.h" -#include "obs-data.h" +#include "obs-internal.h" #include "obs-module.h" void *load_module_subfunc(void *module, const char *module_name, diff --git a/libobs/obs-output.c b/libobs/obs-output.c index 59f70f2f02c685eee88471aa4916d5f73759695a..48b47c8024c32881edbec1087b1cb0dfcf69a697 100644 --- a/libobs/obs-output.c +++ b/libobs/obs-output.c @@ -16,7 +16,7 @@ ******************************************************************************/ #include "obs.h" -#include "obs-data.h" +#include "obs-internal.h" bool load_output_info(void *module, const char *module_name, const char *id, struct output_info *info) diff --git a/libobs/obs-source.c b/libobs/obs-source.c index 5b5fd4f1fbbbd08487f82d57bda3937a77c3ca87..784082051705da4b9541a7d44542072afb4098c4 100644 --- a/libobs/obs-source.c +++ b/libobs/obs-source.c @@ -22,7 +22,7 @@ #include "graphics/vec3.h" #include "obs.h" -#include "obs-data.h" +#include "obs-internal.h" static void obs_source_destroy(obs_source_t source); diff --git a/libobs/obs-video.c b/libobs/obs-video.c index 235e804d2ac0a02ddc36844bb8af239871b9a581..8438c657400db173f9ed1332c029f0bba5b23069 100644 --- a/libobs/obs-video.c +++ b/libobs/obs-video.c @@ -16,7 +16,7 @@ ******************************************************************************/ #include "obs.h" -#include "obs-data.h" +#include "obs-internal.h" #include "graphics/vec4.h" static void tick_sources(uint64_t cur_time, uint64_t *last_time) diff --git a/libobs/obs-windows.c b/libobs/obs-windows.c index 9b0b92dbdc5707c5abf52ce736b8fc324290300c..562132457bede5405aaf598736936588e8998ae9 100644 --- a/libobs/obs-windows.c +++ b/libobs/obs-windows.c @@ -18,7 +18,7 @@ #include "util/platform.h" #include "util/dstr.h" #include "obs.h" -#include "obs-data.h" +#include "obs-internal.h" static inline bool check_path(const char* data, const char *path, struct dstr * output) diff --git a/libobs/obs.c b/libobs/obs.c index b9d51d1f44aed4fb4528eea2d6e20acfafd672fa..b76e1925ce04efd9eea0599e4ab85be462979ee0 100644 --- a/libobs/obs.c +++ b/libobs/obs.c @@ -18,7 +18,7 @@ #include "callback/calldata.h" #include "obs.h" -#include "obs-data.h" +#include "obs-internal.h" #include "obs-module.h" struct obs_subsystem *obs = NULL; diff --git a/vs/2013/libobs/libobs.vcxproj b/vs/2013/libobs/libobs.vcxproj index 899fcec4c63cf42cf5a245c7416c93836429518a..6957c4251263430e284bc0ba838fd8a812bc560d 100644 --- a/vs/2013/libobs/libobs.vcxproj +++ b/vs/2013/libobs/libobs.vcxproj @@ -43,9 +43,9 @@ - + diff --git a/vs/2013/libobs/libobs.vcxproj.filters b/vs/2013/libobs/libobs.vcxproj.filters index ce920f27abf7c147be48c0a81c3ed0e61f0c00c6..c436658751f8d91455fb66c1379d1d6640d7c555 100644 --- a/vs/2013/libobs/libobs.vcxproj.filters +++ b/vs/2013/libobs/libobs.vcxproj.filters @@ -66,9 +66,6 @@ libobs\Header Files - - libobs\Header Files - libobs\Header Files @@ -201,6 +198,9 @@ libobs\Header Files + + libobs\Header Files +