@@ -1,4 +1,44 @@

 -------------------------------------------------------------------

+Fri Dec 13 21:17:57 UTC 2019 - jimmy@boombatower.com

+

+- Update to version 24.0.5:

+  * libobs: Update version to 24.0.5

+  * CI: Don't run clang format on some submodule plugins

+  * Merge pull request #2010 from wanhongqing123/master

+  * Merge pull request #2042 from WizardCM/custom-twitch-docks

+  * Merge pull request #2183 from ratwithacompiler/macos-python-fix-2

+  * Merge pull request #2085 from ratwithacompiler/macos-python-fix

+  * Merge pull request #2090 from jpark37/dxgi-refresh-rate

+  * Merge pull request #2089 from jpark37/dxgi-driver-version

+  * UI: Delete cookies before connecting account

+  * UI: Fix bug in untested/unused function code path

+  * deps/media-playback: Don't use interrupt cb for local files

+  * deps/media-playback: Don't exit thread on AVERROR_EXIT

+  * deps/obs-scripting: Fix formatting

+  * Merge pull request #2152 from Rosuav/fix-cursor-position

+  * UI: Fix Twitch panels not using dark first time

+  * Merge pull request #1914 from YouNow/master

+  * Merge pull request #2140 from DevWolk/avn-obs

+  * Merge pull request #2045 from wolf247/master

+  * Merge pull request #2179 from WizardCM/remove-help-interact

+  * Merge pull request #2125 from DDRBoxman/appbundle

+  * Merge pull request #2168 from kkartaltepe/vaapi-profile-fix

+  * Merge pull request #2148 from eulertour/master

+  * Merge pull request #2146 from Fenrirthviti/recording-bitrate-fix

+  * libobs: Fix race condition

+  * Merge pull request #2147 from JohannMG/vscode-ignore

+  * Merge pull request #2134 from WizardCM/wasapi-samplerate

+  * Merge pull request #2129 from Fenrirthviti/win-blacklist-update

+  * Merge pull request #2131 from jpark37/input-layout-error

+  * Merge pull request #2128 from Xaymar/return-to-break

+  * Merge pull request #2121 from cg2121/fix-warning

+  * Merge pull request #2110 from derrod/ffmpeg-output-fix

+  * Merge pull request #2106 from cg2121/fix-preview-bug

+  * Merge pull request #2126 from Fenrirthviti/linux-ci-fix

+  * Merge pull request #2091 from Programatic/xshm_wrong_windows

+  * Merge pull request #2120 from jpark37/objc-msgsend

+

+-------------------------------------------------------------------

 Tue Oct 15 14:33:53 UTC 2019 - jimmy@boombatower.com

 - Update to version 24.0.3:

​

@@ -1,5 +1,5 @@

 Name:           obs-studio

-Version:        24.0.3

+Version:        24.0.5

 Release:        0

 Summary:        A recording/broadcasting program

 Group:          Productivity/Multimedia/Video/Editors and Convertors

​

@@ -1,7 +1,7 @@

 <services>

   <service name="tar_scm" mode="disabled">

     <param name="versionformat">@PARENT_TAG@</param>

-    <param name="revision">refs/tags/24.0.3</param>

+    <param name="revision">refs/tags/24.0.5</param>

     <param name="url">git://github.com/jp9000/obs-studio.git</param>

     <param name="scm">git</param>

     <param name="changesgenerate">enable</param>

​

@@ -1,6 +1,6 @@

 <servicedata>

   <service name="tar_scm">

     <param name="url">git://github.com/jp9000/obs-studio.git</param>

-    <param name="changesrevision">d88a5a5a60bcdcbdde6d5dc54dc352ae8d431070</param>

+    <param name="changesrevision">99638ba69782bdb10531a305093bbd25e5d3baef</param>

   </service>

 </servicedata>

​

@@ -1,1721 +0,0 @@

-/******************************************************************************

-    Copyright (C) 2013 by Ruwen Hahn <palana@stunned.de>

-

-    This program is free software: you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation, either version 2 of the License, or

-    (at your option) any later version.

-

-    This program is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-******************************************************************************/

-

-#include "util/platform.h"

-#include "util/dstr.h"

-#include "obs.h"

-#include "obs-internal.h"

-

-#include <unistd.h>

-#include <sys/types.h>

-#include <sys/sysctl.h>

-

-#include <objc/objc.h>

-#include <Carbon/Carbon.h>

-#include <IOKit/hid/IOHIDDevice.h>

-#include <IOKit/hid/IOHIDManager.h>

-

-const char *get_module_extension(void)

-{

-   return ".so";

-}

-

-static const char *module_bin[] = {

-   "../obs-plugins",

-   OBS_INSTALL_PREFIX "obs-plugins",

-};

-

-static const char *module_data[] = {

-   "../data/obs-plugins/%module%",

-   OBS_INSTALL_DATA_PATH "obs-plugins/%module%",

-};

