1. 25 4月, 2014 13 次提交
  2. 24 4月, 2014 5 次提交
    • P
      9f43e6c2
    • P
      Add helper to convert from FOURCC to VIDEO_FORMAT · b77b9feb
      Palana 提交于
      b77b9feb
    • J
      obs-studio UI: Implement stream settings UI · 8830c410
      jp9000 提交于
       - Updated the services API so that it links up with an output and
         the output gets data from that service rather than via settings.
         This allows the service context to have control over how an output is
         used, and makes it so that the URL/key/etc isn't necessarily some
         static setting.
      
         Also, if the service is attached to an output, it will stick around
         until the output is destroyed.
      
       - The settings interface has been updated so that it can allow the
         usage of service plugins.  What this means is that now you can create
         a service plugin that can control aspects of the stream, and it
         allows each service to create their own user interface if they create
         a service plugin module.
      
       - Testing out saving of current service information.  Saves/loads from
         JSON in to obs_data_t, seems to be working quite nicely, and the
         service object information is saved/preserved on exit, and loaded
         again on startup.
      
       - I agonized over the settings user interface for days, and eventually
         I just decided that the only way that users weren't going to be
         fumbling over options was to split up the settings in to simple/basic
         output, pre-configured, and then advanced for advanced use (such as
         multiple outputs or services, which I'll implement later).
      
         This was particularly painful to really design right, I wanted more
         features and wanted to include everything in one interface but
         ultimately just realized from experience that users are just not
         technically knowledgable about it and will end up fumbling with the
         settings rather than getting things done.
      
         Basically, what this means is that casual users only have to enter in
         about 3 things to configure their stream:  Stream key, audio bitrate,
         and video bitrate.  I am really happy with this interface for those
         types of users, but it definitely won't be sufficient for advanced
         usage or for custom outputs, so that stuff will have to be separated.
      
       - Improved the JSON usage for the 'common streaming services' context,
         I realized that JSON arrays are there to ensure sorting, while
         forgetting that general items are optimized for hashing.  So
         basically I'm just using arrays now to sort items in it.
      8830c410
    • J
      Add obs_data JSON loading/saving functions · 3cbc711f
      jp9000 提交于
      3cbc711f
    • J
      Fix an issue with properties view · 21db9465
      jp9000 提交于
      If a control changed the properties layout, it would lose focus on the
      control.  Also, fiddled with the sizing policy a bit, because it wasn't
      expanding when I used it in other windows.
      21db9465
  3. 23 4月, 2014 1 次提交
    • J
      Fix draw callback for main/properties views · 9edde0b8
      jp9000 提交于
      Drawing position wasn't being calculated correctly, viewport/ortho
      should have been used instead.  It would cause items to render out of
      position on the main viewport (though not on the actual output)
      9edde0b8
  4. 22 4月, 2014 2 次提交
  5. 20 4月, 2014 11 次提交
    • J
      Merge pull request #68 from BtbN/fixes · 98478b68
      Jim 提交于
      Some bundled dependency cmake related fixes
      98478b68
    • B
    • B
      Fix w32-pthreads build and string handling · afd8b636
      BtbN 提交于
      afd8b636
    • J
      Fix jansson_config.h issue · 2faef6f0
      jp9000 提交于
      2faef6f0
    • J
      Add 'SHARED' to add_library in w32-pthreads cmake · 903287a3
      jp9000 提交于
      903287a3
    • J
      Add 'common' and 'custom' RTMP services · 43057038
      jp9000 提交于
      This plugin is just a generic service plugin for basic RTMP streaming
      service stuff.
      
      This just has a 'common' service that has a list of common/simple
      streaming services that don't have their own custom service modules, and
      then a 'custom' service that allows you to enter in the stream URL and
      key manually, without a service/server list.
      
      Also, copy the jansson VS projects file (don't modify the old one) so
      that it's located in the vs/2013 directory, so that other libraries can
      properly link with it without having to enter in extra information just
      to include jansson
      43057038
    • J
      Changed the windows test app a bit · 506daa17
      jp9000 提交于
      506daa17
    • J
      libobs: Add services API, reduce repeated code · 4a6d19f2
      jp9000 提交于
      Add API for streaming services.  The services API simplifies the
      creation of custom service features and user interface.
      
      Custom streaming services later on will be able to do things such as:
      
       - Be able to use service-specific APIs via modules, allowing a more
         direct means of communicating with the service and requesting or
         setting service-specific information
      
       - Get URL/stream key via other means of authentication such as OAuth,
         or be able to build custom URLs for services that require that sort
         of thing.
      
       - Query information (such as viewer count, chat, follower
         notifications, and other information)
      
       - Set channel information (such as current game, current channel title,
         activating commercials)
      
      Also, I reduce some repeated code that was used for all libobs objects.
      This includes the name of the object, the private data, settings, as
      well as the signal and procedure handlers.
      
      I also switched to using linked lists for the global object lists,
      rather than using an array of pointers (you could say it was..
      pointless.)  ..Anyway, the linked list info is also stored in the shared
      context data structure.
      4a6d19f2
    • J
      util/darray.h: Fix astoundingly silly assert · 8225a069
      jp9000 提交于
      8225a069
    • J
      Make w32-pthreads and jansson shared libraries · 92812ba3
      jp9000 提交于
      92812ba3
    • J
      obs-properties: Add a few features · 7a606941
      jp9000 提交于
      Just wanted the ability to be able to add private data to the properties
      data.  Makes it a little easier to manage data if you get updates from
      controls.
      7a606941
  6. 19 4月, 2014 5 次提交
  7. 17 4月, 2014 3 次提交