1987 Commits

Author SHA1 Message Date
jp9000
2a9e3a7179 Merge branch 'master' of https://github.com/jp9000/obs-studio 2013-12-12 21:41:53 -07:00
jp9000
de21e622b5 removed os_gettime_ms, added os_file_exists 2013-12-12 21:41:46 -07:00
Palana
3da014543e fix min_adjust usage in calc_torque 2013-12-12 23:57:36 +01:00
Jim
6887f00359 Merge pull request #7 from MattMcNam/master
Updated CMake with new effect file locations
2013-12-07 15:03:08 -08:00
Ján Mlynek
1005a841d4 fixed build for *nix platform 2013-12-07 22:51:58 +01:00
Ján Mlynek
c37fe1fd16 added functions to platform-nix.c 2013-12-07 22:32:29 +01:00
Matthew McNamara
a76a5937df Updated CMakeLists with new effect file locations, added cmake & xcode build folders to gitignore 2013-12-07 21:05:31 +01:00
jp9000
5d3f3e0d1b make text lookup use a simple linked lists rather than an unnecessary array of pointers 2013-12-07 11:23:49 -07:00
jp9000
9b882c097b should only check for ending quote character in locale data if it began with a quote 2013-12-07 10:25:34 -07:00
jp9000
70290b8c2b fixed locale code, added locale files, made wx use locale files, fixed some bugs, and added platform-specific files to the main program 2013-12-07 10:22:56 -07:00
Palana
0199c84687 updated automake files with latest osx changes 2013-12-07 17:40:27 +01:00
Palana
e6017ec1ba changed allocation counter to uint64_t
also avoids format string confusion for bnum_allocs
2013-12-07 17:39:43 +01:00
Palana
968f9c03bd use %u for size_t on microsoft compilers 2013-12-07 16:50:05 +01:00
Palana
2284ef09fa compile libobs with -fobjc-arc 2013-12-06 21:31:42 +01:00
jp9000
ff47b3a2dc added functions to get current audio/video output information 2013-12-06 06:38:19 -07:00
jp9000
8298fa4dc7 With the permission of my fellow contributors, I'm switching obs-studio back to GPL v2+ to prevent issues between this project and the original OBS project, and for personal reasons to avoid legal ambiguity (not political reasons, I admittedly would prefer GPL v3+) 2013-12-02 22:24:38 -07:00
Palana
1bd2b9fd99 added os_get_home_path and os_mkdir to osx cocoa platform 2013-11-29 22:38:05 +01:00
jp9000
58810f9806 changed gs_draw_sprite to allow custom sizes, added output textures to the core, and adjusted the test code to accommodate the changes 2013-11-26 22:26:14 -07:00
jp9000
32e34ffe25 fixed a bug in matrix3_transpose - rotate the vector, don't transform the vector 2013-11-26 22:24:10 -07:00
jp9000
74dc470681 made it so that graphics device and associated objects are not lost every time video settings are changed 2013-11-26 22:20:11 -07:00
jp9000
fcf7e508a9 added os_mkdir to platform functions 2013-11-23 23:35:03 -07:00
jp9000
3c6494a11d fixed a few bugs with config files, and replaced a boolean parameter with an enum 2013-11-23 23:34:38 -07:00
jp9000
e1da9099f9 remove ssize_t because it's not even used anyway anymore 2013-11-23 11:12:44 -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
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
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
jp9000
e778a4c04f added OSX files to automake scripts 2013-11-15 06:40:03 -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
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
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
John Bradley
21a0292f7a Removed unnecessary <malloc.h> include from bmem 2013-11-07 19:14:24 -06: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
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
676a0bd67d update build system to autotools (finally) 2013-10-29 23:21:40 -07:00
jp9000
ab08c2c3f2 fixed a minor bug in the gl shader parser 2013-10-29 06:01:19 -07:00
jp9000
93905e516b modify w32-pthreads location in source/project files 2013-10-28 06:29:12 -07:00