1. 17 9月, 2015 2 次提交
    • J
      libobs: Add functions to get private type data · 0ed913a1
      jp9000 提交于
      The private type data is the type_data variable that's provided when
      object types are registered by plugins.
      0ed913a1
    • J
      libobs: Add private data to definition structures · 7920668e
      jp9000 提交于
      This is useful for allowing the ability to have private data associated
      with the object type definition structures.  This private data can be
      useful for things like plugin wrappers for other languages, or providing
      dynamically generated object types.
      7920668e
  2. 16 9月, 2015 4 次提交
  3. 15 9月, 2015 2 次提交
  4. 14 9月, 2015 4 次提交
    • J
      libobs: Shut down encoder when not in use · fa7286f8
      jp9000 提交于
      This prevents encoders (hardware encoders in particular) from being
      continually active when all outputs disconnect from an encoder.  This is
      mostly just a temporary measure; the encoding interface may need a bit
      of a redesign.  It will also definitely needs to be able to flush at
      some point.  Currently when an output is stopped, the pending data is
      discarded, which needs to be fixed.
      fa7286f8
    • J
      libobs: Allow object creation if id not found · af310fb5
      jp9000 提交于
      Allows objects to be created regardless of whether the actual id exists
      or not.  This is a precaution that preserves objects/settings if for
      some reason the id was removed for whatever reason (plugin removed, or
      hardware encoder that disappeared).  This was already added for sources,
      but really needs to be added for other libobs objects as well: outputs,
      encoders, services.
      af310fb5
    • J
      libobs: Remove potential NULL pointer dereference · a746c8cd
      jp9000 提交于
      a746c8cd
    • J
      libobs: Fix cmake bug (make sure variable exists) · df14671d
      jp9000 提交于
      If the FFMPEG_AVCODEC_LIBRARIES variable does not exist, it will
      generate a cmake error, so check to make sure the variable exists before
      executing this code.
      df14671d
  5. 13 9月, 2015 4 次提交
    • M
      obs-ffmpeg: Fix compile error · b266b563
      Mathias Panzenböck 提交于
      This fixes the compile error: "'AVDISCARD_NONINTRA' undeclared" when
      using a libavcodec version earlier than 55.67.100.
      
      Closes jp9000/obs-studio#469
      b266b563
    • J
      UI: Inhibit sleep/screensavers while active · 27484186
      jp9000 提交于
      27484186
    • J
      libobs/util: Add functions to inhibit sleep · d78d0072
      jp9000 提交于
      These fucntions prevent the computer from going to sleep, hibernating,
      or starting up a screen saver.
      
      On linux, it will also attempt to use DBus to prevent gnome/kde/etc
      sleep, but it's not necessarily required in order to compile the
      library.  Otherwise, it will simply call "xdg-screensaver reset" once
      every 30 seconds to reset the screensaver timer.
      d78d0072
    • J
      cmake: Add helper to find dbus package · 88ab2587
      jp9000 提交于
      The DBus library is a message bus system used to make applications
      communicate with each other.  The primary reason for adding it is to
      access certain service features to prevent computer sleep/hibernate/etc.
      
      This will also create a HAVE_DBUS variable (set to 1 or 0 if found or
      not found)
      88ab2587
  6. 12 9月, 2015 7 次提交
  7. 11 9月, 2015 12 次提交
    • J
      UI: Remove cbr/bufsize from simple output mode · b574407c
      jp9000 提交于
      CBR is now always on by default for streaming, so there's no reason to
      have a setting for this in particular.  Still available in advanced
      output settings of course, but simple output mode really should be kept
      as simple as possible.
      b574407c
    • J
      UI: Clear reconnect timeout if reconnect canceled · 6b4d2676
      jp9000 提交于
      6b4d2676
    • J
      libobs: Set reconnect to false on user cancel · 5096b3c6
      jp9000 提交于
      This fixes the issue when an output cancels reconnecting, reconnect is
      left at true, causing obs_output_active to always return true even
      though reconnecting has actually been canceled.
      5096b3c6
    • J
      UI: Move reconnect options to advanced settings · a4f8d189
      jp9000 提交于
      This is mostly just to remove the unnecessary clutter from the output
      sections.  The reconnect settings are generally rarely modified by users
      as it is.
      a4f8d189
    • J
      UI: Refactor upgrade_settings function · 981ead18
      jp9000 提交于
      This is a refactor to move the config file open/saving out of the
      individual settings upgrade functions that may be called per file.
      981ead18
    • J
      UI: Rename FFmpeg update func to upgrade_settings · fe164eca
      jp9000 提交于
      This function should really be considered a function that upgrades
      general config file settings.
      fe164eca
    • J
      UI: Implement stream delay · f592c33e
      jp9000 提交于
      When stream delay is active, the "Start/Stop Streaming" button is
      changed in to a menu button, which allows the user to select either the
      option to stop the stream (which causes it to count down), or forcibly
      stop the stream (which immediately stops the stream and cuts off all
      delayed data).
      
      If the user decides they want to start the stream again while in the
      process of counting down, they can safely do so without having to wait
      for it to stop, and it will schedule it to start up again with the same
      delay after the stop.
      
      On the status bar, it will now show whether delay is active, and its
      duration.  If the stream is in the process of stopping/starting, it will
      count down to the stop/start.
      
      If the option to preserve stream cutoff point on unexpected
      disconnections/reconnections is enabled, it will update the current
      delay duration accordingly.
      f592c33e
    • J
      UI: Add stream delay options to advanced settings · d1293b2b
      jp9000 提交于
      I added stream delay options to advanced settings not just because I
      feel it's an advanced option, but also to reduce clutter in the outputs
      section and its sub-sections, which already have far too many options as
      it is.
      d1293b2b
    • J
      libobs: Add encoded output delay support · 05388655
      jp9000 提交于
      This feature allows a user to delay an output (as long as the output
      itself supports it).  Needless to say this intended for live streams,
      where users may want to delay their streams to prevent stream sniping,
      cheating, and other such things.
      
      The design this time was a bit more elaborate, but still simple in
      design:  the user can now schedule stops/starts without having to wait
      for the stream itself to stop before being able to take any action.
      Optionally, they can also forcibly stop stream (and delay) in case
      something happens which they might not want to be streamed.
      
      Additionally, a new option was added to preserve stream cutoff point on
      disconnections/reconnections, so that if you get disconnected while
      streaming, when it reconnects, it will reconnect right at the point
      where it left off.  This will probably be quite useful for a number of
      applications in addition to regular delay, such as setting the delay to
      1 second and then using this feature to minimize, for example, a
      critical stream such as a tournament stream from getting any of its
      stream data cut off.  However, using this feature will of course cause
      the stream data to buffer and increase delay (and memory usage) while
      it's in the process of reconnecting.
      05388655
    • J
      libobs: Add activate/deactivate output signals · 582ecdab
      jp9000 提交于
      Indicates when an output is considered active/inactive.
      582ecdab
    • J
      Revert "UI: Add confirmation when clicking stop stream" · 84d5938a
      jp9000 提交于
      This reverts commit a508c17f.
      
      I realized that this would become more of an annoyance for most people
      rather than anything helpful.  This has only happened only twice that I
      am aware of in all the years that the program has been around.
      84d5938a
    • J
      Merge pull request #474 from hwdro/ng-fix · b5c35ad7
      Jim 提交于
      obs-filters: Fix noise-gate calculation errors
      b5c35ad7
  8. 09 9月, 2015 1 次提交
    • H
      obs-filters: Fix noise-gate calculation errors · fc19d9d1
      hwdro 提交于
      For both cases the cur_level calculations were "wrong". For one channel
      case, I assume that was only an oversight, as for two channels case
      cur_level "calculation", getting the level from downmixing to mono will
      result in an attenuated level than expected. One solution is to use the
      highest level of both channels to drive the gate.
      fc19d9d1
  9. 08 9月, 2015 3 次提交
    • P
      libobs/util: Restore original code point · b2714fa3
      Palana 提交于
      This was broken in cd222f8c which had a
      horrible commit message that makes replicating the issue impossible if
      there weren't others who reported similar visual studio issues when
      using a Japanese locale
      b2714fa3
    • J
      UI: Use a default size for the properties window · 4c3394f7
      jp9000 提交于
      When I changed the properties window to remove the .ui file, I forgot to
      give it a default initial size.  This just sets it to 720x580 by
      default.
      4c3394f7
    • J
      UI: Prevent writing endlessly repeating log entries · c23c0f46
      jp9000 提交于
      Limits similar log entries (determined by a simple hash function that
      sums the characters) to certain number of lines in a row.  When a
      different log entry occurs, it resets the repeat check and logs how many
      times the last message was repeated.
      c23c0f46
  10. 07 9月, 2015 1 次提交