提交 563613db 编写于 作者: J jp9000

Rename obs-data.h to obs-internal.h

Renaming obs-data.h to avoid confusion about its usage
上级 a5372e97
...@@ -146,7 +146,7 @@ set(libobs_libobs_HEADERS ...@@ -146,7 +146,7 @@ set(libobs_libobs_HEADERS
obs-defs.h obs-defs.h
obs-encoder.h obs-encoder.h
obs-service.h obs-service.h
obs-data.h obs-internal.h
obs.h obs.h
obs-module.h obs-module.h
obs-scene.h obs-scene.h
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "util/platform.h" #include "util/platform.h"
#include "util/dstr.h" #include "util/dstr.h"
#include "obs.h" #include "obs.h"
#include "obs-data.h" #include "obs-internal.h"
#include <unistd.h> #include <unistd.h>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
******************************************************************************/ ******************************************************************************/
#include "obs.h" #include "obs.h"
#include "obs-data.h" #include "obs-internal.h"
obs_display_t obs_display_create(struct gs_init_data *graphics_data) obs_display_t obs_display_create(struct gs_init_data *graphics_data)
{ {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
******************************************************************************/ ******************************************************************************/
#include "obs.h" #include "obs.h"
#include "obs-data.h" #include "obs-internal.h"
bool load_encoder_info(void *module, const char *module_name, bool load_encoder_info(void *module, const char *module_name,
const char *id, struct encoder_info *info) const char *id, struct encoder_info *info)
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "util/dstr.h" #include "util/dstr.h"
#include "obs-defs.h" #include "obs-defs.h"
#include "obs-data.h" #include "obs-internal.h"
#include "obs-module.h" #include "obs-module.h"
void *load_module_subfunc(void *module, const char *module_name, void *load_module_subfunc(void *module, const char *module_name,
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
******************************************************************************/ ******************************************************************************/
#include "obs.h" #include "obs.h"
#include "obs-data.h" #include "obs-internal.h"
bool load_output_info(void *module, const char *module_name, bool load_output_info(void *module, const char *module_name,
const char *id, struct output_info *info) const char *id, struct output_info *info)
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "graphics/vec3.h" #include "graphics/vec3.h"
#include "obs.h" #include "obs.h"
#include "obs-data.h" #include "obs-internal.h"
static void obs_source_destroy(obs_source_t source); static void obs_source_destroy(obs_source_t source);
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
******************************************************************************/ ******************************************************************************/
#include "obs.h" #include "obs.h"
#include "obs-data.h" #include "obs-internal.h"
#include "graphics/vec4.h" #include "graphics/vec4.h"
static void tick_sources(uint64_t cur_time, uint64_t *last_time) static void tick_sources(uint64_t cur_time, uint64_t *last_time)
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "util/platform.h" #include "util/platform.h"
#include "util/dstr.h" #include "util/dstr.h"
#include "obs.h" #include "obs.h"
#include "obs-data.h" #include "obs-internal.h"
static inline bool check_path(const char* data, const char *path, static inline bool check_path(const char* data, const char *path,
struct dstr * output) struct dstr * output)
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "callback/calldata.h" #include "callback/calldata.h"
#include "obs.h" #include "obs.h"
#include "obs-data.h" #include "obs-internal.h"
#include "obs-module.h" #include "obs-module.h"
struct obs_subsystem *obs = NULL; struct obs_subsystem *obs = NULL;
......
...@@ -43,9 +43,9 @@ ...@@ -43,9 +43,9 @@
<ClInclude Include="..\..\..\libobs\media-io\audio-resampler.h" /> <ClInclude Include="..\..\..\libobs\media-io\audio-resampler.h" />
<ClInclude Include="..\..\..\libobs\media-io\format-conversion.h" /> <ClInclude Include="..\..\..\libobs\media-io\format-conversion.h" />
<ClInclude Include="..\..\..\libobs\media-io\video-io.h" /> <ClInclude Include="..\..\..\libobs\media-io\video-io.h" />
<ClInclude Include="..\..\..\libobs\obs-data.h" />
<ClInclude Include="..\..\..\libobs\obs-defs.h" /> <ClInclude Include="..\..\..\libobs\obs-defs.h" />
<ClInclude Include="..\..\..\libobs\obs-encoder.h" /> <ClInclude Include="..\..\..\libobs\obs-encoder.h" />
<ClInclude Include="..\..\..\libobs\obs-internal.h" />
<ClInclude Include="..\..\..\libobs\obs-module.h" /> <ClInclude Include="..\..\..\libobs\obs-module.h" />
<ClInclude Include="..\..\..\libobs\obs-output.h" /> <ClInclude Include="..\..\..\libobs\obs-output.h" />
<ClInclude Include="..\..\..\libobs\obs-scene.h" /> <ClInclude Include="..\..\..\libobs\obs-scene.h" />
......
...@@ -66,9 +66,6 @@ ...@@ -66,9 +66,6 @@
<ClInclude Include="..\..\..\libobs\obs-defs.h"> <ClInclude Include="..\..\..\libobs\obs-defs.h">
<Filter>libobs\Header Files</Filter> <Filter>libobs\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\libobs\obs-data.h">
<Filter>libobs\Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\libobs\obs.h"> <ClInclude Include="..\..\..\libobs\obs.h">
<Filter>libobs\Header Files</Filter> <Filter>libobs\Header Files</Filter>
</ClInclude> </ClInclude>
...@@ -201,6 +198,9 @@ ...@@ -201,6 +198,9 @@
<ClInclude Include="..\..\..\libobs\obs-encoder.h"> <ClInclude Include="..\..\..\libobs\obs-encoder.h">
<Filter>libobs\Header Files</Filter> <Filter>libobs\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\libobs\obs-internal.h">
<Filter>libobs\Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\libobs\obs-output.c"> <ClCompile Include="..\..\..\libobs\obs-output.c">
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册