6277 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jp9000	66f846ca41	updated UI files	2013-11-22 16:20:52 -07:00
jp9000	af8329c667	add RAII wrapper class for sources	2013-11-22 16:20:02 -07:00
jp9000	93dd3cec50	made the getframe function a bit more safe and modified a few names for clarity	2013-11-22 16:18:31 -07:00
jp9000	d8b49034c9	added jansson to the main project	2013-11-22 10:02:57 -07:00
jp9000	bf8548c415	removed jansson from configure.ac (not necessary and shouldn't be build with the project)	2013-11-21 18:31:27 -07:00
jp9000	12790a40b5	Subtree merged in deps/jansson	2013-11-21 16:04:11 -07:00
jp9000	71890e0365	removed now-redundant callback enum_children from sources	2013-11-20 21:52:20 -07:00
jp9000	f1decd08f4	adjusted the way source removal is handled to make it a bit more safe	2013-11-20 18:36:46 -07:00
Palana	5fa2f28577	fixed broken comparison	2013-11-20 23:12:12 +01:00
jp9000	bff4bcbfe5	Merge branch 'master' of https://github.com/jp9000/obs-studio	2013-11-20 15:00:29 -07:00
jp9000	409b011a8e	cleaned up main internal data structure design, changed to reference counting for sources to ensure safe destruction of source objects from all parts of the system, added some service-related stuff for testing	2013-11-20 15:00:16 -07:00
Palana	c2586f5686	set cmake output path for test executable	2013-11-18 17:54:06 +01:00
jp9000	5e33707f6a	ensure 80-column max formatting in gl-subsystem.c	2013-11-15 07:10:21 -07:00
jp9000	10e917efee	unbind VAO if NULL buffer specified	2013-11-15 07:07:03 -07:00
Palana	41bef32962	removed global VAO from gl-cocoa	2013-11-15 15:03:35 +01:00
jp9000	e778a4c04f	added OSX files to automake scripts	2013-11-15 06:40:03 -07:00
jp9000	72a64b3d41	added VAOs to vertex buffers (might need some future tweaking to check whether buffers are already assigned to specific attributes)	2013-11-15 06:34:05 -07:00
jp9000	041f48b566	make code gl-cocoa.m 80 columns for consistency (I'm probably just being OCD, don't mind me, hopefully didn't break anything)	2013-11-14 10:48:48 -07:00
Palana	ec411fe046	added cmake build files	2013-11-14 18:36:46 +01:00
Palana	d7a04aea8c	added osx cocoa support files	2013-11-14 18:31:18 +01:00
Palana	595dad2e70	updated .gitignore for osx	2013-11-14 18:31:18 +01:00
Palana	f263d585bf	enable format string diagnostics for blog and bcrash on gcc and clang	2013-11-14 18:31:18 +01:00
Palana	3b3d612ceb	add noreturn attribute to def_crash_handler	2013-11-14 18:31:17 +01:00
Palana	26397c7782	allow non-static glew include path	2013-11-14 18:29:37 +01:00
Palana	8880a9e811	check for link status instead of validate status	2013-11-14 18:29:37 +01:00
Palana	ebc78eee9d	do not unbind vertex array (GL 3+)	2013-11-14 17:51:38 +01:00
Jim	5f01129026	Merge pull request #4 from reboot/master ... Compilation fails with wxWidgets below version 2.9.0	2013-11-13 08:30:48 -08:00
Christoph Hohmann	a3fdf8065d	Update wxWidgets version requirements	2013-11-13 17:26:15 +01:00
jp9000	146e9a7dbd	added support for jansson, added new output files, made some adjustments to the API, fixed a UI subclass issue	2013-11-13 06:24:20 -07:00
jp9000	db5aca1ab5	fixed some D3D macros	2013-11-10 06:31:55 -07:00
jp9000	388f25db05	remove absolute paths from formbuilder file	2013-11-09 21:56:31 -07:00
jp9000	66ba95dc4b	left a few errors in the subclass source by accident	2013-11-09 00:24:39 -07:00
jp9000	0b753be08a	add subclass files	2013-11-09 00:21:09 -07:00
jp9000	b159baf145	fix a few windows wx issues, make windows use default GUI fonts, and a few other minor tweaks	2013-11-09 00:19:38 -07:00
John Bradley	21a0292f7a	Removed unnecessary <malloc.h> include from bmem	2013-11-07 19:14:24 -06:00
jp9000	562dec57f4	update one AM file, had the wrong file references in it	2013-11-07 17:05:03 -07:00
jp9000	f5e41f441e	added initial main program and directshow files, finally have a UI functioning	2013-11-07 16:45:03 -07:00
jp9000	37c7db5dbe	fixed some bugs and fixed a variable that wasn't declared at the top	2013-11-02 14:44:40 -07:00
Palana	db9f8cc269	restrict max_anisotropy to 1 ≤ max_anisotropy ≤ max_anisotropy_max	2013-11-02 22:24:57 +01:00
jp9000	0b96e65498	fix a function variable name that was shadowing a parameter name	2013-11-02 12:53:25 -07:00
Palana	85dd2ad073	fixed log output	2013-11-02 02:16:18 +01:00
jp9000	0790148950	...had the wrong code in the wrong function, fixed os_dlopen	2013-11-01 17:01:56 -07:00
Palana	727ed4d7ec	actually use found path in obs_load_module	2013-11-02 00:53:26 +01:00
jp9000	8847d11e8e	adjust file locations to be more portable	2013-11-01 14:33:00 -07:00
jp9000	a6a6118c04	finish up most of the source audio stuff and rename some variables/structs/enum to be a bit more consistent	2013-10-31 10:28:47 -07:00
jp9000	99d2965e21	fix a minor warning and make ffmpeg dependencies a little bit easier to deal with in VS	2013-10-30 18:19:52 -07:00
jp9000	6147446059	remove some redundant code in the resampler wrapper	2013-10-30 17:12:51 -07:00
jp9000	60e6ddbf71	add audio resampling, add ffmpeg support	2013-10-30 17:07:01 -07:00
jp9000	3adfaf7f9f	not sure how a backslash slipped into an include, but it's gone now	2013-10-29 23:54:43 -07:00
jp9000	3f1ae3dea1	remove redundant config.mak file from previous obsolete build system	2013-10-29 23:29:37 -07:00