256 Commits

Author SHA1 Message Date
Jim
d4bd7ea052 Merge pull request #931 from DDRBoxman/osxplugin
UI: Look for plugins in ~/Library/Application Support/obs-studio/plug…
2017-05-29 15:57:49 -07:00
Colin Edwards
c6e2318eae UI: Look for plugins in ~/Library/Application Support/obs-studio/plugins/ 2017-05-29 17:41:29 -05:00
jp9000
847b3013fc UI/installer: Update installer VC redist download link 2017-05-28 15:35:33 -07:00
jp9000
7c72cfc625 UI/installer: Fix broken realsense plugin install locations 2017-05-28 15:35:04 -07:00
jp9000
5e41865f83 UI/installer: Specify "source" in plugins section
When using the full installer, there'll be a section where you can
choose what to install -- one section is a tree view with a "plugins"
section, and in that section there's "Browser plugin" and "Realsense
plugin".  Instead of superfluously saying "plugin" for each of those,
replace with "source" instead -- so browser source and realsense source.
Also somewhat helps prevent the user from getting confused and thinking
we're installing a browser or something.
2017-05-28 15:35:03 -07:00
jp9000
870bf6b6fc UI: Fix tooltip for "prefer hardware encoding" 2017-05-21 09:02:14 -07:00
jp9000
8416c9fbae UI: Fix autoconfig capping bitrate with "custom server"
When custom server is used, it would still use the "common" RTMP service
to cap its bitrate.  So if Twitch was selected and you changed over to
custom RTMP server, it would still cap to Twitch's bitrate limits even
though you're not using Twitch anymore.
2017-05-21 01:40:12 -07:00
mntone
2ea7e3b344 UI: Fix creation of crash log with non-english paths 2017-05-21 10:44:54 +09:00
jp9000
cd52679160 UI: Unlock mutex before trying to stop output
Prevents the output from hard-locking on itself when the stop call would
trigger the callback and then try to lock again.  Probably could be
solved with a recursive mutex, but at that point it's not really
necessary.
2017-05-20 12:31:57 -07:00
Gol-D-Ace
5d25d800ad Fix German locale inconsistencies 2017-05-20 20:24:46 +02:00
jp9000
0c198bee50 UI: Fix bug where auto-config settings wouldn't apply
The radio buttons had been changed so "Streaming" would be selected by
default, but it only sets the wizard's "type" to streaming if the user
actually clicks the radio button themselves manually, so it would stay
set to "Invalid" by mistake, causing settings to not be applied.
2017-05-20 11:15:01 -07:00
jp9000
fa09e6743d UI: Remove whitespace from end of autconfig stream key
Because ?bandwidthtest is being appended to the end, it would bypass
normal whitespace removal, causing the stream key to fail.
2017-05-20 11:14:59 -07:00
jp9000
060fbb30ea UI: Change default autoconfig test bitrate
Changes the default autoconfig test bitrate to 10000kb/s, which will
then be capped by the user's service selection (so it'll still only use
6000 on Twitch for example, but will allow 10000 on Youtube and others).
2017-05-20 01:37:25 -07:00
Gol-D-Ace
3d2cacd782 Update translations from Crowdin 2017-05-20 10:18:41 +02:00
jp9000
12236d73f4 UI: Fix enumeration of scene collections on first run
When running the program for the first time, no scene collections will
show up in the scene collection menu.  This changes it to forcibly save
the first scene collection on the first run of the program, and then
re-enumerates the list to ensure it's listed.
2017-05-17 23:29:02 -07:00
jp9000
ee6ca246fe UI: Actually update service for wiz. bitrate limits
obs_service_update was left out by accident in the previous commit.
2017-05-17 22:37:05 -07:00
jp9000
93297d3d0e UI: Remove advanced settings from final wizard results
Removes advanced encoder settings from final wizard result so they don't
conflict with the wizard's expected final results.
2017-05-17 22:32:48 -07:00
jp9000
8dff07ad46 UI: Fix cases where wizard bitrate is not capped
Fixes some cases where the maximum bitrate might not be capped by the
service selection as it's supposed to be.
2017-05-17 22:31:02 -07:00
jp9000
f093028d7a UI: Sort filter names when adding filters 2017-05-16 18:03:34 -07:00
Igor Bochkariov
6e1c4caf99 UI: Fix creation of log files with non-english paths
This commit fixes creating log files in windows with Unicode profile
names.

I encountered this bug when running obs-studio 18.0.2 in Windows 8.1 x64
with my user profile path containing Unicode characters.

Steps to reproduce:

1) Create a windows user with a Unicode name: "пользователь"
2) Run OBS Studio, go to Help -> Log Files -> View current log (Nothing
happens)

The expected result is opening current log file.

Closes jp9000/obs-studio#916
2017-05-15 21:50:44 -07:00
jp9000
0a82d87d82 UI: Check to see if outputs valid when updating stats 2017-05-15 15:05:54 -07:00
jp9000
3470776843 UI: Make Stats a regular window rather than dialog 2017-05-15 15:02:56 -07:00
jp9000
47221e52cf UI: Move Stats to the view menu 2017-05-15 15:01:59 -07:00
jp9000
840bd07365 UI: Prevent user from starting ouputs while in settings
There's a loophole that would allow users to activate an output while in
the settings window via hotkeys -- this prevents that from being able to
happen.  Note that users can still shut down outputs, but they can no
longer start them up while in the settings window.
2017-05-15 14:35:38 -07:00
jp9000
4ff7ac0bfa UI: Change output blocking bool to integer ref counter 2017-05-15 14:35:36 -07:00
jp9000
0697e37b26 UI: Fix misleading log message when updating settings
While an output is active, the user may try to reset the settings in the
settings window, causing a misleading error message to be thrown in the
log indicating that it's "falling back" to OpenGL.

