2780e165eb
Merge pull request #154 from BtbN/gldebug_fix
...
Fix gl_debug_proc function for unexpected parameters
2014-07-10 20:43:43 -07:00
83c041e14f
Merge pull request #152 from BtbN/cmake_fixes
...
Cmake fixes
2014-07-10 20:43:23 -07:00
af7550248a
Merge pull request #150 from BtbN/rbswap
...
Reverse swap red&blue logic
2014-07-10 15:46:00 -07:00
5bbd918af3
Update default video save path for OSX
2014-07-10 22:00:18 +02:00
85fd6863e2
Fix missing initialization
...
Found by compiling with gcc 4.8, which shows a warning for use in the
inlined function called in that function.
Closes #155
2014-07-10 18:17:06 +02:00
1099f8e96f
Don't build with install rpath on unix
2014-07-10 14:38:53 +02:00
d09f6dae1f
Don't hardcode include directory for plugins
2014-07-10 14:38:46 +02:00
a53c75f67e
Add forgotten obs.hpp header to CMakeLists
2014-07-10 14:37:50 +02:00
34cf2b0528
Add glad headers to CMakeLists
2014-07-10 14:36:56 +02:00
a79ff06420
Fix gl_debug_proc function for unexpected parameters
2014-07-10 14:36:16 +02:00
f7b1bfa0a8
Reverse swap red&blue logic
2014-07-10 14:35:03 +02:00
6e4a79a640
libobs: Use the correct module unload function
2014-07-09 20:44:12 -07:00
8355e8c848
Separate x264 parameters by space
...
Some x264 parameters actually use the ':' character for their
parameters, so I feel like space would probably be a bit more ideal.
2014-07-09 13:57:52 -07:00
5585ae0eff
Rename volume control if audio source renamed
2014-07-08 11:58:48 -07:00
23a83054b5
Remove AV_REV_FOURCC macro from mac-avcapture
2014-07-08 14:33:29 +02:00
f57cc56268
Expand frame format support for mac-avcapture
...
Also add a fallback conversion via AVFoundation in case the native
format isn't supported
2014-07-08 14:31:04 +02:00
a5108e5fd9
Simplify timestamp handling for mac-avcapture
2014-07-08 14:31:04 +02:00
b92e8dfe92
Change "kbp/s" to "kb/s"
...
As pointed out by da_coder
2014-07-07 22:06:06 -07:00
c27ddb9066
Rename locale extensions from .txt to .ini
...
Because we're using .ini format, the translation servies spit out files
with .ini extensions, so this makes it so we don't necessarily have to
rename those files from .ini to .txt before merging.
2014-07-07 21:49:36 -07:00
48d8ebcc47
Move locale.ini to obs-studio base data directory
...
Being in with the other locale files causes a bit of confusion,
especially since the locale files will all be renamed to have .ini
extensions.
2014-07-07 21:46:55 -07:00
39930b1582
Merge pull request #141 from jp9000/status-bar
...
Implement Status bar
2014-07-06 17:38:49 -07:00
f0cc386499
Implement status bar
...
The status bar now displays:
- Auto-reconnect information (reconnecting and reconnect success)
- Dropped frames (as well as percentage of total video frames)
- Duration of session
- CPU usage of the program
- Kbp/s
The OBSBasic class is getting a bit big, so I separated out the
status bar code to its own class derived from QStatusBar.
2014-07-06 17:36:46 -07:00
a9b3da010d
Add function to main window to query CPU usage
2014-07-06 17:36:45 -07:00
0364672cbb
rtmp-stream: Add statistics callbacks
...
Add callbacks for total bytes sent and number of dropped frames
2014-07-06 17:36:45 -07:00
3d1c132989
Add statistics functions to outputs
...
Total bytes, total frames, and frames dropped. Total frames is
generated automatically, but total bytes and total dropped frames are
returned via callbacks.
2014-07-06 17:36:44 -07:00
64074e9fda
Add counting of total video frames to outputs
...
Before it would assign the encoder/media callbacks directly to the
output's callbacks, so instead of doing that, it now goes through
intermediary functions for the sake of counting the frames.
2014-07-06 17:36:44 -07:00
be2b0d1398
rtmp-stream: Change TEST_FRAMEDROPS to just sleep
...
Instead of making the send buffer size super small, just do a sleep when
sending data to simulate the inability to send out as much data as
desired.
2014-07-06 17:35:26 -07:00
118e3edd18
Remove unnecessary tests to delete
...
The delete operator can be called on a null pointer, so there's no
reason for these tests.
2014-07-06 17:35:17 -07:00
41f1ad32f2
Remove unused function
2014-07-05 16:16:32 -07:00
b060d86614
If reconnecting, ignore the disconnect code
...
Usually if you are reconnecting after network outage, it will give a
different code (such as OBS_OUTPUT_CONNECT_FAILED). So, if already
reconnecting, ignore the code unless it's OBS_OUTPUT_SUCCESS.
2014-07-05 15:01:10 -07:00
544b5e8741
Merge pull request #140 from taesheren/patch-1
...
Update and rename nb-NO to nb-NO.txt
2014-07-05 14:59:22 -07:00
fd3d4cbe96
Update and rename nb-NO to nb-NO.txt
...
Now with a proper file extension.
Fixed a line I forgot to add the translation for.
I was tired when I sent the pull request, okay?!
2014-07-05 20:03:58 +02:00
8780412892
Merge pull request #137 from taesheren/patch-1
...
Norwegian (bokmål) translation
2014-07-05 10:40:04 -07:00
e52486ccb5
Merge pull request #138 from Arkkis/patch-3
...
Update fi.txt
2014-07-05 10:39:54 -07:00
6494b7247c
Merge pull request #139 from bootkiller/patch-1
...
Portuguese (Portugal) Translation.
2014-07-05 10:39:45 -07:00
0781d86a2b
Implement CPU usage monitoring functions
2014-07-04 23:03:26 -07:00
92fe601cd7
Update pt.txt
...
Fixed an Error
2014-07-04 21:59:48 +01:00
5fcf438c0e
Portuguese (Portugal) Translation.
...
Portuguese translation, used latest EN file as a base.
2014-07-04 21:51:44 +01:00
df3623b478
Swap reconnect parameters
...
Fixes a bug where it would use the max retries for the delay time and
vise-versa.
2014-07-04 13:21:11 -07:00
0af303c96a
Update fi.txt
2014-07-04 23:20:06 +03:00
6db5458f22
Define magickcore macros to remove warnings
2014-07-04 11:34:15 -07:00
07b2fd5972
Do not visually select audio-only sources
2014-07-04 10:58:03 -07:00
f8cee12c22
Norwegian (bokmål) translation
...
Because: why not?
2014-07-04 05:36:06 +02:00
d3e6148ae7
Add auto-reconnect settings
2014-07-03 18:07:33 -07:00
9fc05e2a1d
Set default values for blend state structure
2014-07-03 14:19:34 -07:00
7dfb26eb31
Reset blend state to default after drawing
2014-07-03 14:12:48 -07:00
57cfd4f991
Implement function to reset blend state
...
I was implementing a pushing/popping attributes function like with GL,
but I realized that for our particular purposes (and actually for most
purposes) its usage was somewhat.. niche. I may still implement
pushing/popping of attributes in the future, though right now I feel
using a function to reset the state is sufficient for our purposes.
2014-07-03 14:11:30 -07:00
e4772a50b0
Merge pull request #135 from palana/dshow-property-data-changes
...
Implement recent property and data changes for win-dshow
2014-07-03 12:02:24 -07:00
423cbf7e82
Merge pull request #136 from doctorluk/patch-1
...
Update de.txt
2014-07-03 10:50:56 -07:00
3f47e3b4a6
Update de.txt
...
Fixed some typos and missing commas.
2014-07-03 18:01:19 +02:00
Jim
Palana
Timo R
taesheren
bootkiller
Arkkis
Lukas Monka