-

-static const int module_patterns_size =

-   sizeof(module_bin) / sizeof(module_bin[0]);

-

-void add_default_module_paths(void)

-{

-   for (int i = 0; i < module_patterns_size; i++)

-       obs_add_module_path(module_bin[i], module_data[i]);

-}

-

-char *find_libobs_data_file(const char *file)

-{

-   struct dstr path;

-   dstr_init_copy(&path, OBS_INSTALL_DATA_PATH "/libobs/");

-   dstr_cat(&path, file);

-   return path.array;

-}

-

-static void log_processor_name(void)

-{

-   char *name = NULL;

-   size_t size;

-   int ret;

-

-   ret = sysctlbyname("machdep.cpu.brand_string", NULL, &size, NULL, 0);

-   if (ret != 0)

-       return;

-

-   name = malloc(size);

-

-   ret = sysctlbyname("machdep.cpu.brand_string", name, &size, NULL, 0);

-   if (ret == 0)

-       blog(LOG_INFO, "CPU Name: %s", name);

-

-   free(name);

-}

-

-static void log_processor_speed(void)

-{

-   size_t size;

-   long long freq;

-   int ret;

-

-   size = sizeof(freq);

-   ret = sysctlbyname("hw.cpufrequency", &freq, &size, NULL, 0);

-   if (ret == 0)

-       blog(LOG_INFO, "CPU Speed: %lldMHz", freq / 1000000);

-}

-

-static void log_processor_cores(void)

-{

-   blog(LOG_INFO, "Physical Cores: %d, Logical Cores: %d",

-        os_get_physical_cores(), os_get_logical_cores());

-}

-

-static void log_available_memory(void)

-{

-   size_t size;

-   long long memory_available;

-   int ret;

-

-   size = sizeof(memory_available);

-   ret = sysctlbyname("hw.memsize", &memory_available, &size, NULL, 0);

-   if (ret == 0)

-       blog(LOG_INFO, "Physical Memory: %lldMB Total",

-            memory_available / 1024 / 1024);

-}

-

-static void log_os_name(id pi, SEL UTF8String)

-{

-   unsigned long os_id = (unsigned long)objc_msgSend(

-       pi, sel_registerName("operatingSystem"));

-

-   id os = objc_msgSend(pi, sel_registerName("operatingSystemName"));

-   const char *name = (const char *)objc_msgSend(os, UTF8String);

-

-   if (os_id == 5 /*NSMACHOperatingSystem*/) {

-       blog(LOG_INFO, "OS Name: Mac OS X (%s)", name);

-       return;

-   }

-

-   blog(LOG_INFO, "OS Name: %s", name ? name : "Unknown");

-}

-

-static void log_os_version(id pi, SEL UTF8String)

-{

-   id vs = objc_msgSend(pi,

-                sel_registerName("operatingSystemVersionString"));

-   const char *version = (const char *)objc_msgSend(vs, UTF8String);

-

-   blog(LOG_INFO, "OS Version: %s", version ? version : "Unknown");

-}

-

-static void log_os(void)

-{

-   Class NSProcessInfo = objc_getClass("NSProcessInfo");

-   id pi = objc_msgSend((id)NSProcessInfo,

-                sel_registerName("processInfo"));

-

-   SEL UTF8String = sel_registerName("UTF8String");

-

-   log_os_name(pi, UTF8String);

-   log_os_version(pi, UTF8String);

-}

-

-static void log_kernel_version(void)

-{

-   char kernel_version[1024];

-   size_t size = sizeof(kernel_version);

-   int ret;

-

-   ret = sysctlbyname("kern.osrelease", kernel_version, &size, NULL, 0);

-   if (ret == 0)

-       blog(LOG_INFO, "Kernel Version: %s", kernel_version);

-}

-

-void log_system_info(void)

-{

-   log_processor_name();

-   log_processor_speed();

-   log_processor_cores();

-   log_available_memory();

-   log_os();

-   log_kernel_version();

-}

-

-static bool dstr_from_cfstring(struct dstr *str, CFStringRef ref)

-{

-   CFIndex length = CFStringGetLength(ref);

-   CFIndex max_size = CFStringGetMaximumSizeForEncoding(

-       length, kCFStringEncodingUTF8);

-   dstr_reserve(str, max_size);

-

-   if (!CFStringGetCString(ref, str->array, max_size,

-               kCFStringEncodingUTF8))

-       return false;

-

-   str->len = strlen(str->array);

-   return true;

-}

-

-struct obs_hotkeys_platform {

-   volatile long refs;

-   TISInputSourceRef tis;

-   CFDataRef layout_data;

-   UCKeyboardLayout *layout;

-   IOHIDManagerRef manager;

-   DARRAY(IOHIDElementRef) keys[OBS_KEY_LAST_VALUE];

-};

