Commit Graph

  • f4ebc44844 Updated VS2013 project dependencies jp9000 2014-01-06 08:50:07 -07:00
  • 121f4a3ae9 Merge pull request #20 from benklett/time Jim 2014-01-05 21:58:20 -08:00
  • 840c1cfd65 I removed GL-specific extension checking to a platform independent file. I also fixed autoconf to find wxWidgets 2.9 without user intervention Removed unused code and added more organization Zachary Lund 2014-01-05 21:05:17 -06:00
  • ab1d4588e2 Revert "Merge pull request #19 from asgeirom/master" Benjamin Klettbach 2014-01-06 06:29:08 +01:00
  • e9d1d66b8a Make it so that created scenes are selected jp9000 2014-01-05 21:38:28 -07:00
  • 4aef1d00d1 Change _DEBUG coverage a bit Zachary Lund 2014-01-05 19:55:19 -06:00
  • 7fa7af6c03 check for signalled event before pthread_cond_wait-ing Palana 2014-01-06 02:04:32 +01:00
  • 25acf095ab Remove from list based upon data, not string jp9000 2014-01-04 19:26:15 -07:00
  • 717a2538f4 Implement source removal via GUI jp9000 2014-01-04 18:53:02 -07:00
  • dcde1dcf2a Implemented adding sources to scenes via GUI jp9000 2014-01-04 13:53:36 -07:00
  • 41a73ceeea Added WX_UTF8 macro jp9000 2014-01-04 13:50:16 -07:00
  • a2a8a5f148 Added add/remove signals to scenes jp9000 2014-01-04 13:38:56 -07:00
  • 968f5fed32 Added some return-style functions to calldata.h jp9000 2014-01-04 13:28:27 -07:00
  • 27ccb09473 Merge pull request #19 from asgeirom/master Jim 2014-01-04 04:28:31 -08:00
  • c95f133fac Adding <linux/time.h> for CLOCK_REALTIME define. Asgeir Mortensen 2014-01-04 10:29:06 +01:00
  • fee0d9a8f3 Minor style fixup Zachary Lund 2014-01-04 01:37:00 -06:00
  • 8df5293be1 Added GLX version check and assures context is set to none on failure. Zachary Lund 2014-01-04 01:08:49 -06:00
  • ffd80449d3 Added gl_update (does nothing for now). Zachary Lund 2014-01-04 00:48:41 -06:00
  • 3dc2024c8f Remove enable statements. This should be done in platform-independent code using GLEW. Zachary Lund 2014-01-04 00:42:23 -06:00
  • 94f88c82cf Added OpenGL debug callback support and context changes. Zachary Lund 2014-01-03 23:14:35 -06:00
  • b7eccedf8a Merge pull request #18 from Ceropean/master Jim 2014-01-03 18:47:13 -08:00
  • e38f9d22f6 fix check_path not using path variable Ján Mlynek 2014-01-03 23:22:49 +01:00
  • f76a3db272 Merge pull request #17 from reboot/master Jim 2014-01-03 09:59:57 -08:00
  • 1a928f638c Don't close module if opening failed during graphics initialization Christoph Hohmann 2014-01-03 18:15:50 +01:00
  • 70e6e33abd add source of precompiled ffmpeg debian packages to INSTALL Palana 2014-01-03 03:48:39 +01:00
  • 7ca68a9d04 fix function pointer types in dynamic procedure handler Palana 2014-01-03 02:58:17 +01:00
  • e846d0395c remove duplicate lines and reformat for 80 columns limit Palana 2014-01-03 01:50:36 +01:00
  • 2a5899d1ec Merge pull request #16 from computerquip/master computerquip 2014-01-02 16:37:18 -08:00
  • 9b882768be Fixed memory leak by calling gl_windowinfo_destroy in platform destruction. Zachary Lund 2014-01-02 18:35:10 -06:00
  • 980083c58d Merge pull request #15 from computerquip/master Jim 2014-01-02 16:28:00 -08:00
  • 80b8176e29 GLX implementation and *nix-specific file handling implementation Zachary Lund 2013-12-27 20:43:28 -06:00
  • 1c91e0d0e0 forgot to lock the mutex when destroying a scene item jp9000 2014-01-01 10:28:37 -07:00
  • 966c091078 make scene items use linked list rather than array (containers are a bad habit), add a few functions for getting scene item information, also use a mutex to prevent race conditions when using the linked list jp9000 2014-01-01 10:22:55 -07:00
  • 96448d7361 add some preliminary compile instructions jp9000 2014-01-01 05:13:01 -07:00
  • 4dfee68dd7 fix warnings in window-namedialog and mark methods as override Palana 2014-01-01 04:06:59 +01:00
  • ec5cdf1b17 fix incompatible types warning in signal system Palana 2014-01-01 03:33:16 +01:00
  • 3c581d7fa2 update cmake compiler flags Palana 2014-01-01 03:16:40 +01:00
  • b70df7607c synchronize opengl context access on osx between threads Palana 2013-12-31 18:46:19 +01:00
  • 843a092fae fixed starting GL context size to use GetClientSize over GetMinSize jp9000 2013-12-31 07:26:24 -07:00
  • e1a32f8eac make it use GetClientSize instead of GetMinSize for when resizing the panel (though at this point I don't think it's going to help anymore) jp9000 2013-12-31 07:12:38 -07:00
  • 1302e65ee6 create a sizing callback for the preview panel specifically, apparently on macos the window size isn't guaranteed to be the size it's set to in the main window size handler jp9000 2013-12-31 07:10:47 -07:00
  • c71eb041b6 fix startup resize issue on osx jp9000 2013-12-31 04:02:07 -07:00
  • e2a1186269 one of the problems of doing changes for Objective-C on windows is that you can't actually compile your code and test it before commiting, leading to foolish little errors like 'you forgot to put a semicolen at the end of that call' jp9000 2013-12-31 03:13:56 -07:00
  • 141b22e76e not sure what was on my mind there but I totally got the variable names wrong in that last commit (for NSOpenGLContext update) jp9000 2013-12-31 03:12:31 -07:00
  • 969a71d716 call NSOpenGLContext 'update' on opengl context on macos when resizing jp9000 2013-12-31 03:09:28 -07:00
  • 36041e9d80 display a test source on startup jp9000 2013-12-30 15:47:20 -07:00
  • f03d90639a macos cannot have widgets/items with ID of 0 jp9000 2013-12-30 13:33:13 -07:00
  • b002c78fe7 update gitignore for osx binaries Palana 2013-12-30 21:04:01 +01:00
  • 683585938c add infrastructure for app bundle target and unmark as advanced Palana 2013-12-30 20:52:44 +01:00
  • 78eb116cc8 add 'static' to inline functions in callback/calldata.h jp9000 2013-12-30 11:09:32 -07:00
  • 72633e40a3 also include bmem.h in the header, minor oversight jp9000 2013-12-30 10:14:28 -07:00
  • f3e3aeae74 make sure to include function declarations from calldata.h jp9000 2013-12-30 10:09:20 -07:00
  • d99c345595 fix bad enum for get_source_info in obs_source.c jp9000 2013-12-30 09:04:05 -07:00
  • c2593eb390 make window automatically resize the graphics display to ensure sources draw properly jp9000 2013-12-30 08:55:01 -07:00
  • c129cc37cb update API and implement preliminary ability to add sources to scenes jp9000 2013-12-30 06:56:39 -07:00
  • 146912d5b8 add wrapper for popup menus so you aren't forced to write a god forsaken function handler whenever you just want to do a basic popup menu jp9000 2013-12-30 06:55:58 -07:00
  • 4af0d7ac04 update main form files for basic UI window jp9000 2013-12-30 06:54:58 -07:00
  • d917745cea make it so that when a scene is clicked it becomes active jp9000 2013-12-30 01:17:57 -07:00
  • 0131cebc8c add form callbacks for selecting scenes/sources jp9000 2013-12-30 01:17:29 -07:00
  • c536d70379 add support for static system GLEW to cmake Palana 2013-12-30 05:45:10 +01:00
  • 22c617dd89 fix advanced variables in ffmpeg cmake files Palana 2013-12-30 05:41:48 +01:00
  • 3f3abf20c0 implement 'remove scene' button jp9000 2013-12-29 20:01:19 -07:00
  • e8ee39560c update data files copy in cmake project Palana 2013-12-30 03:31:55 +01:00
  • 3462a9b8b9 add newline to non-windows log output Palana 2013-12-30 03:26:09 +01:00
  • c093f04c58 add static linking options for ffmpeg and wxwidgets to cmake Palana 2013-12-30 03:01:57 +01:00
  • 534ed54cf1 make OK button the default button for when using the 'enter name' dialog jp9000 2013-12-29 09:56:25 -07:00
  • 6fe59f77ec make sure another source by the same name doesn't already exist when choosing a name for that scene jp9000 2013-12-29 09:17:00 -07:00
  • c4af3e2a75 change obs_scene_destroy to obs_scene_release, add ability to add scenes, fix name dialog sizing jp9000 2013-12-29 08:54:06 -07:00
  • e5ef03954e added name dialog code, moved 'using namespace std;' out of headers and into source files jp9000 2013-12-29 04:40:53 -07:00
  • 6526c47907 update callbacks for name dialog jp9000 2013-12-29 03:56:07 -07:00
  • 7a4bc231eb added a name entry dialog to the form files jp9000 2013-12-28 22:29:48 -07:00
  • 65c3207ba3 added a SceneRemoved handler jp9000 2013-12-28 22:29:13 -07:00
  • 10aa94f00e Add ability to use two desktop audio devices at once in basic UI jp9000 2013-12-28 22:00:32 -07:00
  • 1c7272115a fixed project file settings for those renamed files and fixed a typo jp9000 2013-12-28 21:53:38 -07:00
  • aea35a30f8 renamed some window files to ensure they sort a bit better jp9000 2013-12-28 21:51:18 -07:00
  • cec94b042e implement scene adding callbacks, make a few API tweaks jp9000 2013-12-28 05:33:16 -07:00
  • fe8559a74b Merge pull request #14 from computerquip/autotools-fix Jim 2013-12-27 16:54:41 -08:00
  • ba6a32b3c9 Minor change that fixes error message and sets a wxVersion variable Zachary Lund 2013-12-27 17:22:17 -06:00
  • de7005fe64 Merge pull request #13 from computerquip/autotools-fix Jim 2013-12-27 15:11:59 -08:00
  • 8197fbb999 Fixed double files, causes issues on Windows Zachary Lund 2013-12-27 17:09:31 -06:00
  • fe61ca5808 Merge pull request #12 from computerquip/autotools-fix Jim 2013-12-27 15:01:08 -08:00
  • 5f5404f8cb Fixes issues with autoconf Zachary Lund 2013-12-27 16:41:01 -06:00
  • bbd8178dab fixed a typo in a function call jp9000 2013-12-27 15:23:42 -07:00
  • 261b9d7056 fix a few bugs with callback system, add some test signals jp9000 2013-12-27 05:08:58 -07:00
  • 6fcd5ce112 rename platform-nix.cpp to platform-x11.cpp jp9000 2013-12-26 23:14:03 -07:00
  • 6edcd456fe implement signal/procedure handling into libobs and individual sources jp9000 2013-12-26 23:10:15 -07:00
  • 3b48f79442 fix one minor bug with the disconnct function jp9000 2013-12-26 04:33:16 -07:00
  • 03e1aaad3e fix OBSBasic::AddScene function declaration jp9000 2013-12-26 04:29:57 -07:00
  • 233694ad04 add one minor error message to signal handler jp9000 2013-12-26 04:28:09 -07:00
  • 6ac6256ac5 fill in rest of signal/callback/proc jp9000 2013-12-26 04:26:17 -07:00
  • a136748bd3 don't hide calldata structure, no reason to, and forced an unnecessary allocation which is bad jp9000 2013-12-26 02:02:24 -07:00
  • e9ded173f1 add my signal/callback interface from another project, also update license of utility files to ISC 1.3 jp9000 2013-12-25 22:40:33 -07:00
  • d9e1362cce add pixel format check for iosurfaces Palana 2013-12-24 17:07:58 +01:00
  • d97250933b fix prototype Palana 2013-12-24 17:06:19 +01:00
  • 123ca280a0 fix unix version of os_get_config_path to make it append a slash to $HOME jp9000 2013-12-23 19:04:41 -07:00
  • 9e9c2551ec Merge branch 'master' of https://github.com/jp9000/obs-studio jp9000 2013-12-23 19:00:11 -07:00
  • bb53a39aee change os_get_home_path to a better and more clear function, os_get_config_path jp9000 2013-12-23 18:59:54 -07:00
  • 02f9647b6c change 'properties' icon on basic main window toolbars jp9000 2013-12-23 18:59:16 -07:00
  • 74aa1c466b add osx iosurface opengl integration Palana 2013-12-23 16:34:56 +01:00
  • 221ed7d92b make debug messages log to stdout on non-windows operating systems jp9000 2013-12-23 01:06:53 -07:00