ソースを参照

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

Renaming obs-data.h to avoid confusion about its usage
jp9000 11 年 前
コミット
563613db8f

+ 1 - 1
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

+ 1 - 1
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 <unistd.h>
 

+ 1 - 1
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)
 {

+ 1 - 1
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)

+ 0 - 0
libobs/obs-data.h → libobs/obs-internal.h


+ 1 - 1
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,

+ 1 - 1
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)

+ 1 - 1
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);
 

+ 1 - 1
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)

+ 1 - 1
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)

+ 1 - 1
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;

+ 1 - 1
vs/2013/libobs/libobs.vcxproj

@@ -43,9 +43,9 @@
     <ClInclude Include="..\..\..\libobs\media-io\audio-resampler.h" />
     <ClInclude Include="..\..\..\libobs\media-io\format-conversion.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-encoder.h" />
+    <ClInclude Include="..\..\..\libobs\obs-internal.h" />
     <ClInclude Include="..\..\..\libobs\obs-module.h" />
     <ClInclude Include="..\..\..\libobs\obs-output.h" />
     <ClInclude Include="..\..\..\libobs\obs-scene.h" />

+ 3 - 3
vs/2013/libobs/libobs.vcxproj.filters

@@ -66,9 +66,6 @@
     <ClInclude Include="..\..\..\libobs\obs-defs.h">
       <Filter>libobs\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\libobs\obs-data.h">
-      <Filter>libobs\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\libobs\obs.h">
       <Filter>libobs\Header Files</Filter>
     </ClInclude>
@@ -201,6 +198,9 @@
     <ClInclude Include="..\..\..\libobs\obs-encoder.h">
       <Filter>libobs\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\libobs\obs-internal.h">
+      <Filter>libobs\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\libobs\obs-output.c">