obs-powershell 0.1.6

CHANGELOG.md

@@ -1,3 +1,12 @@
+## obs-powershell 0.1.6:
+
+* Adding OBS.SceneItem .Scale (Fixes #64)
+* OBS.SceneItem .FitToScreen, adjusting .Scale (Fixes #63)
+* Add-OBSMediaSource: Fixing -InputSettings / -SceneItemEnabled (Fixes #62)
+
+---
+
+
 ## obs-powershell 0.1.5:
 
 * Adding OBS.SceneItem .Animate (Fixes #59)

Commands/Sources/Add-OBSMediaSource.ps.ps1

@@ -105,12 +105,40 @@ function Add-OBSMediaSource
 
         $FilePathItem = Get-Item -Path $FilePath
         $myParameterData['local_file'] = $FilePathItem.FullName -replace '/', '\'
+
+        if ($myParameters['InputSettings']) {
+            $keys = 
+                @(if ($myParameters['InputSettings'] -is [Collections.IDictionary]) {
+                    $myParameters['InputSettings'].Keys
+                } else {
+                    foreach ($prop in $myParameters['InputSettings'].PSObject.Properties) {
+                        $prop.Name
+                    }
+                })
+
+            foreach ($key in $keys) {
+                $myParameterData[$key] = $myParameters['InputSettings'].$key
+            }
+
+            $myParameterData.remove('inputSettings')
+        }
 
         if (-not $Name) {
             $Name = $FilePathItem.Name
         }
 
-        $outputAddedResult = Add-OBSInput -sceneName $myParameters["Scene"] -inputKind "ffmpeg_source" -inputSettings $myParameterData -inputName $Name
+        $addSplat = [Ordered]@{
+            sceneName = $myParameters["Scene"]
+            inputKind = "ffmpeg_source"
+            inputSettings = $myParameterData
+            inputName = $Name
+        }
+
+        if ($myParameters.Contains('SceneItemEnabled')) {
+            $addSplat.SceneItemEnabled = $myParameters['SceneItemEnabled'] -as [bool]
+        }
+
+        $outputAddedResult = Add-OBSInput @addSplat
         if ($outputAddedResult) {
             Get-OBSSceneItem -sceneName $myParameters["Scene"] |
                 Where-Object SourceName -eq $name

Commands/Sources/Add-OBSMediaSource.ps1

@@ -128,11 +128,34 @@ dynamicParam {
         }
         $FilePathItem = Get-Item -Path $FilePath
         $myParameterData['local_file'] = $FilePathItem.FullName -replace '/', '\'
+        if ($myParameters['InputSettings']) {
+            $keys = 
+                @(if ($myParameters['InputSettings'] -is [Collections.IDictionary]) {
+                    $myParameters['InputSettings'].Keys
+                } else {
+                    foreach ($prop in $myParameters['InputSettings'].PSObject.Properties) {
+                        $prop.Name
+                    }
+                })
+            foreach ($key in $keys) {
+                $myParameterData[$key] = $myParameters['InputSettings'].$key
+            }
+            $myParameterData.remove('inputSettings')
+        }
 
         if (-not $Name) {
             $Name = $FilePathItem.Name
         }
-        $outputAddedResult = Add-OBSInput -sceneName $myParameters["Scene"] -inputKind "ffmpeg_source" -inputSettings $myParameterData -inputName $Name
+        $addSplat = [Ordered]@{
+            sceneName = $myParameters["Scene"]
+            inputKind = "ffmpeg_source"
+            inputSettings = $myParameterData
+            inputName = $Name
+        }
+        if ($myParameters.Contains('SceneItemEnabled')) {
+            $addSplat.SceneItemEnabled = $myParameters['SceneItemEnabled'] -as [bool]
+        }
+        $outputAddedResult = Add-OBSInput @addSplat
         if ($outputAddedResult) {
             Get-OBSSceneItem -sceneName $myParameters["Scene"] |
                 Where-Object SourceName -eq $name

Types/OBS.GetSceneItemList.Response/FitToScreen.ps1

@@ -1,9 +1,13 @@
 $videoSettings = Get-OBSVideoSettings
 
-$this | Set-OBSSceneItemTransform -SceneItemTransform ([PSCustomObject][Ordered]@{
+$thisTransform = $this | Get-OBSSceneItemTransform
+
+$sceneItemTransform = ([Ordered]@{
     alignment = 0
-    height = $videoSettings.outputHeight    
+    scaleX    = ([double]$videoSettings.outputWidth / $thisTransform.sourceWidth )
     positionX = [int]($videoSettings.outputWidth / 2)
     positionY = [int]($videoSettings.outputHeight / 2)
-    width = $videoSettings.outputWidth
-})
+    scaleY    = ([double]$videoSettings.outputHeight / $thisTransform.sourceHeight )
+})
+
+$this | Set-OBSSceneItemTransform -SceneItemTransform $sceneItemTransform

Types/OBS.GetSceneItemList.Response/Scale.ps1

@@ -0,0 +1,38 @@
+param(
+[double[]]
+$ScaleX = 1,
+
+[double[]]
+$ScaleY = 1,
+
+# The timespan the animation will take
+[TimeSpan]
+$TimeSpan = [timespan]::fromSeconds(1)
+)
+
+if ($scaleX.Length -eq 1 -and $scaleY.Length -eq 1) {
+    $this | Set-OBSSceneItemTransform -SceneItemTransform @{
+        scaleX = $ScaleX[0]
+        scaleY = $scaleY[0]
+    }
+    return
+}
+
+$thisTransform = $this | Get-OBSSceneItemTransform 
+
+$fromValue = [Ordered]@{
+    scaleX = $thisTransform.scaleX
+    scaleY = $thisTransform.scaleY
+}
+
+$durationPerStep = [TimeSpan]::FromMilliseconds($TimeSpan.TotalMilliseconds / $ScaleX.Length)
+
+for ($stepNumber = 0; $stepNumber -lt $ScaleX.Length; $stepNumber++) {
+    $toValue = [Ordered]@{
+        scaleX = $ScaleX[$stepNumber]
+        scaleY = $ScaleY[$stepNumber]
+    }
+    $this.Animate($fromValue, $toValue, $durationPerStep)
+    $fromValue = $toValue
+}
+

docs/Add-OBSBrowserSource.md

@@ -24,13 +24,12 @@ If the uri points to a local file, this will be preferred
 
 
 
-> **Type**: ```[Uri]```
 
-> **Required**: false
 
-> **Position**: 1
 
-> **PipelineInput**:true (ByPropertyName)
+|Type   |Required|Position|PipelineInput        |
+|-------|--------|--------|---------------------|
+|`[Uri]`|false   |1       |true (ByPropertyName)|
 
 
 
@@ -42,13 +41,12 @@ If none is provided, this will be the output width of the video settings.
 
 
 
-> **Type**: ```[Int32]```
 
-> **Required**: false
 
-> **Position**: 2
 
-> **PipelineInput**:true (ByPropertyName)
+|Type     |Required|Position|PipelineInput        |
+|---------|--------|--------|---------------------|
+|`[Int32]`|false   |2       |true (ByPropertyName)|
 
 
 
@@ -60,13 +58,12 @@ If none is provided, this will be the output height of the video settings.
 
 
 
-> **Type**: ```[Int32]```
 
-> **Required**: false
 
-> **Position**: 3
 
-> **PipelineInput**:true (ByPropertyName)
+|Type     |Required|Position|PipelineInput        |
+|---------|--------|--------|---------------------|
+|`[Int32]`|false   |3       |true (ByPropertyName)|
 
 
 
@@ -77,13 +74,12 @@ The css style used to render the browser page.
 
 
 
-> **Type**: ```[String]```
 
-> **Required**: false
 
-> **Position**: 4
 
-> **PipelineInput**:true (ByPropertyName)
+|Type      |Required|Position|PipelineInput        |
+|----------|--------|--------|---------------------|
+|`[String]`|false   |4       |true (ByPropertyName)|
 
 
 
@@ -94,13 +90,12 @@ If set, the browser source will shutdown when it is hidden
 
 
 
-> **Type**: ```[Switch]```
 
-> **Required**: false
 
-> **Position**: named
 
-> **PipelineInput**:true (ByPropertyName)
+|Type      |Required|Position|PipelineInput        |
+|----------|--------|--------|---------------------|
+|`[Switch]`|false   |named   |true (ByPropertyName)|
 
 
 
@@ -111,13 +106,12 @@ If set, the browser source will restart when it is activated.
 
 
 
-> **Type**: ```[Switch]```
 
-> **Required**: false
 
-> **Position**: named
 
-> **PipelineInput**:true (ByPropertyName)
+|Type      |Required|Position|PipelineInput        |
+|----------|--------|--------|---------------------|
+|`[Switch]`|false   |named   |true (ByPropertyName)|
 
 
 
@@ -128,13 +122,12 @@ If set, audio from the browser source will be rerouted into OBS.
 
 
 
-> **Type**: ```[Switch]```
 
-> **Required**: false
 
-> **Position**: named
 
-> **PipelineInput**:true (ByPropertyName)
+|Type      |Required|Position|PipelineInput        |
+|----------|--------|--------|---------------------|
+|`[Switch]`|false   |named   |true (ByPropertyName)|
 
 
 
@@ -145,13 +138,12 @@ If provided, the browser source will render at a custom frame rate.
 
 
 
-> **Type**: ```[Int32]```
 
-> **Required**: false
 
-> **Position**: 5
 
-> **PipelineInput**:true (ByPropertyName)
+|Type     |Required|Position|PipelineInput        |
+|---------|--------|--------|---------------------|
+|`[Int32]`|false   |5       |true (ByPropertyName)|
 
 
 
@@ -163,13 +155,12 @@ If no scene name is provided, the current program scene will be used.
 
 
 
-> **Type**: ```[String]```
 
-> **Required**: false
 
-> **Position**: 6
 
-> **PipelineInput**:true (ByPropertyName)
+|Type      |Required|Position|PipelineInput        |
+|----------|--------|--------|---------------------|
+|`[String]`|false   |6       |true (ByPropertyName)|
 
 
 
@@ -181,13 +172,12 @@ If no name is provided, the last segment of the URI or file path will be the inp
 
 
 
-> **Type**: ```[String]```
 
-> **Required**: false
 
-> **Position**: 7
 
-> **PipelineInput**:true (ByPropertyName)
+|Type      |Required|Position|PipelineInput        |
+|----------|--------|--------|---------------------|
+|`[String]`|false   |7       |true (ByPropertyName)|
 
 
 

docs/Add-OBSColorSource.md

@@ -24,13 +24,12 @@ If no scene name is provided, the current program scene will be used.
 
 
 
-> **Type**: ```[String]```
 
-> **Required**: false
 
-> **Position**: 1
 
-> **PipelineInput**:true (ByPropertyName)
+|Type      |Required|Position|PipelineInput        |
+|----------|--------|--------|---------------------|
+|`[String]`|false   |1       |true (ByPropertyName)|
 
 
 
@@ -42,26 +41,24 @@ If no name is provided, "Display $($Monitor + 1)" will be the input source name.
 
 
 
-> **Type**: ```[String]```
 
-> **Required**: false
 
-> **Position**: 2
 
-> **PipelineInput**:true (ByPropertyName)
+|Type      |Required|Position|PipelineInput        |
+|----------|--------|--------|---------------------|
+|`[String]`|false   |2       |true (ByPropertyName)|
 
 
 
 ---
 #### **Color**
 
-> **Type**: ```[String]```
 
-> **Required**: false
 
-> **Position**: 3
 
-> **PipelineInput**:true (ByPropertyName)
+|Type      |Required|Position|PipelineInput        |
+|----------|--------|--------|---------------------|
+|`[String]`|false   |3       |true (ByPropertyName)|