@@ -1,4 +1,15 @@

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

+Wed Oct 07 02:43:06 UTC 2020 - jimmy@boombatower.com

+

+- Update to version 26.0.2:

+  * UI: Fix selecting correct transition when deleting

+  * UI: Fix non-default transitions going below add vals

+  * libobs: Update version to 26.0.2

+  * UI/installer: Add avutil/swscale to file in use check

+  * coreaudio-encoder: Actually fix coreaudio loading

+  * libobs: Update version to 26.0.1

+

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

 Mon Oct 05 15:46:17 UTC 2020 - jimmy@boombatower.com

 - Update to version 26.0.1:

​

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

 Name:           obs-studio

-Version:        26.0.1

+Version:        26.0.2

 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/26.0.1</param>

+    <param name="revision">refs/tags/26.0.2</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">11602bc93341e8643878810d65d6a414c60b1ac7</param>

+    <param name="changesrevision">3486c0b3633a8ff2b36170d56f37705fe7061349</param>

   </service>

 </servicedata>

​

@@ -219,6 +219,13 @@

 Function checkDLLs

    OBSInstallerUtils::ResetInUseFileChecks

+!ifdef INSTALL64

+   OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\bin\64bit\avutil-56.dll"

+   OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\bin\64bit\swscale-5.dll"

+!else

+   OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\bin\32bit\avutil-56.dll"

+   OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\bin\32bit\swscale-5.dll"

+!endif

    OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\data\obs-plugins\win-capture\graphics-hook32.dll"

    OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\data\obs-plugins\win-capture\graphics-hook64.dll"

    OBSInstallerUtils::AddInUseFileCheck "$INSTDIR\data\obs-plugins\win-dshow\obs-virtualcam-module32.dll"

​

@@ -102,6 +102,34 @@

    ui->transitions->blockSignals(false);

 }

+int OBSBasic::TransitionCount()

+{

+   int idx = 0;

+   for (int i = 0; i < ui->transitions->count(); i++) {

+       QVariant v = ui->transitions->itemData(i);

+       if (!v.toString().isEmpty()) {

+           idx = i;

+           break;

+       }

+   }

+

+   /* should always have at least fade and cut due to them being

+    * defaults */

+   assert(idx != 0);

+   return idx - 1; /* remove separator from equation */

+}

+

+int OBSBasic::AddTransitionBeforeSeparator(const QString &name,

+                      obs_source_t *source)

+{

+   int idx = TransitionCount();

+   ui->transitions->blockSignals(true);

+   ui->transitions->insertItem(idx, name,

+                   QVariant::fromValue(OBSSource(source)));

+   ui->transitions->blockSignals(false);

+   return idx;

+}

+

 void OBSBasic::AddQuickTransitionHotkey(QuickTransition *qt)

 {

    DStr hotkeyId;

@@ -516,10 +544,9 @@

        source = obs_source_create_private(QT_TO_UTF8(id), name.c_str(),

                           NULL);

        InitTransition(source);

-       ui->transitions->addItem(

-           QT_UTF8(name.c_str()),

-           QVariant::fromValue(OBSSource(source)));

-       ui->transitions->setCurrentIndex(ui->transitions->count() - 1);

+       int idx = AddTransitionBeforeSeparator(QT_UTF8(name.c_str()),

+                              source);

+       ui->transitions->setCurrentIndex(idx);

        CreatePropertiesWindow(source);

        obs_source_release(source);

@@ -558,7 +585,15 @@

        }

    }

+   ui->transitions->blockSignals(true);

    ui->transitions->removeItem(idx);

+   ui->transitions->setCurrentIndex(-1);

+   ui->transitions->blockSignals(false);

+

+   int bottomIdx = TransitionCount() - 1;

+   if (idx > bottomIdx)

+       idx = bottomIdx;

+   ui->transitions->setCurrentIndex(idx);

    if (api)

        api->on_event(OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED);

@@ -1550,9 +1585,7 @@

            obs_source_create_private(id, name, settings);

        if (!obs_obj_invalid(source)) {

            InitTransition(source);

-           ui->transitions->addItem(

-               QT_UTF8(name),

-               QVariant::fromValue(OBSSource(source)));

+           AddTransitionBeforeSeparator(QT_UTF8(name), source);

        }

        obs_data_release(settings);

​

@@ -401,6 +401,9 @@

    void CreateProgramDisplay();

    void CreateProgramOptions();

+   int TransitionCount();

+   int AddTransitionBeforeSeparator(const QString &name,

+                    obs_source_t *source);

    void AddQuickTransitionId(int id);

    void AddQuickTransition();

    void AddQuickTransitionHotkey(QuickTransition *qt);

​

@@ -41,7 +41,7 @@

  *

  * Reset to zero each major or minor version

  */

-#define LIBOBS_API_PATCH_VER 0

+#define LIBOBS_API_PATCH_VER 2

 #define MAKE_SEMANTIC_VERSION(major, minor, patch) \

    ((major << 24) | (minor << 16) | patch)

​

@@ -376,11 +376,13 @@

    }

    wchar_t path[MAX_PATH];

-   _snwprintf(path, MAX_PATH, L"%s\\%s\\%s", sh_path, subpath,

-          L"CoreAudioToolbox.dll");

+   _snwprintf(path, MAX_PATH, L"%s\\%s", sh_path, subpath);

    CoTaskMemFree(sh_path);

-   audio_toolbox = LoadLibraryW(path);

+   SetDllDirectory(path);

+   audio_toolbox = LoadLibraryW(L"CoreAudioToolbox.dll");

+   SetDllDirectory(nullptr);

+

    return !!audio_toolbox;

 }

​