1. 06 9月, 2015 1 次提交
  2. 31 8月, 2015 1 次提交
  3. 30 8月, 2015 1 次提交
    • J
      win-capture: Use correct variable for system modules · 13d22645
      jp9000 提交于
      ..This is rather embarrassing.  I used the parameter variable and the
      actual variable that I wanted to used went completely unused.  Would
      static analysis catch something like this, I wonder?  Would probably
      have to be really good static analysis.
      13d22645
  4. 29 8月, 2015 4 次提交
  5. 28 8月, 2015 2 次提交
    • J
      libobs/media-io: Improve audio data logging · ff6cf508
      jp9000 提交于
      This improves logging for when audio data insertion is way out of bounds
      or is getting cut off in the front due to a bad negative sync offset.
      
      Instead of throwing out a log message for every time this happens with
      each piece of data, it now states when the out of bounds or cutoff has
      started and stopped only.
      ff6cf508
    • J
      libobs/media-io: Fix potential crash inserting audio · 26303710
      jp9000 提交于
      This fixes a case where an insertion of audio data would pass
      valid_timestamp_range yet the insert position would cause a negative
      integer position and thus an unsigned integer overflow.
      26303710
  6. 27 8月, 2015 3 次提交
  7. 24 8月, 2015 2 次提交
  8. 22 8月, 2015 7 次提交
    • J
      deps/file-updater: Fix warning · 4a767e01
      jp9000 提交于
      4a767e01
    • J
      UI: Use saving functions for profiles/scenes · ebf3abf0
      jp9000 提交于
      Replaces all the json/config loading/saving functions with safe
      variants to reduce the chance of potential file corruption as much as
      possible.
      
      Also does a minor refactor of json writing by using
      obs_data_save_json_safe for writing json files instead of manually using
      obs_data_get_json and os_quick_write_utf8 each time.
      ebf3abf0
    • J
      libobs: Add obs_data funcs for safe file handling · e479d4d0
      jp9000 提交于
      obs_data_create_from_json_file_safe: Attempts to create an obs_data
      object from a file, and if that fails and a backup file exists, deletes
      the old file and tries to open it again.
      
      obs_data_save_json_safe: Saves json data to a temporary file first,
      optionally backs up the target file if the file exists and backup_ext is
      valid (otherwise deletes it), and then renames the temporary file to the
      target file.  This helps reduce the chance of json corruption on save.
      e479d4d0
    • J
      libobs: Add obs_data_save_json function · 40988f7e
      jp9000 提交于
      We keep having to repeat code for saving the json data to a file, so add
      a helper function to help clean up some of that code.
      40988f7e
    • J
      libobs: Don't return valid obs_data if json fails · dd9107db
      jp9000 提交于
      If obs_data_create_from_json fails on loading the json data, do not
      return a valid data object; return NULL instead.
      dd9107db
    • J
      libobs/util: Add config_save_safe function · f29431d8
      jp9000 提交于
      This safely saves a configuration file, optionally with a backup.
      f29431d8
    • J
      libobs/util: Add os_quick_write_utf8_file_safe · 3a77ac35
      jp9000 提交于
      This helper function saves to a temporary file first, (optionally) backs
      up the original file, then renames the temporary file to the actual file
      name.  This helps reduce the chance of file corruption under various
      circumstances (such as shutdown or crash while the file is being written
      to disk).
      3a77ac35
  9. 20 8月, 2015 11 次提交
    • J
      rtmp-services: Fix warnings for updater · be5283bb
      jp9000 提交于
      be5283bb
    • J
      rtmp-services: Automatically update services.json · 1a842ecd
      jp9000 提交于
      Uses the file-updater utility library to update the services.json file.
      If the remote version is incompatible or corrupted, will reject the
      file.
      1a842ecd
    • J
      rtmp-services: Use cached services.json if present · 68d2dab6
      jp9000 提交于
      This will use the services.json file present in the cache, or if it has
      the wrong format version or is corrupted for whatever reason, uses the
      local version instead.
      
      Also a minor refactor, makes it so that you call the open_services_file
      function to get the services array, rather than having to get the file
      name each time.
      68d2dab6
    • J
      rtmp-services: Add format_version to services.json · b5f1bbdd
      jp9000 提交于
      The entire services file had to be restructured, but this allows us to
      be able to change the format of the json file safely (if ever needed).
      b5f1bbdd
    • J
      deps/file-updater: Add file updater util. lib · d3eaeda2
      jp9000 提交于
      This allows plugins to update and cache data files from a remote source.
      
      Here are the steps that occur when the API initiates an update check:
      
      1.) It checks to see if the local files are greater than the cached
          files.  If the local version is newer (for whatever reason), it
          replaces the cached version(s) with the local version.
      
      2.) A packages.json file is downloaded from the specified URL.  That
          packages.json file contains a version number and a list of files to
          be updated.
      
      3.) If the downloaded package version is greater than the cached
          version, executes step 4-5 on each file.
      
      4.) Checks the version for the file to update in packages.json, and if
          the version is greater than the cached version, proceeds to step 5,
          otherwise repeat step 4-5 for other files.
      
      5.) Calls the callback given to the update function (if any) with the
          file information (file name, buffer, etc), and if the callback
          returns true, allows the cached file to be updated and replaced,
          otherwise goes back to step 4-6 for the rest of the files.
      
      NOTE: Files are never modified directly.  All file saving/modification
      is performed in a temporary directory, and then files are moved to their
      destination.  This should eliminate any possibility of file corruption
      (or at least dramatically reduce the possibility).
      d3eaeda2
    • J
      rtmp-services: Add get_int_val hepler function · d0870133
      jp9000 提交于
      This is just for accessing a json object.  I should be using obs_data_t
      for this instead of json directly, but it doesn't really matter.
      d0870133
    • J
      libobs: Add API func to get module config path · 0d30d122
      jp9000 提交于
      Allows the ability to get a module-specific configuration file/path
      0d30d122
    • J
      (API Change) libobs: Add global module config path · 2bd8ab7c
      jp9000 提交于
      API Changed:
      ---------------------------
      From:
      - bool obs_startup(const char *locale, profiler_name_store_t *store);
      
      To:
      - bool obs_startup(const char *locale, const char *module_config_path,
      		profiler_name_store_t *store);
      
      Summary:
      ---------------------------
      This allows plugin modules to store plugin-specific configuration data
      (rather than only allowing objects to store configuration data).  This
      will be useful for things like caching data, for example looking up and
      storing ingests from remote (rather than storing locally), or caching
      font data (so it doesn't have to build a font cache each time), among
      other things.
      
      Also adds a module-specific directory for the UI
      2bd8ab7c
    • J
      UI: Update configs for new FFmpeg output changes · 0ce756ac
      jp9000 提交于
      If a user was using FFmpeg output before pathc 0.12.0, they had to type
      in the full file name to the FFmpeg output URL/Path box, which isn't
      exactly compatible with the new settings.
      
      This changes each profile's config file so that the FFmpeg output
      detects whether files are used, and then extracts the file's directory
      and extension and sets them accordingly to make it compatible with the
      new FFmpeg file output handling.
      0ce756ac
    • J
      UI: Allow generated filenames for FFmpeg output · 75dcd1ff
      jp9000 提交于
      This changes the way the advanced output section's FFmpeg output
      settings work by allowing the user to select whether they want to output
      to a file or output to a URL, and makes it so file names are
      automatically generated like other recording outputs.
      
      If they choose to output to a file, it'll only require an output
      directory similarly to how other recording outputs work.  They can
      select a directory to output to rather than being required to type in a
      full path and filename; the filename is automatically generated.  The
      extension is also automatically retrieved from libff depending on the
      format selected.
      
      Otherwise if they have Output to URL selected, it'll show a simple edit
      box where they can type in the target URL.
      75dcd1ff
    • J
      libobs/util: Fix character encoding issue · cd222f8c
      jp9000 提交于
      Manually specifies the UTF-8 character codes used by the file rather
      than relying on the compiler to determine what the codes are manually.
      I was getting compile errors due to the fact that my current code page
      is not at the default code page; so visual c++ tried to use my current
      code page rather than UTF-8 and it would cause an error on the file.
      cd222f8c
  10. 19 8月, 2015 1 次提交
    • J
      UI: Fix GCC 4.8 compilation issue · 3488039e
      jp9000 提交于
      Apparently using QPointer container for the QObject being given to the
      connect function makes it so it can't find the actual function to use.
      I'm guessing this is incomplete functionality or a bug that existed in
      GCC 4.8.  Doesn't happen in 4.9+.
      3488039e
  11. 17 8月, 2015 6 次提交
    • J
      libobs: Update version to 0.11.4 · 1afd32e7
      jp9000 提交于
      1afd32e7
    • J
      UI: When setting base res, use closest output res · 59592cf0
      jp9000 提交于
      When settings the base resolution, try to find the closest output
      resolution to the old output resolution, and use that for its value.  If
      the aspect ratio is about the same, then don't modify the value.  If the
      aspect ratio is significantly different, then find the closest
      approximation while keeping with the new aspect ratio.
      
      This particular issue has been an annoyance for quite some time.
      59592cf0
    • J
      libobs: Fix issue with getting the module data dir · 6bd4f27f
      jp9000 提交于
      When getting a blank module data file (indicating you want to get the
      path to the module data directory itself), on certain operating systems
      (windows) it will fail if you end the path with '/' or '\'.  So simply
      make sure that if a blank module sub-path is used, don't try to append a
      slash.
      6bd4f27f
    • J
      Revert "win-capture: Use texture for actual source size" · d5ebe481
      jp9000 提交于
      This reverts commit 74354dc4.  I really
      shouldn't have modified this, especially not in this way.  Was the wrong
      approach.  The thing I was trying to fix was very rare as well.
      d5ebe481
    • J
      rtmp-services: Fix warning · f6f73885
      jp9000 提交于
      The return value is supposed to be a boolean value; not NULL.
      f6f73885
    • G
      linux-capture: Try to reacquire lost windows · 8efbcc59
      Gökberk Yaltıraklı 提交于
      When a window being captured is closed, it never tries to reacquire.
      This just searches for the window in video_tick and reacquires if the
      currently set window is found again.
      
      Closes jp9000/obs-studio#465
      8efbcc59
  12. 16 8月, 2015 1 次提交