-

-static void hotkeys_retain(struct obs_hotkeys_platform *plat)

-{

-   os_atomic_inc_long(&plat->refs);

-}

​

@@ -8,9 +8,12 @@

 set -e

 # Generate file name variables

+export GIT_TAG=$(git describe --abbrev=0)

 export GIT_HASH=$(git rev-parse --short HEAD)

 export FILE_DATE=$(date +%Y-%m-%d.%H-%M-%S)

-export FILENAME=$FILE_DATE-$GIT_HASH-$TRAVIS_BRANCH-osx.pkg

+export FILENAME=$FILE_DATE-$GIT_HASH-$TRAVIS_BRANCH-osx.dmg

+

+echo "git tag: $GIT_TAG"

 cd ./build

@@ -19,9 +22,9 @@

 mv ./rundir/RelWithDebInfo/data/obs-scripting/obslua.so ./rundir/RelWithDebInfo/bin/

 # Move obspython

-# hr "Moving OBS Python"

-# mv ./rundir/RelWithDebInfo/data/obs-scripting/_obspython.so ./rundir/RelWithDebInfo/bin/

-# mv ./rundir/RelWithDebInfo/data/obs-scripting/obspython.py ./rundir/RelWithDebInfo/bin/

+hr "Moving OBS Python"

+mv ./rundir/RelWithDebInfo/data/obs-scripting/_obspython.so ./rundir/RelWithDebInfo/bin/

+mv ./rundir/RelWithDebInfo/data/obs-scripting/obspython.py ./rundir/RelWithDebInfo/bin/

 # Package everything into a nice .app

 hr "Packaging .app"

@@ -30,32 +33,44 @@

   STABLE=true

 fi

-sudo python ../CI/install/osx/build_app.py --public-key ../CI/install/osx/OBSPublicDSAKey.pem --sparkle-framework ../../sparkle/Sparkle.framework --stable=$STABLE

+#sudo python ../CI/install/osx/build_app.py --public-key ../CI/install/osx/OBSPublicDSAKey.pem --sparkle-framework ../../sparkle/Sparkle.framework --stable=$STABLE

+

+../CI/install/osx/packageApp.sh

+

+# fix obs outputs

+cp /usr/local/opt/mbedtls/lib/libmbedtls.12.dylib ./OBS.app/Contents/Frameworks/

+cp /usr/local/opt/mbedtls/lib/libmbedcrypto.3.dylib ./OBS.app/Contents/Frameworks/

+cp /usr/local/opt/mbedtls/lib/libmbedx509.0.dylib ./OBS.app/Contents/Frameworks/

+install_name_tool -change /usr/local/opt/mbedtls/lib/libmbedtls.12.dylib @executable_path/../Frameworks/libmbedtls.12.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

+install_name_tool -change /usr/local/opt/mbedtls/lib/libmbedcrypto.3.dylib @executable_path/../Frameworks/libmbedcrypto.3.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

+install_name_tool -change /usr/local/opt/mbedtls/lib/libmbedx509.0.dylib @executable_path/../Frameworks/libmbedx509.0.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

+install_name_tool -change /usr/local/opt/curl/lib/libcurl.4.dylib @executable_path/../Frameworks/libcurl.4.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

+install_name_tool -change @rpath/libobs.0.dylib @executable_path/../Frameworks/libobs.0.dylib ./OBS.app/Contents/Plugins/obs-outputs.so

+

+# copy sparkle into the app

+hr "Copying Sparkle.framework"

+cp -r ../../sparkle/Sparkle.framework ./OBS.app/Contents/Frameworks/

+install_name_tool -change @rpath/Sparkle.framework/Versions/A/Sparkle @executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle ./OBS.app/Contents/MacOS/obs

 # Copy Chromium embedded framework to app Frameworks directory

 hr "Copying Chromium Embedded Framework.framework"

 sudo mkdir -p OBS.app/Contents/Frameworks

 sudo cp -r ../../cef_binary_${CEF_BUILD_VERSION}_macosx64/Release/Chromium\ Embedded\ Framework.framework OBS.app/Contents/Frameworks/

-sudo install_name_tool -change \

-   @rpath/Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \

-   ../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \

-   OBS.app/Contents/Resources/obs-plugins/obs-browser.so

-sudo install_name_tool -change \

-   @executable_path/../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \

-   ../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \

-   OBS.app/Contents/Resources/obs-plugins/obs-browser.so   

-sudo install_name_tool -change \

-   @rpath/Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \

-   ../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \

-   OBS.app/Contents/Resources/obs-plugins/obs-browser-page

-sudo install_name_tool -change \

-   @executable_path/../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \

-   ../../Frameworks/Chromium\ Embedded\ Framework.framework/Chromium\ Embedded\ Framework \

-   OBS.app/Contents/Resources/obs-plugins/obs-browser-page

