1. 11 3月, 2014 26 次提交
  2. 08 3月, 2014 6 次提交
    • J
      UI: Swap audio slots · b2202c48
      jp9000 提交于
      Had the audio restart slot connected to things that didn't require a
      restart
      b2202c48
    • J
      Fix an error and a few warnings · a9f5959b
      jp9000 提交于
      The strings didn't have ending double quotes.  No clue why this didn't
      fail in GCC and VC.  Well, VC is horrible but I expected better out of
      GCC.
      a9f5959b
    • J
      Activate user-selected audio devices · f2ee9507
      jp9000 提交于
       - Fix a bug where the initial audio data insertion would cause all
         audio data to unintentionally clear (mixed up < and > operators, damn
         human error)
      
       - Fixed a potential interdependant lock scenario with channel mutex
         locks and graphics mutex locks.  The main video thread could lock the
         graphics mutex and then while in the graphics mutex could lock the
         channels mutex.  Meanwhile in another thread, the channel mutex could
         get locked, and then the graphics mutex would get locked, causing a
         deadlock.
      
         The best way to deal with this is to not let mutexes lock within
         other mutexes, but sometimes it's difficult to avoid such as in the
         main video thread.
      
       - Audio devices should now be functional, and the devices in the audio
         settings can now be changed as desired.
      f2ee9507
    • J
      WASAPI: Change some errors messages to warnings · 2c3a3f4e
      jp9000 提交于
      There shouldn't be errors if the actual source has successfully been
      created, just warnings.
      2c3a3f4e
    • J
      Make audio devices save to settings · fd579fe7
      jp9000 提交于
      Also, revamp the settings dialog code and make it use signals and slots
      a bit better.
      fd579fe7
    • J
      Use only one widget for preview · e8044d08
      jp9000 提交于
      Modify the obs_display API so that it always uses an orthographic
      projection that is the size of the display, rather than OBS' base size.
      Having it do an orthographic projection to OBS' base size was silly
      because it meant that everything would be skewed if you wanted to draw
      1:1 in the display.  This deoes mean that the callbacks must handle
      resizing the images, but it's worth it to ensure 1:1 draw sizes.
      
      As for the preview widget, instead of making some funky widget within
      widget that resizes, it's just going to be a widget within the entire
      top layout.  Also changed the preview padding color to gray.
      e8044d08
  3. 07 3月, 2014 3 次提交
    • J
      Add a way to get default settings · 7d48dbb1
      jp9000 提交于
       - Implement a means of obtaining default settings for an
         input/output/encoder.  obs_source_defaults for example will return
         the default settings for a particular source type.
      
       - Because C++ doesn't have designated initializers, use functions in
         the WASAPI plugin to register the sources instead.
      7d48dbb1
    • J
      Move basic mode configuration to a separate file · e88ee063
      jp9000 提交于
      Having everything in global.ini meant that if you wanted different
      settings for studio mode, that it would also overwrite it for basic
      mode.  This way, the settings for each mode are separate, and you can
      use different settings for each mode.
      e88ee063
    • J
      Fixed basic settings window (forgot linux) · 9fb83cc2
      jp9000 提交于
      The function would fail to compile on linux because the variables didn't
      exist
      9fb83cc2
  4. 06 3月, 2014 2 次提交
    • J
      Load up the lists of audio devices in settings · 2448d0f2
      jp9000 提交于
      It will now load up a the list of audio input/output devices in the
      combo boxes in audio settings.
      2448d0f2
    • J
      Reimplement monitor capture · 4f7ab552
      jp9000 提交于
       - Implement windows monitor capture (code is so much cleaner than in
         OBS1).  Will implement duplication capture later
      
       - Add GDI texture support to d3d11 graphics library
      
       - Fix precision issue with sleep timing, you have to call
         timeBeginPeriod otherwise windows sleep will be totally erratic.
      4f7ab552
  5. 04 3月, 2014 3 次提交
    • J
      WASAPI: Check the HRESULT values with FAILED · 3415960d
      jp9000 提交于
      I can't believe I did !res there.  Well I suppose I can believe it, but
      still.
      3415960d
    • J
      CoreAudio: Separate enumeration code · bec8a09b
      jp9000 提交于
      The enumeration code being up at the top was making things quite messy,
      so I split that code out to a separate set of files.
      bec8a09b
    • J
      Add WASAPI audio capture · 34858825
      jp9000 提交于
       - Add WASAPI audio capture for windows, input and output
      
       - Check for null pointer in os_dlopen
      
       - Add exception-safe 'WinHandle' and 'CoTaskMemPtr' helper classes that
         will automatically call CloseHandle on handles and call CoTaskMemFree
         on certain types of memory returned from windows functions
      
       - Changed the wide <-> MBS/UTF8 conversion functions so that you use
         buffers (like these functions are *supposed* to behave), and changed
         the ones that allocate to a different naming scheme to be safe
      34858825