Merge branch 'obsproject:master' into windows-arm64

obsproject · Aug 17, 2021 · 76fcaa5 · 76fcaa5
2 parents 684e0f6 + c2cd372
commit 76fcaa5
Show file tree

Hide file tree

Showing 40 changed files with 503 additions and 703 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -294,7 +294,7 @@ jobs:
             codesign --force --options runtime --entitlements "../CI/scripts/macos/helpers/helper-renderer-entitlements.plist" --sign "${SIGN_IDENTITY:--}" --deep "./OBS.app/Contents/Frameworks/OBS Helper (Renderer).app"
           fi
 
-          codesign --force --options runtime --deep --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Resources/data/obs-mac-virtualcam.plugin"
+          codesign --force --options runtime --deep --sign "${SIGN_IDENTITY:--}" "./OBS.app/Contents/Resources/data/obs-plugins/mac-virtualcam/obs-mac-virtualcam.plugin"
 
           codesign --force --options runtime --entitlements "../CI/scripts/macos/app/entitlements.plist" --sign "${SIGN_IDENTITY:--}" --deep ./OBS.app
 

diff --git a/CI/full-build-macos.sh b/CI/full-build-macos.sh
@@ -533,7 +533,7 @@ codesign_bundle() {
 
     step "Code-sign DAL Plugin..."
     /bin/echo -n "${COLOR_ORANGE}"
-    /usr/bin/codesign --force --options runtime --deep --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Resources/data/obs-mac-virtualcam.plugin"
+    /usr/bin/codesign --force --options runtime --deep --sign "${CODESIGN_IDENT}" "./OBS.app/Contents/Resources/data/obs-plugins/mac-virtualcam/obs-mac-virtualcam.plugin"
     /bin/echo -n "${COLOR_RESET}"
 
     step "Code-sign OBS code..."

diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt
@@ -68,6 +68,8 @@ configure_file(
 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 set(CMAKE_AUTOMOC TRUE)
 
+find_package(Threads REQUIRED)
+
 find_package(Qt5Network ${FIND_MODE})
 find_package(Qt5Widgets ${FIND_MODE})
 find_package(Qt5Svg ${FIND_MODE})
@@ -451,6 +453,7 @@ endif()
 
 target_link_libraries(obs
 	libobs
+	Threads::Threads
 	Qt5::Network
 	Qt5::Widgets
 	Qt5::Svg

diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini
@@ -615,6 +615,9 @@ Basic.TransformWindow.BoundsType.ScaleToWidth="Scale to width of bounds"
 Basic.TransformWindow.BoundsType.ScaleToHeight="Scale to height of bounds"
 Basic.TransformWindow.BoundsType.Stretch="Stretch to bounds"
 
+Basic.TransformWindow.Title="Edit Transform for '%1'"
+Basic.TransformWindow.NoSelectedSource="No source selected"
+
 # no scene warning
 Basic.Main.AddSourceHelp.Title="Cannot Add Source"
 Basic.Main.AddSourceHelp.Text="You need to have at least 1 scene to add a source."
@@ -1176,8 +1179,10 @@ ContextBar.MediaControls.BlindSeek="Media Seek Widget"
 # YouTube Actions and Auth
 YouTube.Auth.Ok="Authorization completed successfully.\nYou can now close this page."
 YouTube.Auth.NoCode="The authorization process was not completed."
+YouTube.Auth.NoChannels="No channel(s) available on selected account"
 YouTube.Auth.WaitingAuth.Title="YouTube User Authorization"
 YouTube.Auth.WaitingAuth.Text="Please complete the authorization in your external browser.<br>If the external browser does not open, follow this link and complete the authorization:<br>%1"
+YouTube.AuthError.Text="Failed to get channel information: %1."
 
 YouTube.Actions.CreateNewEvent="Create a new event"
 YouTube.Actions.Title="Title*"
@@ -1216,16 +1221,25 @@ YouTube.Actions.Error.General="YouTube access error. Please check your network c
 YouTube.Actions.Error.NoBroadcastCreated="Broadcast creation error '%1'.<br/>A detailed error description can be found at <a href='https://developers.google.com/youtube/v3/live/docs/errors'>https://developers.google.com/youtube/v3/live/docs/errors</a>"
 YouTube.Actions.Error.NoStreamCreated="No stream created. Please relink your account."
 YouTube.Actions.Error.YouTubeApi="YouTube API Error. Please see the log file for more information."
+YouTube.Actions.Error.BroadcastNotFound="The selected broadcast was not found."
 
+YouTube.Actions.EventsLoading="Loading list of events..."
 YouTube.Actions.EventCreated.Title="Event Created"
 YouTube.Actions.EventCreated.Text="Event successfully created."
 
 YouTube.Actions.ChooseEvent="Choose an Event"
 YouTube.Actions.Stream="Stream"
-YouTube.Actions.Stream.ScheduledFor="scheduled for"
+YouTube.Actions.Stream.ScheduledFor="Scheduled for %1"
+YouTube.Actions.Stream.Resume="Resume interrupted stream"
+YouTube.Actions.Stream.YTStudio="Automatically created by YouTube Studio"
 
 YouTube.Actions.Notify.Title="YouTube"
 YouTube.Actions.Notify.CreatingBroadcast="Creating a new Live Broadcast, please wait..."
 
-YouTube.Actions.AutoStartStreamingWarning="Auto start is disabled for this stream, you should click \"GO LIVE\"."
+YouTube.Actions.AutoStartStreamingWarning.Title="Manual start required"
+YouTube.Actions.AutoStartStreamingWarning="Auto start is disabled for this stream, click the \"GO LIVE\" button to publish your broadcast on YouTube."
 YouTube.Actions.AutoStopStreamingWarning="You will not be able to reconnect.<br>Your stream will stop and you will no longer be live."
+
+# YouTube API errors in format "YouTube.Errors.<error reason>"
+YouTube.Errors.liveStreamingNotEnabled="Live streaming is not enabled on the selected YouTube channel.<br/><br/>See <a href='https://www.youtube.com/features'>youtube.com/features</a> for more information."
+YouTube.Errors.livePermissionBlocked="Live streaming is unavailable on the selected YouTube Channel.<br/>Please note that it may take up to 24 hours for live streaming to become available after enabling it in your channel settings.<br/><br/>See <a href='https://www.youtube.com/features'>youtube.com/features</a> for details."
diff --git a/UI/forms/OBSBasic.ui b/UI/forms/OBSBasic.ui
@@ -61,7 +61,7 @@
          <number>2</number>
         </property>
         <item>
-         <widget class="QWidget" name="previewDisabledWidget">
+         <widget class="QFrame" name="previewDisabledWidget">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
             <horstretch>0</horstretch>
@@ -196,7 +196,7 @@
      </layout>
     </item>
     <item>
-     <widget class="QWidget" name="contextContainer">
+     <widget class="QFrame" name="contextContainer">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
         <horstretch>0</horstretch>
@@ -209,12 +209,6 @@
         <height>30</height>
        </size>
       </property>
-      <property name="maximumSize">
-       <size>
-        <width>16777215</width>
-        <height>30</height>
-       </size>
-      </property>
       <layout class="QHBoxLayout" name="horizontalLayout9">
        <property name="spacing">
         <number>6</number>
@@ -235,7 +229,7 @@
         <number>4</number>
        </property>
        <item>
-        <widget class="QWidget" name="contextSubContainer">
+        <widget class="QFrame" name="contextSubContainer">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
@@ -310,12 +304,6 @@
               <height>22</height>
              </size>
             </property>
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>22</height>
-             </size>
-            </property>
             <property name="toolTip">
              <string>Properties</string>
             </property>
@@ -342,12 +330,6 @@
               <height>22</height>
              </size>
             </property>
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>22</height>
-             </size>
-            </property>
             <property name="toolTip">
              <string>Filters</string>
             </property>
@@ -374,12 +356,6 @@
               <height>22</height>
              </size>
             </property>
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>22</height>
-             </size>
-            </property>
             <property name="text">
              <string>Interact</string>
             </property>
@@ -406,9 +382,9 @@
         </widget>
        </item>
        <item>
-        <widget class="QWidget" name="emptySpace">
+        <widget class="QFrame" name="emptySpace">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -419,12 +395,6 @@
            <height>22</height>
           </size>
          </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>22</height>
-          </size>
-         </property>
          <layout class="QHBoxLayout" name="horizontalLayout_6">
           <property name="spacing">
            <number>0</number>
@@ -1116,7 +1086,7 @@
       <number>4</number>
      </property>
      <item>
-      <widget class="QWidget" name="transitionsContainer">
+      <widget class="QFrame" name="transitionsContainer">
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <property name="spacing">
          <number>2</number>

diff --git a/UI/forms/source-toolbar/browser-source-toolbar.ui b/UI/forms/source-toolbar/browser-source-toolbar.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -22,12 +22,6 @@
     <height>22</height>
    </size>
   </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>22</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
@@ -52,12 +46,6 @@
        <height>22</height>
       </size>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>22</height>
-      </size>
-     </property>
      <property name="text">
       <string>RefreshBrowser</string>
      </property>

diff --git a/UI/forms/source-toolbar/color-source-toolbar.ui b/UI/forms/source-toolbar/color-source-toolbar.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -22,12 +22,6 @@
     <height>22</height>
    </size>
   </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>22</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
@@ -58,12 +52,6 @@
        <height>22</height>
       </size>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>22</height>
-      </size>
-     </property>
      <property name="text">
       <string notr="true">color here</string>
      </property>
@@ -80,12 +68,6 @@
        <height>22</height>
       </size>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>22</height>
-      </size>
-     </property>
      <property name="text">
       <string>Basic.PropertiesWindow.SelectColor</string>
      </property>

diff --git a/UI/forms/source-toolbar/device-select-toolbar.ui b/UI/forms/source-toolbar/device-select-toolbar.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -22,12 +22,6 @@
     <height>22</height>
    </size>
   </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>22</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
@@ -61,12 +55,6 @@
        <height>22</height>
       </size>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>22</height>
-      </size>
-     </property>
      <property name="text">
       <string notr="true">Device</string>
      </property>
@@ -89,12 +77,6 @@
        <height>22</height>
       </size>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>22</height>
-      </size>
-     </property>
      <property name="currentText">
       <string notr="true"/>
      </property>
@@ -111,12 +93,6 @@
        <height>22</height>
       </size>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>22</height>
-      </size>
-     </property>
      <property name="text">
       <string notr="true">Activate</string>
      </property>