-

-# Package app

-hr "Generating .pkg"

-packagesbuild ../CI/install/osx/CMakeLists.pkgproj

+

+install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui ./OBS.app/Contents/Plugins/obs-browser.so

+install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Plugins/obs-browser.so

+install_name_tool -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets ./OBS.app/Contents/Plugins/obs-browser.so

+

+cp ../CI/install/osx/OBSPublicDSAKey.pem OBS.app/Contents/Resources

+

+# edit plist

+plutil -insert CFBundleVersion -string $GIT_TAG ./OBS.app/Contents/Info.plist

+plutil -insert CFBundleShortVersionString -string $GIT_TAG ./OBS.app/Contents/Info.plist

+plutil -insert OBSFeedsURL -string https://obsproject.com/osx_update/feeds.xml ./OBS.app/Contents/Info.plist

+plutil -insert SUFeedURL -string https://obsproject.com/osx_update/stable/updates.xml ./OBS.app/Contents/Info.plist

+plutil -insert SUPublicDSAKeyFile -string OBSPublicDSAKey.pem ./OBS.app/Contents/Info.plist

+

+dmgbuild -s ../CI/install/osx/settings.json "OBS" obs.dmg

 if [ -v "$TRAVIS" ]; then

    # Signing stuff

@@ -70,12 +85,10 @@

    security import ./Certificates.p12 -k build.keychain -T /usr/bin/productsign -P ""

    # macOS 10.12+

    security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword build.keychain

-   hr "Signing Package"

-   productsign --sign 2MMRE5MTB8 ./OBS.pkg ./$FILENAME

-else

-   cp ./OBS.pkg ./$FILENAME

 fi

+cp ./OBS.dmg ./$FILENAME

+

 # Move to the folder that travis uses to upload artifacts from

 hr "Moving package to nightly folder for distribution"

 mkdir ../nightly

​

@@ -1,7 +1,6 @@

 #!/bin/sh

 set -ex

-sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y

 curl -L https://packagecloud.io/github/git-lfs/gpgkey | sudo apt-key add -

 # gets us newer clang

​

@@ -16,6 +16,8 @@

   /bin/bash -c "sudo xcode-select -s /Applications/Xcode_9.4.1.app/Contents/Developer"

 fi

+git fetch origin --tags

+

 # Leave obs-studio folder

 cd ../

@@ -28,10 +30,12 @@

 brew update

 #Base OBS Deps and ccache

-brew install jack speexdsp ccache mbedtls clang-format

+brew install jack speexdsp ccache mbedtls clang-format freetype fdk-aac

 brew install https://gist.githubusercontent.com/DDRBoxman/b3956fab6073335a4bf151db0dcbd4ad/raw/ed1342a8a86793ea8c10d8b4d712a654da121ace/qt.rb

 brew install https://gist.githubusercontent.com/DDRBoxman/4cada55c51803a2f963fa40ce55c9d3e/raw/572c67e908bfbc1bcb8c476ea77ea3935133f5b5/swig.rb

+pip install dmgbuild

+

 export PATH=/usr/local/opt/ccache/libexec:$PATH

 ccache -s || echo "CCache is not available."

​

@@ -0,0 +1,30 @@

+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">

+<plist version="1.0">

+<dict>

+   <key>CFBundleIconFile</key>

+   <string>obs.icns</string>

+   <key>CFBundleName</key>

+   <string>OBS</string>

+   <key>CFBundleGetInfoString</key>

+   <string>OBS - Free and Open Source Streaming/Recording Software</string>

+   <key>CFBundleExecutable</key>

+   <string>OBS</string>

+   <key>CFBundleIdentifier</key>

+   <string>com.obsproject.obs-studio</string>

+   <key>CFBundlePackageType</key>

+   <string>APPL</string>

+   <key>CFBundleSignature</key>

+   <string>????</string>

+   <key>LSMinimumSystemVersion</key>

+   <string>10.8.5</string>

+   <key>NSHighResolutionCapable</key>

+   <true/>

+   <key>LSAppNapIsDisabled</key>

+   <true/>

+   <key>NSCameraUsageDescription</key>

+   <string>OBS needs to access the camera to enable camera sources to work.</string>

+   <key>NSMicrophoneUsageDescription</key>

+   <string>OBS needs to access the microphone to enable audio input.</string>

+</dict>

+</plist>

​

+(directory)

​

+(directory)

​

+(directory)

​

@@ -0,0 +1,1 @@

+dmgbuild -s ./settings.json "OBS" obs.dmg

​

@@ -0,0 +1,1 @@

+tiffutil -cathidpicheck background.png background@2x.png -out background.tiff

​

@@ -0,0 +1,67 @@

+rm -rf ./OBS.app

+

+mkdir OBS.app

+mkdir OBS.app/Contents

+mkdir OBS.app/Contents/MacOS

