From 563613db8fa3c7c1c601d43857c012ffd1f130b0 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Sun, 26 Jan 2014 18:48:14 -0700
Subject: [PATCH] Rename obs-data.h to obs-internal.h

Renaming obs-data.h to avoid confusion about its usage
---
 libobs/CMakeLists.txt                 | 2 +-
 libobs/obs-cocoa.c                    | 2 +-
 libobs/obs-display.c                  | 2 +-
 libobs/obs-encoder.c                  | 2 +-
 libobs/{obs-data.h => obs-internal.h} | 0
 libobs/obs-module.c                   | 2 +-
 libobs/obs-output.c                   | 2 +-
 libobs/obs-source.c                   | 2 +-
 libobs/obs-video.c                    | 2 +-
 libobs/obs-windows.c                  | 2 +-
 libobs/obs.c                          | 2 +-
 vs/2013/libobs/libobs.vcxproj         | 2 +-
 vs/2013/libobs/libobs.vcxproj.filters | 6 +++---
 13 files changed, 14 insertions(+), 14 deletions(-)
 rename libobs/{obs-data.h => obs-internal.h} (100%)

diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
index 20e4e498e..f458947d9 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 3eaaffec5..3f9b93d1e 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 <unistd.h>
 
diff --git a/libobs/obs-display.c b/libobs/obs-display.c
index 1d04877c2..4a66bc5ac 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 095751e03..0e643ef6e 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 a9cdf6b4c..6b55289ca 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 59f70f2f0..48b47c802 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 5b5fd4f1f..784082051 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 235e804d2..8438c6574 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 9b0b92dbd..562132457 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 b9d51d1f4..b76e1925c 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 899fcec4c..6957c4251 100644
--- a/vs/2013/libobs/libobs.vcxproj
+++ b/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" />
diff --git a/vs/2013/libobs/libobs.vcxproj.filters b/vs/2013/libobs/libobs.vcxproj.filters
index ce920f27a..c43665875 100644
--- a/vs/2013/libobs/libobs.vcxproj.filters
+++ b/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">
-- 
GitLab