Browse Source

fixed some bugs and fixed a variable that wasn't declared at the top

jp9000 12 years ago
parent
commit
37c7db5dbe

+ 5 - 0
build/copy_debug64.bat

@@ -0,0 +1,5 @@
+copy ..\vs\2010\x64\Debug\libobs.dll bin\64bit
+copy ..\vs\2010\x64\Debug\libobs-opengl.dll bin\64bit
+copy ..\vs\2010\x64\Debug\libobs-d3d11.dll bin\64bit
+copy ..\vs\2010\x64\Debug\wintest.exe bin\64bit
+copy ..\vs\2010\x64\Debug\test-input.dll plugins\64bit

+ 5 - 0
build/copy_release64.bat

@@ -0,0 +1,5 @@
+copy ..\vs\2010\x64\Release\libobs.dll bin\64bit
+copy ..\vs\2010\x64\Release\libobs-opengl.dll bin\64bit
+copy ..\vs\2010\x64\Release\libobs-d3d11.dll bin\64bit
+copy ..\vs\2010\x64\Release\wintest.exe bin\64bit
+copy ..\vs\2010\x64\Release\test-input.dll plugins\64bit

+ 2 - 1
libobs-opengl/gl-subsystem.c

@@ -33,6 +33,7 @@ static void clear_textures(struct gs_device *device)
 void convert_sampler_info(struct gs_sampler_state *sampler,
 		struct gs_sampler_info *info)
 {
+	GLint max_anisotropy_max;
 	convert_filter(info->filter, &sampler->min_filter,
 			&sampler->mag_filter);
 	sampler->address_u      = convert_address_mode(info->address_u);
@@ -40,7 +41,7 @@ void convert_sampler_info(struct gs_sampler_state *sampler,
 	sampler->address_w      = convert_address_mode(info->address_w);
 	sampler->max_anisotropy = info->max_anisotropy;
 
-	GLint max_anisotropy_max = 1;
+	max_anisotropy_max = 1;
 	glGetIntegerv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &max_anisotropy_max);
 	gl_success("glGetIntegerv(GL_MAX_TEXTURE_ANISOTROPY_MAX)");
 

+ 1 - 0
libobs/media-io/audio-io.c

@@ -93,6 +93,7 @@ static inline bool ao_add_to_media(audio_t audio)
 	struct media_output_info oi;
 	oi.obj     = audio;
 	oi.connect = NULL;
+	oi.format  = NULL; /* TODO */
 
 	audio->output = media_output_create(&oi);
 	if (!audio->output)

+ 2 - 1
libobs/media-io/media-io.c

@@ -66,7 +66,8 @@ media_output_t media_output_create(struct media_output_info *info)
 {
 	struct media_output *output;
 
-	if (!info || !info->format)
+	/* TODO: handle format */
+	if (!info) // || !info->format)
 		return NULL;
 
 	output = bmalloc(sizeof(struct media_output));