+mkdir OBS.app/Contents/Plugins

+mkdir OBS.app/Contents/Resources

+

+cp -r rundir/RelWithDebInfo/bin/ ./OBS.app/Contents/MacOS

+cp -r rundir/RelWithDebInfo/data ./OBS.app/Contents/Resources

+cp ../CI/install/osx/obs.icns ./OBS.app/Contents/Resources

+cp -r rundir/RelWithDebInfo/obs-plugins/ ./OBS.app/Contents/Plugins

+cp ../CI/install/osx/Info.plist ./OBS.app/Contents

+

+../CI/install/osx/dylibBundler -b -cd -d ./OBS.app/Contents/Frameworks -p @executable_path/../Frameworks/ \

+-s ./OBS.app/Contents/MacOS \

+-s /usr/local/opt/mbedtls/lib/ \

+-x ./OBS.app/Contents/Plugins/coreaudio-encoder.so \

+-x ./OBS.app/Contents/Plugins/decklink-ouput-ui.so \

+-x ./OBS.app/Contents/Plugins/frontend-tools.so \

+-x ./OBS.app/Contents/Plugins/image-source.so \

+-x ./OBS.app/Contents/Plugins/linux-jack.so \

+-x ./OBS.app/Contents/Plugins/mac-avcapture.so \

+-x ./OBS.app/Contents/Plugins/mac-capture.so \

+-x ./OBS.app/Contents/Plugins/mac-decklink.so \

+-x ./OBS.app/Contents/Plugins/mac-syphon.so \

+-x ./OBS.app/Contents/Plugins/mac-vth264.so \

+-x ./OBS.app/Contents/Plugins/obs-browser.so \

+-x ./OBS.app/Contents/Plugins/obs-browser-page \

+-x ./OBS.app/Contents/Plugins/obs-ffmpeg.so \

+-x ./OBS.app/Contents/Plugins/obs-filters.so \

+-x ./OBS.app/Contents/Plugins/obs-transitions.so \

+-x ./OBS.app/Contents/Plugins/obs-vst.so \

+-x ./OBS.app/Contents/Plugins/rtmp-services.so \

+-x ./OBS.app/Contents/MacOS/obs \

+-x ./OBS.app/Contents/MacOS/obs-ffmpeg-mux \

+-x ./OBS.app/Contents/MacOS/obslua.so \

+-x ./OBS.app/Contents/MacOS/_obspython.so \

+-x ./OBS.app/Contents/Plugins/obs-x264.so \

+-x ./OBS.app/Contents/Plugins/text-freetype2.so \

+-x ./OBS.app/Contents/Plugins/obs-libfdk.so

+# -x ./OBS.app/Contents/Plugins/obs-outputs.so \

+

+/usr/local/Cellar/qt/5.10.1/bin/macdeployqt ./OBS.app

+

+mv ./OBS.app/Contents/MacOS/libobs-opengl.so ./OBS.app/Contents/Frameworks

+

+# put qt network in here becasuse streamdeck uses it

+cp -r /usr/local/opt/qt/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks

+chmod +w ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork

+install_name_tool -change /usr/local/Cellar/qt/5.10.1/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork

+

+# decklink ui qt

+install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui ./OBS.app/Contents/Plugins/decklink-ouput-ui.so

+install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Plugins/decklink-ouput-ui.so

+install_name_tool -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets ./OBS.app/Contents/Plugins/decklink-ouput-ui.so

+

+# frontend tools qt

+install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui ./OBS.app/Contents/Plugins/frontend-tools.so

+install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Plugins/frontend-tools.so

+install_name_tool -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets ./OBS.app/Contents/Plugins/frontend-tools.so

+

+# vst qt

+install_name_tool -change /usr/local/opt/qt/lib/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui ./OBS.app/Contents/Plugins/obs-vst.so

+install_name_tool -change /usr/local/opt/qt/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Plugins/obs-vst.so

+install_name_tool -change /usr/local/opt/qt/lib/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets ./OBS.app/Contents/Plugins/obs-vst.so

+install_name_tool -change /usr/local/opt/qt/lib/QtMacExtras.framework/Versions/5/QtMacExtras @executable_path/../Frameworks/QtMacExtras.framework/Versions/5/QtMacExtras ./OBS.app/Contents/Plugins/obs-vst.so

​

@@ -0,0 +1,13 @@

+{

+    "title": "OBS",

+    "background": "../CI/install/osx/background.tiff",

+    "format": "UDZO",

+    "compression-level": 9,

+    "window": { "position": { "x": 100, "y": 100 },

+                "size": { "width": 540, "height": 380 } },

+    "contents": [

+        { "x": 120, "y": 180, "type": "file",

+          "path": "./OBS.app" },

+        { "x": 420, "y": 180, "type": "link", "path": "/Applications" }

+    ]

+}

