1. 30 1月, 2014 5 次提交
    • J
      Fix the design flaw with obs_sceneitem_destroy · 3243a9f8
      jp9000 提交于
      The previous commit used the scene as a  parameter to check to see if
      the scene item was still present within the scene before destroying, but
      this was actually unnecessary because the fault was because the destroy
      signal was being triggered *before* the scene's mutex locked, thus
      causing a race condition.  I changed the code so that it signals after
      the lock instead of before, so the scene parameter should no longer be
      necessary.
      3243a9f8
    • P
      Lock graphics before trying to remove a scene item · 31ceec04
      Palana 提交于
      Prevents another deadlock if removing the scene item triggers source
      cleanup of a source with graphics resources
      31ceec04
    • P
      Check if scene item is actually alive when calling obs_sceneitem_destroy · 2fa208ad
      Palana 提交于
      Prevents a double free in case the scene item was previously removed
      2fa208ad
    • P
      Use recursive mutex for scene mutex · af03444c
      Palana 提交于
      Fixes a deadlock when trying to remove a source from the GUI. The scene
      item signal handlers would mark the source as removed which results in
      the video thread also trying to run obs_sceneitem_destroy thereby
      deadlocking the video thread (and the GUI thread)
      af03444c
    • P
      Improve multi instance support for osx desktop capture · 13db6843
      Palana 提交于
      Fixes behavior with multiple desktop captures in the same scene
      
      Also create the dispatch_queue without a name to prevent name collisions
      13db6843
  2. 29 1月, 2014 9 次提交
  3. 28 1月, 2014 7 次提交
  4. 27 1月, 2014 2 次提交
    • J
      Rename obs-data.h to obs-internal.h · 563613db
      jp9000 提交于
      Renaming obs-data.h to avoid confusion about its usage
      563613db
    • J
      Finish the rest of the settings dialog code · a5372e97
      jp9000 提交于
      - Move over the last of the original settings dialog code to QT.  It was
        actually a bit easier to write in the QT version.  wxWidgets was
        definitely not ideal for that because the pages would fully
        create/destroy every time.
      
      - [Win32] Fix os_dlopen so that it only appends .dll if not present
      
      - [MacOS] Fix name dialog text edit widget issue (it would be better if
        we could just use the list widget for editing labels, will have to
        look in to that in the future)
      
      - Tweak the settings UI a bit more and make 30 FPS default
      
      - Add a macro to convert a QString to a UTF-8 const char * string
      
      - Rename build/plugins to build/obs-plugins
      
      - Remove the last of the wxWidgets code
      a5372e97
  5. 26 1月, 2014 17 次提交