1. 03 9月, 2020 12 次提交
    • J
      Merge pull request #3383 from Programatic/warning_fix · a66a8da0
      Jim 提交于
      UI: Fix compiler warning about needing parenthesis
      a66a8da0
    • J
      Merge pull request #3393 from Programatic/crash_fix · 9af5edc6
      Jim 提交于
      UI: Fix source ref bug causing crash on exit
      9af5edc6
    • J
      UI: Make SetupOutputs virtual instead of ignoring vcam · 7286ee42
      jp9000 提交于
      In 218b936b, the virtual camera was ignored when checking the active
      state, which is kind of a lackluster solution.  Instead, this makes
      SetupOutputs() a virtual function, and calls it before starting the
      virtual camera to be more consistent with the rest of the outputs.
      7286ee42
    • J
      win-capture: Put window capture update data in a mutex · bdd6562a
      jp9000 提交于
      Because the window capture source updates its data whenever certain
      properties are modified, this would cause a race condition because
      source updates normally happen in the graphics thread.  To solve this
      for the time being, put access to that data within a mutex when updating
      or updating visibility.
      bdd6562a
    • J
      UI: Fix auto-remux not working w/ slash filesnames · b99613b6
      jp9000 提交于
      When the feature was added to allow slashes in recording/replay
      filenames to automatically create directories, auto-remux was not
      accounted for, and all filenames were assumed to be complete.  It used
      fi.completeBaseName() to construct the new name which would only add the
      last part after the last slash as the filename, causing the remuxed file
      to save in the base directory rather than the intended directory.  This
      fixes that by simply using the input string as the output string,
      removing the extension, appending the new extension.
      b99613b6
    • J
      UI: Do not show tray icon if not active · 4869167f
      jp9000 提交于
      Because the virtual camera stops immediately when you call
      obs_output_stop() rather than with a delay like other outputs, it
      exposed a bug where the tray icon would show OBS as active when stopping
      the source, regardless of the fact that it was stopped.  The bug was
      that the expression used to activate the tray icon did not check to make
      sure that the output was actually active, so add that to the expression.
      4869167f
    • J
      UI: Do not show media controls on network media source · 28f56c02
      jp9000 提交于
      28f56c02
    • J
      UI: Fix crash when starting vcam before other outputs · 218b936b
      jp9000 提交于
      The BasicOutputHandler::Active() function was used for checking whether
      outputs had started or not.  However, the virtual camera is not used in
      the subclasses; instead it's a part of the base class.  Because of that
      fact, when the virtual camera is started, the procedures used to start
      up the other outputs are never called, causing outputs to crash because
      they hadn't been initialized properly.  For example, starting the
      virtual camera, then starting stream/recording would crash.
      
      So, as a simple fix to this, when checking the active status in the
      derived classes, do not factor in the virtual camera.
      218b936b
    • J
      UI: Fix maximum size on image source toolbar · 1cdf16ba
      jp9000 提交于
      The edit widget on the image source toolbar had a maximum width set,
      which caused the layout for the toolbar to look ugly if it hit that
      maximum width.
      1cdf16ba
    • J
      UI: Fix source toolbar color selection on color source · 55c21319
      jp9000 提交于
      When selecting a color on the color source, if you pressed cancel, it
      would cause it to set the color to black.  Instead, make sure to check
      isValid() on the returned color value to see if the user pressed cancel
      when selecting a color.
      55c21319
    • R
    • P
      UI: Fix source ref bug causing crash on exit · 642dff05
      Programatic 提交于
      642dff05
  2. 02 9月, 2020 5 次提交
  3. 31 8月, 2020 3 次提交
  4. 29 8月, 2020 8 次提交
  5. 28 8月, 2020 5 次提交
  6. 27 8月, 2020 6 次提交
  7. 26 8月, 2020 1 次提交