​

@@ -373,14 +373,6 @@

    target_link_libraries(obs

            Qt5::MacExtras)

    set_target_properties(obs PROPERTIES LINK_FLAGS "-pagezero_size 10000 -image_base 100000000")

-   set_property(

-       TARGET obs

-       APPEND

-       PROPERTY INSTALL_RPATH

-       "/usr/local/Cellar/python3/3.6.4_2/Frameworks/Python.framework/Versions/3.6/lib/"

-       "/Library/Frameworks/Python.framework/Versions/3.6/lib/"

-       "/opt/local/Library/Frameworks/Python.framework/Versions/3.6/lib/"

-   )

 endif()

 define_graphic_modules(obs)

​

@@ -216,7 +216,8 @@

    chat->SetWidget(browser);

    cef->add_force_popup_url(moderation_tools_url, chat.data());

-   script = bttv_script;

+   script = "localStorage.setItem('twilight.theme', 1);";

+   script += bttv_script;

    script += ffz_script;

    browser->setStartupScript(script);

​

@@ -3685,19 +3685,19 @@

                    <item row="0" column="1">

                     <widget class="QComboBox" name="sampleRate">

                      <property name="currentText">

-                      <string notr="true">44.1khz</string>

+                      <string notr="true">44.1 kHz</string>

                      </property>

                      <property name="currentIndex">

                       <number>0</number>

                      </property>

                      <item>

                       <property name="text">

-                       <string>44.1khz</string>

+                       <string>44.1 kHz</string>

                       </property>

                      </item>

                      <item>

                       <property name="text">

-                       <string>48khz</string>

+                       <string>48 kHz</string>

                       </property>

                      </item>

                     </widget>

​

@@ -126,10 +126,17 @@

    if (status >= Success && name != nullptr) {

        std::string str(name);

        windowTitle = str;

+       XFree(name);

+   } else {

+       XTextProperty xtp_new_name;

+       if (XGetWMName(disp(), w, &xtp_new_name) != 0 &&

+           xtp_new_name.value != nullptr) {

+           std::string str((const char *)xtp_new_name.value);

+           windowTitle = str;

+           XFree(xtp_new_name.value);

+       }

    }

-   XFree(name);

-

    return windowTitle;

 }

​

@@ -28,11 +28,29 @@

 using namespace std;

+bool isInBundle()

+{

+   NSRunningApplication *app = [NSRunningApplication currentApplication];

+   return [app bundleIdentifier] != nil;

+}

+

 bool GetDataFilePath(const char *data, string &output)

 {

-   stringstream str;

-   str << OBS_DATA_PATH "/obs-studio/" << data;

-   output = str.str();

+   if (isInBundle()) {

+       NSRunningApplication *app =

+           [NSRunningApplication currentApplication];

+       NSURL *bundleURL = [app bundleURL];

+       NSString *path = [NSString

+           stringWithFormat:@"Contents/Resources/data/obs-studio/%@",

+                    [NSString stringWithUTF8String:data]];

+       NSURL *dataURL = [bundleURL URLByAppendingPathComponent:path];

+       output = [[dataURL path] UTF8String];

+   } else {

+       stringstream str;

+       str << OBS_DATA_PATH "/obs-studio/" << data;

+       output = str.str();

+   }

+

    return !access(output.c_str(), R_OK);

 }

​

@@ -1820,7 +1820,7 @@

        break;

    case OBS_PROPERTY_GROUP:

        GroupChanged(setting);

-       return;

+       break;

    }

    if (view->callback && !view->deferUpdate)

​

@@ -417,6 +417,8 @@

 #ifdef BROWSER_AVAILABLE

    std::string service = QT_TO_UTF8(ui->service->currentText());

+   OAuth::DeleteCookies(service);

+

    auth = OAuthStreamKey::Login(this, service);

    if (!!auth)

        OnAuthConnected();

​

@@ -59,6 +59,10 @@

    const char *name = obs_source_get_name(source);

    setWindowTitle(QTStr("Basic.InteractionWindow").arg(QT_UTF8(name)));

+   Qt::WindowFlags flags = windowFlags();

+   Qt::WindowFlags helpFlag = Qt::WindowContextHelpButtonHint;

+   setWindowFlags(flags & (~helpFlag));

+

    auto addDrawCallback = [this]() {

        obs_display_add_draw_callback(ui->preview->GetDisplay(),

                          OBSBasicInteraction::DrawPreview,

​

@@ -643,6 +643,7 @@

    } else if (videoEncoder == SIMPLE_ENCODER_NVENC) {

        UpdateRecordingSettings_nvenc(crf);

    }

+   UpdateRecordingAudioSettings();

 }

 inline void SimpleOutput::SetupOutputs()

​

@@ -88,6 +88,38 @@

    return found;

 }

+static bool GetUnusedSceneCollectionFile(std::string &name, std::string &file)