Instead, if an output is currently active, do not reset video.
2017-05-15 14:28:00 -07:00
Richard Stanway
2933b89733
UI: Add support for showing output error messages 2017-05-15 12:03:42 +02:00
jp9000
b2e376b022 UI: Update quick transitions on transition add/removal
Fixes a bug where the individual drop-down lists of each quick
transition would not have the correct available transitions listed if
transitions were added, renamed, or removed
2017-05-14 23:06:11 -07:00
Jim
b5a6e12219 Merge pull request #912 from Xaymar/feature-enc-amf
enc-amf: Version 2.1.3
2017-05-14 21:02:02 -07:00
Michael Fabian Dirks
1e99bf100f enc-amf: Version 2.1.3 2017-05-15 03:36:20 +02:00
jp9000
96ce9633e0 UI: Warn user if multiple instances of the UI are open
Uses a named mutex to detect if multiple instances of the program are
open, and if so warns the user.  When running in portable mode, uses a
separate unique mutex name mapped to the user's config directory to
ensure that no two portable builds use the same config directory.  This
way, portable builds do not conflict with normal builds or other
separate portable builds.
2017-05-14 15:25:34 -07:00
jp9000
99f5ae3059 UI: Don't count debug log messages in repeat detection 2017-05-14 15:24:15 -07:00
jp9000
602c730312 UI: Fix bug where Pre19Defaults would always be set
"OldDefaults" was changed to "Pre19Defaults", but it was still left in
this spot unchanged.
2017-05-14 13:12:14 -07:00
jp9000
13741034dd UI: Don't use "quit on last window closed"
Instead, quit only when the main window has been fully closed (and not
minimized to tray).  Fixes a bug where if the main window is minimized
to tray and another non-child window is open (for example, the stats
window), and then that window is closed, would cause the program to
prematurely exit and crash.
2017-05-14 13:03:46 -07:00
jp9000
3d5759335c UI: Save/remember stats window geometry 2017-05-13 20:51:44 -07:00
jp9000
b40f940b51 UI: Add option to show stats on startup to general 2017-05-13 20:47:47 -07:00
jp9000
b3435f62d7 UI: Bring stats to front if it already exists
If the menu item is triggered again, just bring it to the front instead
of trying to recreate it again.
2017-05-13 20:45:48 -07:00
jp9000
72d7adba67 UI: Fix locale text for "OK" in question dialogs
This is the only case where the button's name does not match the
locale's text, the button name being "Ok" and the locale text item being
"OK", fully capitalized.
2017-05-13 14:10:44 -07:00
jp9000
522f5cdf3b UI: Make sure all message box buttons are translated
Instead of QMessageBox::question and QMessageBox::information, use the
OBSMessageBox class, which translates all buttons.
2017-05-13 14:06:32 -07:00
jp9000
bd34dce8b6 UI: Add helper class to translate message box buttons 2017-05-13 14:05:03 -07:00
jp9000
1c5591e644 UI: Make Qt use locale text for QWizard buttons 2017-05-13 13:07:12 -07:00
jp9000
35454f7fc5 UI: Fix a few locale items, and add a few missing ones 2017-05-13 13:01:56 -07:00
jp9000
0e1ae62355 UI: Add stats dialog
Shows performance stats, and streaming/recording stats, and helps warn
the user when they have less-than-optimal values with coloring on the
values (e.g. yellow when getting low on disk space, red when getting
really low)
2017-05-13 01:52:54 -07:00
jp9000
ee734c17a5 UI: Add themeID values for colors to style sheets 2017-05-13 01:52:53 -07:00
jp9000
d0d9cc4254 UI: Add function to get current memory usage (win32) 2017-05-13 01:52:45 -07:00
Richard Stanway
09f6882137
UI: Show invalid Bind to IP entries in the settings
This fixes a case where the user sets an IP but then that IP is no longer
valid, resulting in OBS showing "Default" in the settings but still trying
to bind to the invalid IP internally.
2017-05-10 21:44:28 +02:00
jp9000
4049a5a882 UI: Add auto-configuration wizard
The auto-configuration wizard is designed to allow first-time or
novice/uneducated users or to set up video and encoding settings in a
very quick and easy way.  It'll automatically perform a bandwidth test,
and/or test the user's video settings to determine the most ideal
settings for streaming and recording (assuming a 1-pc setup).
2017-05-08 02:12:03 -07:00
jp9000
51e5f5fc64 UI: Remove colon from a few locale items
The colon makes it difficult to use these locale items for other
purposes, and the colon isn't used much elsewhere, so just remove them.
2017-05-06 12:12:37 -07:00
jp9000
f9595938d0 UI: Add 1920x1080/1280x720 to the settings base res list
Adds 1920x1080 and 1280x720 to the drop-down list of "default"
base/canvas resolutions rather than just the user's monitor resolutions,
in case the user wants to set the canvas to 1920x1080 or 1280x720
without having to manually type it in.  Added as a minor convenience.
2017-05-06 11:29:41 -07:00
jp9000
9d019e90ab UI: Limit default canvas res to 1920x1080 or below
The reasoning behind this is because having a very large canvas size can
negatively affect the user experience -- most sources end up seeming
smaller than they need to be to users, resulting in the user needing to
size up the sources, or in the case of webcams it makes the user try to
use much larger webcam resolutions than they should reasonably need to
do, resulting in higher unintentional resource usage.  The program will
additionally require more fillrate to render and downscale things as
well.

This applies only to the default starting base/canvas resolution for new
users only.

Additionally, users that ran the program pre-19 will be unaffected by
this change, as it will detect that and set the old defaults to prevent
an unexpected change in resolution for those users.
2017-05-06 11:29:40 -07:00