+{

+   char path[512];

+   size_t len;

+   int ret;

+

+   if (!GetFileSafeName(name.c_str(), file)) {

+       blog(LOG_WARNING, "Failed to create safe file name for '%s'",

+            name.c_str());

+       return false;

+   }

+

+   ret = GetConfigPath(path, sizeof(path), "obs-studio/basic/scenes/");

+   if (ret <= 0) {

+       blog(LOG_WARNING, "Failed to get scene collection config path");

+       return false;

+   }

+

+   len = file.size();

+   file.insert(0, path);

+

+   if (!GetClosestUnusedFileName(file, "json")) {

+       blog(LOG_WARNING, "Failed to get closest file name for %s",

+            file.c_str());

+       return false;

+   }

+

+   file.erase(file.size() - 5, 5);

+   file.erase(0, file.size() - len);

+   return true;

+}

+

 static bool GetSceneCollectionName(QWidget *parent, std::string &name,

                   std::string &file,

                   const char *oldName = nullptr)

@@ -95,9 +127,6 @@

    bool rename = oldName != nullptr;

    const char *title;

    const char *text;

-   char path[512];

-   size_t len;

-   int ret;

    if (rename) {

        title = Str("Basic.Main.RenameSceneCollection.Title");

@@ -128,29 +157,10 @@

        break;

    }

-   if (!GetFileSafeName(name.c_str(), file)) {

-       blog(LOG_WARNING, "Failed to create safe file name for '%s'",

-            name.c_str());

-       return false;

-   }

-

-   ret = GetConfigPath(path, sizeof(path), "obs-studio/basic/scenes/");

-   if (ret <= 0) {

-       blog(LOG_WARNING, "Failed to get scene collection config path");

-       return false;

-   }

-

-   len = file.size();

-   file.insert(0, path);

-

-   if (!GetClosestUnusedFileName(file, "json")) {

-       blog(LOG_WARNING, "Failed to get closest file name for %s",

-            file.c_str());

+   if (!GetUnusedSceneCollectionFile(name, file)) {

        return false;

    }

-   file.erase(file.size() - 5, 5);

-   file.erase(0, file.size() - len);

    return true;

 }

@@ -166,6 +176,10 @@

        name = QT_TO_UTF8(qname);

        if (SceneCollectionExists(name.c_str()))

            return false;

+

+       if (!GetUnusedSceneCollectionFile(name, file)) {

+           return false;

+       }

    }

    SaveProjectNow();

​

@@ -466,6 +466,8 @@

 #ifdef BROWSER_AVAILABLE

    std::string service = QT_TO_UTF8(ui->service->currentText());

+   OAuth::DeleteCookies(service);

+

    auth = OAuthStreamKey::Login(this, service);

    if (!!auth)

        OnAuthConnected();

​

@@ -2189,9 +2189,9 @@

    const char *str;

    if (sampleRate == 48000)

-       str = "48khz";

+       str = "48 kHz";

    else

-       str = "44.1khz";

+       str = "44.1 kHz";

    int sampleRateIdx = ui->sampleRate->findText(str);

    if (sampleRateIdx != -1)

@@ -3253,7 +3253,7 @@

    }

    int sampleRate = 44100;

-   if (sampleRateStr == "48khz")

+   if (sampleRateStr == "48 kHz")

        sampleRate = 48000;

    if (WidgetChanged(ui->sampleRate))

​

@@ -533,6 +533,24 @@

    dock->SetWidget(browser);

+   /* Add support for Twitch Dashboard panels */

+   if (url.contains("twitch.tv/popout") &&

+       url.contains("dashboard/live")) {

+       QRegularExpression re("twitch.tv\/popout\/([^/]+)\/");

+       QRegularExpressionMatch match = re.match(url);

+       QString username = match.captured(1);

+       if (username.length() > 0) {

+           std::string script;

+           script =

+               "Object.defineProperty(document, 'referrer', { get: () => '";

+           script += "https://twitch.tv/";

+           script += QT_TO_UTF8(username);

+           script += "/dashboard/live";

+           script += "'});";

+           browser->setStartupScript(script);

+       }

+   }

+

    addDockWidget(Qt::RightDockWidgetArea, dock);

    if (firstCreate) {

​

@@ -653,6 +653,9 @@

            source = curSource;

            window->source = source;

        }

+   } else if (window->type == ProjectorType::Preview &&

+          !main->IsPreviewProgramMode()) {

+       window->source = nullptr;

    }

    if (source)

​

@@ -61,7 +61,7 @@

        set(OBS_INSTALL_PREFIX "")

        set(OBS_RELATIVE_PREFIX "../")

-       set(OBS_SCRIPT_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-scripting/${_lib_suffix}bit")

+       set(OBS_SCRIPT_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-scripting")

    else()

        set(OBS_EXECUTABLE_DESTINATION "bin/${_lib_suffix}bit")

        set(OBS_EXECUTABLE32_DESTINATION "bin/32bit")

​

@@ -139,7 +139,7 @@

    int ret = av_read_frame(media->fmt, &pkt);

    if (ret < 0) {

-       if (ret != AVERROR_EOF)

+       if (ret != AVERROR_EOF && ret != AVERROR_EXIT)

            blog(LOG_WARNING, "MP: av_read_frame failed: %s (%d)",

                 av_err2str(ret), ret);

        return ret;

@@ -230,7 +230,7 @@

    while (!mp_media_ready_to_start(m)) {

        if (!m->eof) {

            int ret = mp_media_next_packet(m);

-           if (ret == AVERROR_EOF)

+           if (ret == AVERROR_EOF || ret == AVERROR_EXIT)

                m->eof = true;

            else if (ret < 0)

                return false;

@@ -577,8 +577,10 @@

        av_dict_set_int(&opts, "buffer_size", m->buffering, 0);

    m->fmt = avformat_alloc_context();

-   m->fmt->interrupt_callback.callback = interrupt_callback;

-   m->fmt->interrupt_callback.opaque = m;

+   if (!m->is_local_file) {

+       m->fmt->interrupt_callback.callback = interrupt_callback;

+       m->fmt->interrupt_callback.opaque = m;

+   }

    int ret = avformat_open_input(&m->fmt, m->path, format,

                      opts ? &opts : NULL);

​

@@ -12,6 +12,11 @@

        w32-pthreads)

 endif()

+if(APPLE)

+   set(obs-scripting_PLATFORM_DEPS

+       objc)

+endif()

+

 option(DISABLE_LUA "Disable Lua scripting support" OFF)

 option(DISABLE_PYTHON "Disable Python scripting support" OFF)

​

@@ -43,7 +43,8 @@

 for val in pairs(package.preload) do\n\

    package.preload[val] = nil\n\

 end\n\

-package.cpath = package.cpath .. \";\" .. \"%s\" .. \"/?." SO_EXT "\"\n\

+package.cpath = package.cpath .. \";\" .. \"%s/Contents/MacOS/?.so\" .. \";\" .. \"%s\" .. \"/?." SO_EXT

+                        "\"\n\

 require \"obslua\"\n";

 static const char *get_script_path_func = "\

@@ -1310,7 +1311,31 @@

    /* ---------------------------------------------- */

    /* Initialize Lua startup script                  */

-   dstr_printf(&tmp, startup_script_template, SCRIPT_DIR);

+   char *bundlePath = "./";

+

+#ifdef __APPLE__

+   Class nsRunningApplication = objc_lookUpClass("NSRunningApplication");

+   SEL currentAppSel = sel_getUid("currentApplication");

+

+   typedef id (*running_app_func)(Class, SEL);

+   running_app_func operatingSystemName = (running_app_func)objc_msgSend;

+   id app = operatingSystemName(nsRunningApplication, currentAppSel);

+

+   typedef id (*bundle_url_func)(id, SEL);

+   bundle_url_func bundleURL = (bundle_url_func)objc_msgSend;

+   id url = bundleURL(app, sel_getUid("bundleURL"));

+

+   typedef id (*url_path_func)(id, SEL);

+   url_path_func urlPath = (url_path_func)objc_msgSend;

+

+   id path = urlPath(url, sel_getUid("path"));

+

+   typedef id (*string_func)(id, SEL);

+   string_func utf8String = (string_func)objc_msgSend;

+   bundlePath = (char *)utf8String(path, sel_registerName("UTF8String"));

+#endif

+

+   dstr_printf(&tmp, startup_script_template, bundlePath, SCRIPT_DIR);

    startup_script = tmp.array;

    dstr_free(&dep_paths);

​

@@ -32,6 +32,12 @@

 #define SO_EXT ".dylib"

 #endif

+#ifdef __APPLE__

+#define PYTHON_LIB_SUBDIR "lib/"

+#else

+#define PYTHON_LIB_SUBDIR ""

+#endif

+

 bool import_python(const char *python_path)

 {

    struct dstr lib_path;

@@ -44,7 +50,7 @@

    dstr_init_copy(&lib_path, python_path);

    dstr_replace(&lib_path, "\\", "/");

    if (!dstr_is_empty(&lib_path)) {

-       dstr_cat(&lib_path, "/");

+       dstr_cat(&lib_path, "/" PYTHON_LIB_SUBDIR);

    }

    dstr_cat(&lib_path, PYTHON_LIB SO_EXT);

​

@@ -1651,6 +1651,13 @@

    add_to_python_path(SCRIPT_DIR);

+#if __APPLE__

+   char *exec_path = os_get_executable_path_ptr("");

+   if (exec_path)

+       add_to_python_path(exec_path);

+   bfree(exec_path);