[vlc-devel] [PATCH 1/2] macosx: Introduce Icecast streaming service
Vibhoothi
vibhoothiiaanand at gmail.com
Sat Nov 3 20:24:18 CET 2018
Introducing Icecast as a new streaming option for all macOS users, This
version has seperate entries for username and passwords while other version
doesn't have that which helps to improve UX.
In the "Convert & Save" panel there are three new options
- Mount Point
- Username
- Password
fixes #17915
---
modules/gui/macosx/UI/ConvertAndSave.xib | 433 ++++++++++--------
.../VLCConvertAndSaveWindowController.h | 6 +
.../VLCConvertAndSaveWindowController.m | 32 +-
3 files changed, 273 insertions(+), 198 deletions(-)
diff --git a/modules/gui/macosx/UI/ConvertAndSave.xib b/modules/gui/macosx/UI/ConvertAndSave.xib
index 26177642f3..2bda8d6654 100644
--- a/modules/gui/macosx/UI/ConvertAndSave.xib
+++ b/modules/gui/macosx/UI/ConvertAndSave.xib
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="17G65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <development version="7000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
- <capability name="box content view" minToolsVersion="7.0"/>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="VLCConvertAndSaveWindowController">
@@ -76,8 +76,12 @@
<outlet property="streamDestinationLabel" destination="356" id="609"/>
<outlet property="streamDestinationURLLabel" destination="300" id="561"/>
<outlet property="streamDestinationView" destination="388" id="560"/>
+ <outlet property="streamMountPointField" destination="dMz-bA-LNV" id="dA0-WS-4bR"/>
+ <outlet property="streamMountPointLabel" destination="QJQ-Pq-rw0" id="gbO-Th-jDn"/>
<outlet property="streamOkButton" destination="360" id="621"/>
<outlet property="streamPanel" destination="308" id="608"/>
+ <outlet property="streamPasswordField" destination="PoR-21-dj4" id="wOH-yD-xQF"/>
+ <outlet property="streamPasswordLabel" destination="rhq-qR-z3e" id="ztk-bx-MXh"/>
<outlet property="streamPortField" destination="312" id="626"/>
<outlet property="streamPortLabel" destination="316" id="625"/>
<outlet property="streamSAPCheckbox" destination="345" id="615"/>
@@ -90,16 +94,18 @@
<outlet property="streamTTLStepper" destination="319" id="624"/>
<outlet property="streamTypeLabel" destination="310" id="610"/>
<outlet property="streamTypePopup" destination="315" id="612"/>
+ <outlet property="streamUsernameField" destination="2Vk-or-GKu" id="PZh-4t-0jm"/>
+ <outlet property="streamUsernameLabel" destination="umM-an-G08" id="MFm-gf-f2w"/>
<outlet property="window" destination="1" id="540"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <window title="Convert / Save" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1" userLabel="Convert / Save">
+ <window title="Convert / Save" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="1" userLabel="Convert / Save">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="20" width="663" height="490"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
<value key="minSize" type="size" width="663" height="490"/>
<value key="maxSize" type="size" width="663" height="490"/>
<view key="contentView" id="2">
@@ -109,11 +115,11 @@
<box autoresizesSubviews="NO" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="3">
<rect key="frame" x="17" y="255" width="629" height="217"/>
<view key="contentView" id="Ssq-2z-V0g">
- <rect key="frame" x="1" y="1" width="627" height="215"/>
+ <rect key="frame" x="3" y="3" width="623" height="211"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="537" customClass="VLCDragDropView">
- <rect key="frame" x="5" y="4" width="617" height="208"/>
+ <rect key="frame" x="3" y="2" width="617" height="208"/>
<subviews>
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="4" customClass="VLCDropDisabledImageView">
<rect key="frame" x="253" y="59" width="112" height="112"/>
@@ -132,7 +138,7 @@
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="7">
- <rect key="frame" x="247" y="16" width="125" height="32"/>
+ <rect key="frame" x="246" y="16" width="125" height="32"/>
<buttonCell key="cell" type="push" title="Open media..." bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -159,17 +165,15 @@
<constraint firstAttribute="width" constant="623" id="1e9-iK-lfq"/>
<constraint firstAttribute="height" constant="211" id="S51-zL-3hZ"/>
</constraints>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<box autoresizesSubviews="NO" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="10">
<rect key="frame" x="17" y="161" width="629" height="92"/>
<view key="contentView" id="CvM-Oi-SCn">
- <rect key="frame" x="1" y="1" width="627" height="90"/>
+ <rect key="frame" x="3" y="3" width="623" height="86"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="11">
- <rect key="frame" x="10" y="59" width="123" height="22"/>
+ <rect key="frame" x="10" y="55" width="123" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Choose Profile" id="12">
<font key="font" metaFont="system" size="18"/>
<color key="textColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -177,10 +181,10 @@
</textFieldCell>
</textField>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="aLk-M5-CXz" userLabel="Profile layout guide">
- <rect key="frame" x="149" y="25" width="330" height="21"/>
+ <rect key="frame" x="147" y="23" width="330" height="21"/>
<subviews>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="13">
- <rect key="frame" x="-2" y="-3" width="223" height="26"/>
+ <rect key="frame" x="-2" y="-3" width="223" height="25"/>
<constraints>
<constraint firstAttribute="width" constant="218" id="CVO-zt-Bx6"/>
</constraints>
@@ -232,17 +236,15 @@
<constraint firstAttribute="width" constant="623" id="pcx-Hn-9BS"/>
<constraint firstAttribute="height" constant="86" id="tky-N9-PlT"/>
</constraints>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<box autoresizesSubviews="NO" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="32">
<rect key="frame" x="17" y="58" width="629" height="100"/>
<view key="contentView" id="AhF-YR-JeB">
- <rect key="frame" x="1" y="1" width="627" height="98"/>
+ <rect key="frame" x="3" y="3" width="623" height="94"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="35">
- <rect key="frame" x="15" y="64" width="163" height="22"/>
+ <rect key="frame" x="15" y="60" width="163" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Choose Destination" id="36">
<font key="font" metaFont="system" size="18"/>
<color key="textColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -250,7 +252,7 @@
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="389">
- <rect key="frame" x="230" y="22" width="84" height="32"/>
+ <rect key="frame" x="228" y="20" width="84" height="32"/>
<buttonCell key="cell" type="push" title="Stream" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="390">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -260,7 +262,7 @@
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="392">
- <rect key="frame" x="314" y="22" width="112" height="32"/>
+ <rect key="frame" x="312" y="20" width="112" height="32"/>
<buttonCell key="cell" type="push" title="Save as File" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="393">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -270,8 +272,8 @@
</connections>
</button>
<button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="404">
- <rect key="frame" x="11" y="22" width="32" height="32"/>
- <buttonCell key="cell" type="round" title="x" bezelStyle="circular" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" id="405">
+ <rect key="frame" x="11" y="20" width="32" height="31"/>
+ <buttonCell key="cell" type="round" title="x" bezelStyle="circular" alignment="center" borderStyle="border" imageScaling="proportionallyDown" id="405">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
@@ -280,7 +282,7 @@
</connections>
</button>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="QZC-Ij-ExL" userLabel="Middle centered helper view">
- <rect key="frame" x="305" y="29" width="17" height="21"/>
+ <rect key="frame" x="303" y="27" width="17" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="17" id="rtm-Xf-9D8"/>
</constraints>
@@ -304,8 +306,6 @@
<constraint firstAttribute="height" constant="94" id="136-J5-OdM"/>
<constraint firstAttribute="width" constant="623" id="iQT-Dj-N9b"/>
</constraints>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="21">
<rect key="frame" x="579" y="13" width="70" height="32"/>
@@ -347,9 +347,9 @@ DQ
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="generic" id="29"/>
</imageView>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="27">
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="27">
<rect key="frame" x="189" y="20" width="100" height="17"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="center" title="bla bla bla.mov" usesSingleLineMode="YES" id="28">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="bla bla bla.mov" id="28">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -360,16 +360,14 @@ DQ
<constraint firstItem="26" firstAttribute="top" secondItem="25" secondAttribute="top" constant="20" id="1Fz-Hf-Vrp"/>
<constraint firstItem="26" firstAttribute="centerX" secondItem="25" secondAttribute="centerX" id="Coe-0J-gwn"/>
<constraint firstItem="26" firstAttribute="centerX" secondItem="27" secondAttribute="centerX" id="NMY-G0-yfW"/>
- <constraint firstItem="27" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="25" secondAttribute="leading" constant="20" symbolic="YES" id="Nb6-Op-t3A"/>
<constraint firstItem="27" firstAttribute="top" secondItem="26" secondAttribute="bottom" constant="8" id="glF-9v-Aot"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="27" secondAttribute="trailing" constant="20" symbolic="YES" id="jaa-Mx-So8"/>
</constraints>
</customView>
- <window title="Customize Profile" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="131" userLabel="Custom Profile">
+ <window title="Customize Profile" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="131" userLabel="Custom Profile">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="340" y="255" width="558" height="382"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
<view key="contentView" id="132">
<rect key="frame" x="0.0" y="0.0" width="558" height="382"/>
<autoresizingMask key="autoresizingMask"/>
@@ -504,11 +502,11 @@ DQ
<box autoresizesSubviews="NO" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="523">
<rect key="frame" x="6" y="11" width="500" height="248"/>
<view key="contentView" id="obk-BV-A6E">
- <rect key="frame" x="1" y="1" width="498" height="232"/>
+ <rect key="frame" x="3" y="3" width="494" height="230"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="170">
- <rect key="frame" x="15" y="206" width="38" height="14"/>
+ <rect key="frame" x="15" y="204" width="38" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Codec" id="171">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -516,7 +514,7 @@ DQ
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="178">
- <rect key="frame" x="15" y="180" width="39" height="14"/>
+ <rect key="frame" x="15" y="179" width="39" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Bitrate" id="179">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -524,7 +522,7 @@ DQ
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="172">
- <rect key="frame" x="415" y="201" width="68" height="22"/>
+ <rect key="frame" x="409" y="199" width="70" height="22"/>
<popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="175" id="173">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -538,7 +536,7 @@ DQ
</popUpButtonCell>
</popUpButton>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="180">
- <rect key="frame" x="300" y="178" width="161" height="19"/>
+ <rect key="frame" x="296" y="176" width="161" height="19"/>
<constraints>
<constraint firstAttribute="width" constant="161" id="oJs-v2-sjN"/>
</constraints>
@@ -551,7 +549,7 @@ DQ
<decimal key="maximum" value="NaN"/>
</numberFormatter>
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@@ -563,7 +561,7 @@ DQ
</connections>
</textField>
<stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="184">
- <rect key="frame" x="467" y="176" width="15" height="22"/>
+ <rect key="frame" x="463" y="174" width="15" height="22"/>
<stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="100" maxValue="100000" id="185">
<font key="font" metaFont="smallSystem"/>
</stepperCell>
@@ -572,7 +570,7 @@ DQ
</connections>
</stepper>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="186">
- <rect key="frame" x="15" y="152" width="64" height="14"/>
+ <rect key="frame" x="15" y="150" width="64" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Frame Rate" id="191">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -580,14 +578,14 @@ DQ
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="187">
- <rect key="frame" x="300" y="149" width="161" height="19"/>
+ <rect key="frame" x="296" y="147" width="161" height="19"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="190">
<numberFormatter key="formatter" formatterBehavior="10_0" positiveFormat="0" negativeFormat="-0" hasThousandSeparators="NO" thousandSeparator="." id="514">
<real key="minimum" value="0.0"/>
<real key="maximum" value="100"/>
</numberFormatter>
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@@ -599,7 +597,7 @@ DQ
</connections>
</textField>
<stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="188">
- <rect key="frame" x="467" y="147" width="15" height="22"/>
+ <rect key="frame" x="463" y="145" width="15" height="22"/>
<stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="100" id="189">
<font key="font" metaFont="smallSystem"/>
</stepperCell>
@@ -607,14 +605,14 @@ DQ
<binding destination="-2" name="value" keyPath="self.vidFramerate" id="666"/>
</connections>
</stepper>
- <box autoresizesSubviews="NO" title="Resolution" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="206">
- <rect key="frame" x="52" y="10" width="394" height="133"/>
+ <box autoresizesSubviews="NO" borderType="line" title="Resolution" translatesAutoresizingMaskIntoConstraints="NO" id="206">
+ <rect key="frame" x="50" y="10" width="394" height="133"/>
<view key="contentView" id="4gP-3n-rkP">
- <rect key="frame" x="1" y="1" width="392" height="117"/>
+ <rect key="frame" x="3" y="3" width="388" height="115"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="196">
- <rect key="frame" x="59" y="89" width="96" height="19"/>
+ <rect key="frame" x="59" y="87" width="96" height="19"/>
<constraints>
<constraint firstAttribute="width" constant="96" id="d3s-dl-4iB"/>
</constraints>
@@ -627,12 +625,12 @@ DQ
<real key="maximum" value="10000"/>
</numberFormatter>
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="202">
- <rect key="frame" x="240" y="90" width="33" height="14"/>
+ <rect key="frame" x="236" y="88" width="33" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Scale" id="205">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -640,7 +638,7 @@ DQ
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="199">
- <rect key="frame" x="59" y="64" width="96" height="19"/>
+ <rect key="frame" x="59" y="62" width="96" height="19"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="200">
<numberFormatter key="formatter" formatterBehavior="10_0" positiveFormat="0" negativeFormat="-0" hasThousandSeparators="NO" thousandSeparator="." id="522">
<attributedString key="attributedStringForZero">
@@ -650,12 +648,12 @@ DQ
<real key="maximum" value="10000"/>
</numberFormatter>
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="194">
- <rect key="frame" x="15" y="91" width="35" height="14"/>
+ <rect key="frame" x="15" y="89" width="35" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Width" id="195">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -663,7 +661,7 @@ DQ
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="198">
- <rect key="frame" x="15" y="66" width="39" height="14"/>
+ <rect key="frame" x="15" y="64" width="39" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Height" id="201">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -671,7 +669,7 @@ DQ
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="192">
- <rect key="frame" x="16" y="14" width="360" height="28"/>
+ <rect key="frame" x="15" y="14" width="358" height="28"/>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="center" title="You just need to fill one of the three following parameters, VLC will autodetect the other using the original aspect ratio" id="193">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -679,7 +677,7 @@ DQ
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="287">
- <rect key="frame" x="275" y="85" width="102" height="22"/>
+ <rect key="frame" x="271" y="83" width="102" height="22"/>
<popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="290" id="288">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -718,8 +716,6 @@ DQ
<constraint firstAttribute="width" constant="388" id="6iM-rk-euR"/>
<constraint firstAttribute="height" constant="129" id="L8c-wr-hjr"/>
</constraints>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
</subviews>
<constraints>
@@ -748,8 +744,6 @@ DQ
<constraint firstAttribute="height" constant="244" id="dnU-6L-fqV"/>
<constraint firstAttribute="width" constant="494" id="oMu-fT-rAi"/>
</constraints>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
</subviews>
<constraints>
@@ -777,8 +771,8 @@ DQ
<action selector="audioSettingsChanged:" target="-2" id="638"/>
</connections>
</button>
- <button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="208">
- <rect key="frame" x="15" y="248" width="153" height="18"/>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="208">
+ <rect key="frame" x="15" y="248" width="152" height="18"/>
<buttonCell key="cell" type="check" title="Keep original audio track" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="209">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -790,11 +784,11 @@ DQ
<box autoresizesSubviews="NO" borderType="line" translatesAutoresizingMaskIntoConstraints="NO" id="524">
<rect key="frame" x="6" y="114" width="500" height="144"/>
<view key="contentView" id="l2G-4l-Adk">
- <rect key="frame" x="1" y="1" width="498" height="128"/>
+ <rect key="frame" x="3" y="3" width="494" height="126"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="211">
- <rect key="frame" x="15" y="102" width="38" height="14"/>
+ <rect key="frame" x="15" y="100" width="38" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Codec" id="230">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -802,7 +796,7 @@ DQ
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="212">
- <rect key="frame" x="15" y="73" width="39" height="14"/>
+ <rect key="frame" x="15" y="72" width="39" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Bitrate" id="229">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -810,7 +804,7 @@ DQ
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="213">
- <rect key="frame" x="415" y="97" width="68" height="22"/>
+ <rect key="frame" x="409" y="95" width="70" height="22"/>
<popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="228" id="224">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -824,7 +818,7 @@ DQ
</popUpButtonCell>
</popUpButton>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="233">
- <rect key="frame" x="297" y="10" width="186" height="22"/>
+ <rect key="frame" x="293" y="8" width="186" height="22"/>
<popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="236" id="234">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -838,7 +832,7 @@ DQ
</popUpButtonCell>
</popUpButton>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="214">
- <rect key="frame" x="300" y="71" width="161" height="19"/>
+ <rect key="frame" x="296" y="69" width="161" height="19"/>
<constraints>
<constraint firstAttribute="width" constant="161" id="l4O-68-sv0"/>
</constraints>
@@ -848,7 +842,7 @@ DQ
<decimal key="maximum" value="NaN"/>
</numberFormatter>
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@@ -860,7 +854,7 @@ DQ
</connections>
</textField>
<stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="215">
- <rect key="frame" x="467" y="69" width="15" height="22"/>
+ <rect key="frame" x="463" y="67" width="15" height="22"/>
<stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="8" maxValue="100000" id="222">
<font key="font" metaFont="smallSystem"/>
</stepperCell>
@@ -869,7 +863,7 @@ DQ
</connections>
</stepper>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="216">
- <rect key="frame" x="15" y="44" width="53" height="14"/>
+ <rect key="frame" x="15" y="43" width="53" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Channels" id="221">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -877,7 +871,7 @@ DQ
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="231">
- <rect key="frame" x="15" y="15" width="70" height="14"/>
+ <rect key="frame" x="15" y="13" width="70" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Sample Rate" id="232">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -885,14 +879,14 @@ DQ
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="217">
- <rect key="frame" x="300" y="42" width="161" height="19"/>
+ <rect key="frame" x="296" y="40" width="161" height="19"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="220">
<numberFormatter key="formatter" formatterBehavior="10_0" positiveFormat="0" negativeFormat="-0" hasThousandSeparators="NO" thousandSeparator="." id="516">
<real key="minimum" value="0.0"/>
<real key="maximum" value="14"/>
</numberFormatter>
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@@ -904,7 +898,7 @@ DQ
</connections>
</textField>
<stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="218">
- <rect key="frame" x="467" y="40" width="15" height="22"/>
+ <rect key="frame" x="463" y="38" width="15" height="22"/>
<stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="14" id="219">
<font key="font" metaFont="smallSystem"/>
</stepperCell>
@@ -942,8 +936,6 @@ DQ
<constraint firstAttribute="height" constant="140" id="lh4-g7-y9H"/>
<constraint firstAttribute="width" constant="494" id="nFc-2s-PeV"/>
</constraints>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
</subviews>
<constraints>
@@ -979,7 +971,7 @@ DQ
</buttonCell>
</button>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="241">
- <rect key="frame" x="430" y="263" width="68" height="22"/>
+ <rect key="frame" x="428" y="263" width="70" height="22"/>
<popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="244" id="242">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -1059,26 +1051,26 @@ Gw
</constraints>
</view>
</window>
- <window title="Stream Panel" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="308" userLabel="Stream">
+ <window title="Stream Panel" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="308" userLabel="Stream">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
- <rect key="contentRect" x="131" y="60" width="532" height="368"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1280" height="778"/>
+ <rect key="contentRect" x="131" y="60" width="607" height="478"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1280" height="800"/>
<view key="contentView" id="309">
- <rect key="frame" x="0.0" y="0.0" width="532" height="368"/>
+ <rect key="frame" x="0.0" y="0.0" width="607" height="478"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
- <box autoresizesSubviews="NO" title="Stream Destination" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="336">
- <rect key="frame" x="17" y="227" width="498" height="122"/>
+ <box autoresizesSubviews="NO" borderType="line" title="Stream Destination" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="336">
+ <rect key="frame" x="55" y="227" width="498" height="232"/>
<view key="contentView" id="gfn-LW-3Zl">
- <rect key="frame" x="1" y="1" width="496" height="120"/>
+ <rect key="frame" x="3" y="3" width="492" height="226"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="312">
- <rect key="frame" x="407" y="13" width="50" height="22"/>
+ <rect key="frame" x="401" y="113" width="50" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="1234" drawsBackground="YES" id="332">
<font key="font" metaFont="system"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@@ -1086,30 +1078,22 @@ Gw
</connections>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="317">
- <rect key="frame" x="407" y="46" width="50" height="22"/>
+ <rect key="frame" x="401" y="146" width="50" height="22"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="Ueo-G3-TfK"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" title="1" drawsBackground="YES" id="322">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="316">
- <rect key="frame" x="372" y="15" width="30" height="17"/>
- <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Port" id="323">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="314">
- <rect key="frame" x="462" y="10" width="19" height="27"/>
+ <rect key="frame" x="456" y="111" width="19" height="27"/>
<stepperCell key="cell" continuous="YES" alignment="left" tag="1" maxValue="65535" doubleValue="1234" valueWraps="YES" id="330"/>
</stepper>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="313">
- <rect key="frame" x="15" y="15" width="54" height="17"/>
+ <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="752" translatesAutoresizingMaskIntoConstraints="NO" id="313">
+ <rect key="frame" x="15" y="116" width="79" height="17"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Address" id="331">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1117,7 +1101,7 @@ Gw
</textFieldCell>
</textField>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="315">
- <rect key="frame" x="92" y="43" width="78" height="26"/>
+ <rect key="frame" x="108" y="144" width="224" height="25"/>
<popUpButtonCell key="cell" type="push" title="HTTP" bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="329" id="324">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
@@ -1127,6 +1111,7 @@ Gw
<menuItem title="MMSH" id="326"/>
<menuItem title="RTP" id="328"/>
<menuItem title="UDP" id="327"/>
+ <menuItem title="Icecast" id="6RK-6i-sV4"/>
</items>
</menu>
</popUpButtonCell>
@@ -1134,8 +1119,8 @@ Gw
<action selector="streamTypeToggle:" target="-2" id="641"/>
</connections>
</popUpButton>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="310">
- <rect key="frame" x="15" y="48" width="34" height="17"/>
+ <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="310">
+ <rect key="frame" x="15" y="149" width="79" height="17"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Type" id="334">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -1143,78 +1128,179 @@ Gw
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="311">
- <rect key="frame" x="94" y="13" width="205" height="22"/>
+ <rect key="frame" x="110" y="113" width="219" height="22"/>
<constraints>
- <constraint firstAttribute="width" constant="205" id="bzu-Kr-nS8"/>
+ <constraint firstAttribute="width" constant="219" id="erm-fM-1hK"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="333">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="318">
- <rect key="frame" x="374" y="48" width="28" height="17"/>
- <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="TTL" id="321">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="319">
- <rect key="frame" x="462" y="43" width="19" height="27"/>
+ <rect key="frame" x="456" y="144" width="19" height="27"/>
<stepperCell key="cell" continuous="YES" alignment="left" tag="1" minValue="1" maxValue="65535" doubleValue="1" valueWraps="YES" id="320"/>
</stepper>
- <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="356">
- <rect key="frame" x="15" y="85" width="159" height="22"/>
+ <textField verticalHuggingPriority="750" verticalCompressionResistancePriority="753" translatesAutoresizingMaskIntoConstraints="NO" id="356">
+ <rect key="frame" x="15" y="184" width="159" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Stream Destination" id="357">
<font key="font" metaFont="system" size="18"/>
<color key="textColor" name="headerColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
+ <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="QJQ-Pq-rw0">
+ <rect key="frame" x="15" y="83" width="79" height="17"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Mount Point" id="pLJ-la-ocQ">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="umM-an-G08">
+ <rect key="frame" x="15" y="54" width="79" height="17"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Username" id="xj8-Q2-G6S">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dMz-bA-LNV">
+ <rect key="frame" x="110" y="80" width="219" height="22"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="LDl-c9-9bZ">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="rhq-qR-z3e">
+ <rect key="frame" x="15" y="21" width="79" height="17"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password" id="pqt-sc-Mbg">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2Vk-or-GKu">
+ <rect key="frame" x="110" y="51" width="219" height="22"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="Rvv-yZ-gnh">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="316">
+ <rect key="frame" x="366" y="116" width="30" height="17"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Port" id="323">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <secureTextField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PoR-21-dj4">
+ <rect key="frame" x="110" y="18" width="219" height="22"/>
+ <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" usesSingleLineMode="YES" id="q70-FT-7NN">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <allowedInputSourceLocales>
+ <string>NSAllRomanInputSourcesLocaleIdentifier</string>
+ </allowedInputSourceLocales>
+ </secureTextFieldCell>
+ </secureTextField>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="318">
+ <rect key="frame" x="366" y="149" width="30" height="17"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="TTL" id="321">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
</subviews>
<constraints>
+ <constraint firstAttribute="trailing" secondItem="319" secondAttribute="trailing" constant="20" id="0Jv-az-P8P"/>
+ <constraint firstItem="318" firstAttribute="leading" secondItem="316" secondAttribute="leading" id="0wy-0A-HRi"/>
<constraint firstItem="319" firstAttribute="leading" secondItem="317" secondAttribute="trailing" constant="8" id="1J1-fz-uqL"/>
- <constraint firstAttribute="bottom" secondItem="311" secondAttribute="bottom" constant="13" id="9db-uY-dLu"/>
+ <constraint firstItem="rhq-qR-z3e" firstAttribute="baseline" secondItem="PoR-21-dj4" secondAttribute="baseline" id="2GD-qY-gfs"/>
+ <constraint firstItem="311" firstAttribute="baseline" secondItem="316" secondAttribute="baseline" id="2ul-Uq-QnR"/>
+ <constraint firstItem="2Vk-or-GKu" firstAttribute="leading" secondItem="311" secondAttribute="leading" id="3hg-Zg-abR"/>
+ <constraint firstItem="316" firstAttribute="baseline" secondItem="312" secondAttribute="baseline" id="40Z-FK-Gkj"/>
+ <constraint firstItem="PoR-21-dj4" firstAttribute="leading" secondItem="311" secondAttribute="leading" id="4D8-GC-J1U"/>
+ <constraint firstItem="315" firstAttribute="trailing" secondItem="311" secondAttribute="trailing" id="5WW-hM-eCh"/>
+ <constraint firstItem="318" firstAttribute="baseline" secondItem="317" secondAttribute="baseline" id="6zd-Wq-eOW"/>
+ <constraint firstItem="rhq-qR-z3e" firstAttribute="trailing" secondItem="310" secondAttribute="trailing" id="7Uq-Ff-Q1k"/>
+ <constraint firstItem="rhq-qR-z3e" firstAttribute="top" secondItem="umM-an-G08" secondAttribute="bottom" constant="16" id="9hU-UV-P6h"/>
<constraint firstItem="317" firstAttribute="leading" secondItem="312" secondAttribute="leading" id="B24-Xh-2YT"/>
- <constraint firstItem="311" firstAttribute="top" secondItem="315" secondAttribute="bottom" constant="11" id="EEV-RU-fKU"/>
- <constraint firstItem="356" firstAttribute="top" secondItem="gfn-LW-3Zl" secondAttribute="top" constant="13" id="EUx-Vr-JKJ"/>
- <constraint firstItem="313" firstAttribute="leading" secondItem="gfn-LW-3Zl" secondAttribute="leading" constant="17" id="G13-rA-ECe"/>
- <constraint firstItem="312" firstAttribute="centerY" secondItem="311" secondAttribute="centerY" id="HHB-Fo-vCn"/>
- <constraint firstAttribute="trailing" secondItem="314" secondAttribute="trailing" constant="18" id="I11-8g-N92"/>
- <constraint firstItem="310" firstAttribute="centerY" secondItem="315" secondAttribute="centerY" id="J0J-Yp-kdf"/>
- <constraint firstItem="312" firstAttribute="centerY" secondItem="316" secondAttribute="centerY" id="Klv-C0-qsH"/>
- <constraint firstItem="310" firstAttribute="leading" secondItem="313" secondAttribute="leading" id="LOo-Sy-AK0"/>
- <constraint firstItem="311" firstAttribute="leading" secondItem="313" secondAttribute="trailing" constant="27" id="PSk-Ee-ahr"/>
- <constraint firstItem="313" firstAttribute="centerY" secondItem="311" secondAttribute="centerY" id="UUs-0L-ljX"/>
- <constraint firstItem="312" firstAttribute="top" secondItem="317" secondAttribute="bottom" constant="11" id="Vy2-og-cY7"/>
+ <constraint firstItem="311" firstAttribute="baseline" secondItem="313" secondAttribute="baseline" id="Bkt-w0-uVW"/>
+ <constraint firstItem="356" firstAttribute="top" secondItem="gfn-LW-3Zl" secondAttribute="top" constant="20" id="EUx-Vr-JKJ"/>
+ <constraint firstItem="umM-an-G08" firstAttribute="trailing" secondItem="310" secondAttribute="trailing" id="Eaw-bl-Nnh"/>
+ <constraint firstItem="315" firstAttribute="leading" secondItem="310" secondAttribute="trailing" constant="18" id="FbS-mM-TcU"/>
+ <constraint firstItem="umM-an-G08" firstAttribute="baseline" secondItem="2Vk-or-GKu" secondAttribute="baseline" id="GKV-ha-fuo"/>
+ <constraint firstItem="rhq-qR-z3e" firstAttribute="leading" secondItem="313" secondAttribute="leading" id="H5C-cS-6U9"/>
+ <constraint firstAttribute="trailing" secondItem="314" secondAttribute="trailing" constant="20" id="I11-8g-N92"/>
+ <constraint firstItem="QJQ-Pq-rw0" firstAttribute="top" secondItem="313" secondAttribute="bottom" constant="16" id="L2p-Fd-G1P"/>
+ <constraint firstItem="QJQ-Pq-rw0" firstAttribute="baseline" secondItem="dMz-bA-LNV" secondAttribute="baseline" id="MqH-Mk-F3a"/>
+ <constraint firstItem="315" firstAttribute="baseline" secondItem="310" secondAttribute="baseline" id="P8j-AG-lYO"/>
+ <constraint firstItem="umM-an-G08" firstAttribute="top" secondItem="QJQ-Pq-rw0" secondAttribute="bottom" constant="12" id="PQL-ok-wFc"/>
+ <constraint firstItem="313" firstAttribute="top" secondItem="310" secondAttribute="bottom" constant="16" id="R1I-q5-RH1"/>
+ <constraint firstItem="QJQ-Pq-rw0" firstAttribute="trailing" secondItem="310" secondAttribute="trailing" id="UE6-3p-Dlz"/>
<constraint firstItem="317" firstAttribute="width" secondItem="312" secondAttribute="width" id="Wkm-g7-FEr"/>
+ <constraint firstItem="QJQ-Pq-rw0" firstAttribute="leading" secondItem="313" secondAttribute="leading" id="YCm-0B-yBM"/>
<constraint firstItem="312" firstAttribute="centerY" secondItem="314" secondAttribute="centerY" id="Zro-Ez-WqJ"/>
+ <constraint firstItem="310" firstAttribute="top" secondItem="356" secondAttribute="bottom" constant="18" id="aKt-U6-vco"/>
+ <constraint firstItem="2Vk-or-GKu" firstAttribute="trailing" secondItem="311" secondAttribute="trailing" id="b1t-6Y-KqC"/>
+ <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="356" secondAttribute="trailing" constant="20" symbolic="YES" id="bsr-kP-RQI"/>
+ <constraint firstItem="310" firstAttribute="leading" secondItem="313" secondAttribute="leading" id="cxo-S5-oKo"/>
+ <constraint firstItem="umM-an-G08" firstAttribute="leading" secondItem="313" secondAttribute="leading" id="esb-xb-3di"/>
+ <constraint firstItem="315" firstAttribute="leading" secondItem="311" secondAttribute="leading" id="gQy-Ra-aPJ"/>
+ <constraint firstItem="318" firstAttribute="baseline" secondItem="315" secondAttribute="baseline" id="hRO-uj-h88"/>
<constraint firstItem="317" firstAttribute="centerY" secondItem="319" secondAttribute="centerY" id="hlN-QB-SyW"/>
- <constraint firstItem="315" firstAttribute="leading" secondItem="311" secondAttribute="leading" id="ivq-3S-Xod"/>
- <constraint firstItem="317" firstAttribute="centerY" secondItem="318" secondAttribute="centerY" id="o0w-qr-6dp"/>
+ <constraint firstItem="313" firstAttribute="trailing" secondItem="310" secondAttribute="trailing" id="iwd-jj-akX"/>
+ <constraint firstItem="dMz-bA-LNV" firstAttribute="leading" secondItem="311" secondAttribute="leading" id="jay-1O-ikI"/>
+ <constraint firstItem="PoR-21-dj4" firstAttribute="trailing" secondItem="311" secondAttribute="trailing" id="ktB-cD-aAz"/>
+ <constraint firstItem="318" firstAttribute="leading" secondItem="315" secondAttribute="trailing" constant="39" id="l4Z-U3-0ah"/>
<constraint firstItem="312" firstAttribute="leading" secondItem="316" secondAttribute="trailing" constant="7" id="qH3-sx-ytI"/>
+ <constraint firstItem="dMz-bA-LNV" firstAttribute="trailing" secondItem="311" secondAttribute="trailing" id="uof-cm-9We"/>
+ <constraint firstAttribute="bottom" secondItem="rhq-qR-z3e" secondAttribute="bottom" constant="21" id="wGX-dv-ne7"/>
<constraint firstItem="314" firstAttribute="leading" secondItem="312" secondAttribute="trailing" constant="8" id="wJP-rr-NJH"/>
+ <constraint firstItem="310" firstAttribute="leading" secondItem="356" secondAttribute="leading" id="wLk-xX-waP"/>
<constraint firstItem="356" firstAttribute="leading" secondItem="gfn-LW-3Zl" secondAttribute="leading" constant="17" id="y7X-gF-I3k"/>
<constraint firstItem="317" firstAttribute="leading" secondItem="318" secondAttribute="trailing" constant="7" id="ycC-3r-XTe"/>
</constraints>
</view>
- <constraints>
- <constraint firstAttribute="width" constant="492" id="GA5-xc-ed7"/>
- <constraint firstAttribute="height" constant="116" id="Hhe-6F-sqP"/>
- </constraints>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="360">
+ <rect key="frame" x="518" y="12" width="75" height="32"/>
+ <buttonCell key="cell" type="push" title="Apply" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="361">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="closeStreamPanel:" target="-2" id="643"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="532">
+ <rect key="frame" x="436" y="12" width="82" height="32"/>
+ <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="533">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="closeStreamPanel:" target="-2" id="642"/>
+ </connections>
+ </button>
<box title="Stream Announcing" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="337">
- <rect key="frame" x="17" y="56" width="498" height="169"/>
+ <rect key="frame" x="55" y="56" width="498" height="169"/>
<view key="contentView" id="N8c-ne-PD9">
- <rect key="frame" x="2" y="2" width="494" height="165"/>
+ <rect key="frame" x="3" y="3" width="492" height="163"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button verticalCompressionResistancePriority="749" translatesAutoresizingMaskIntoConstraints="NO" id="345">
- <rect key="frame" x="14" y="114" width="126" height="9"/>
+ <rect key="frame" x="14" y="112" width="126" height="9"/>
<buttonCell key="cell" type="check" title="SAP Announcement" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" enabled="NO" inset="2" id="346">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -1224,34 +1310,34 @@ Gw
</connections>
</button>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="344">
- <rect key="frame" x="111" y="86" width="364" height="19"/>
+ <rect key="frame" x="111" y="84" width="362" height="19"/>
<constraints>
<constraint firstAttribute="height" constant="19" id="lcG-BF-NCG"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="347">
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="342">
- <rect key="frame" x="15" y="17" width="48" height="13"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="SDP URL" usesSingleLineMode="YES" id="349">
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="342">
+ <rect key="frame" x="15" y="15" width="48" height="13"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="SDP URL" id="349">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="341">
- <rect key="frame" x="81" y="14" width="396" height="19"/>
+ <rect key="frame" x="81" y="12" width="394" height="19"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="350">
<font key="font" metaFont="smallSystem"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="358">
- <rect key="frame" x="15" y="133" width="190" height="22"/>
+ <rect key="frame" x="15" y="131" width="190" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Stream Announcement" id="359">
<font key="font" metaFont="system" size="18"/>
<color key="textColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -1259,7 +1345,7 @@ Gw
</textFieldCell>
</textField>
<matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autosizesCells="NO" translatesAutoresizingMaskIntoConstraints="NO" id="468">
- <rect key="frame" x="17" y="38" width="371" height="36"/>
+ <rect key="frame" x="17" y="36" width="371" height="36"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
<size key="cellSize" width="184" height="17"/>
<size key="intercellSpacing" width="3" height="2"/>
@@ -1306,7 +1392,7 @@ Gw
</connections>
</matrix>
<button horizontalHuggingPriority="249" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="480">
- <rect key="frame" x="388" y="37" width="88" height="16"/>
+ <rect key="frame" x="388" y="35" width="86" height="16"/>
<buttonCell key="cell" type="push" title="Browse..." bezelStyle="rounded" alignment="center" controlSize="mini" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="481">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="miniSystem"/>
@@ -1315,9 +1401,9 @@ Gw
<action selector="sdpFileLocationSelector:" target="-2" id="644"/>
</connections>
</button>
- <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="343">
- <rect key="frame" x="15" y="89" width="78" height="13"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Channel Name:" usesSingleLineMode="YES" id="348">
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="343">
+ <rect key="frame" x="15" y="87" width="78" height="13"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Channel Name:" id="348">
<font key="font" metaFont="label"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -1351,57 +1437,32 @@ Gw
<constraint firstAttribute="width" constant="492" id="EiF-2M-nAp"/>
<constraint firstAttribute="height" constant="163" id="rnv-0L-LCw"/>
</constraints>
- <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
- <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</box>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="360">
- <rect key="frame" x="443" y="12" width="75" height="32"/>
- <buttonCell key="cell" type="push" title="Apply" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="361">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- <string key="keyEquivalent" base64-UTF8="YES">
-DQ
-</string>
- </buttonCell>
- <connections>
- <action selector="closeStreamPanel:" target="-2" id="643"/>
- </connections>
- </button>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="532">
- <rect key="frame" x="361" y="12" width="82" height="32"/>
- <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="533">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- <string key="keyEquivalent" base64-UTF8="YES">
-Gw
-</string>
- </buttonCell>
- <connections>
- <action selector="closeStreamPanel:" target="-2" id="642"/>
- </connections>
- </button>
</subviews>
<constraints>
<constraint firstItem="336" firstAttribute="top" secondItem="309" secondAttribute="top" constant="21" id="56g-ml-XeM"/>
+ <constraint firstAttribute="trailing" secondItem="336" secondAttribute="trailing" constant="57" id="AVj-bM-FXL"/>
<constraint firstItem="337" firstAttribute="top" secondItem="336" secondAttribute="bottom" constant="8" id="Oza-nz-eYo"/>
- <constraint firstItem="336" firstAttribute="centerX" secondItem="309" secondAttribute="centerX" id="XqD-S3-r7W"/>
+ <constraint firstItem="532" firstAttribute="top" secondItem="337" secondAttribute="bottom" constant="20" id="Yof-gU-rq5"/>
<constraint firstAttribute="bottom" secondItem="360" secondAttribute="bottom" constant="19" id="aYb-70-cFt"/>
<constraint firstItem="360" firstAttribute="centerY" secondItem="532" secondAttribute="centerY" id="bEe-zU-mlj"/>
<constraint firstItem="337" firstAttribute="centerX" secondItem="309" secondAttribute="centerX" id="hvK-hJ-89d"/>
<constraint firstAttribute="trailing" secondItem="360" secondAttribute="trailing" constant="20" id="joz-ke-HMU"/>
+ <constraint firstItem="336" firstAttribute="leading" secondItem="309" secondAttribute="leading" constant="58" id="kAw-cq-2dQ"/>
<constraint firstItem="360" firstAttribute="leading" secondItem="532" secondAttribute="trailing" constant="12" id="zp6-3Z-1iB"/>
</constraints>
</view>
<connections>
<outlet property="initialFirstResponder" destination="311" id="386"/>
</connections>
+ <point key="canvasLocation" x="0.5" y="56"/>
</window>
<customView id="387" userLabel="File Dest">
<rect key="frame" x="0.0" y="0.0" width="531" height="72"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="47">
- <rect key="frame" x="421" y="18" width="96" height="32"/>
+ <rect key="frame" x="421" y="19" width="96" height="32"/>
<buttonCell key="cell" type="push" title="Browse..." bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="54">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -1426,9 +1487,9 @@ Gw
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="50">
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="50">
<rect key="frame" x="57" y="28" width="96" height="17"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="bla bla bla.mov" usesSingleLineMode="YES" id="51">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="bla bla bla.mov" id="51">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -1436,7 +1497,6 @@ Gw
</textField>
</subviews>
<constraints>
- <constraint firstItem="47" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="50" secondAttribute="trailing" constant="8" symbolic="YES" id="Bqx-YR-Xnr"/>
<constraint firstItem="48" firstAttribute="leading" secondItem="387" secondAttribute="leading" constant="20" id="Btn-S1-8F6"/>
<constraint firstItem="47" firstAttribute="centerY" secondItem="387" secondAttribute="centerY" id="DlY-yu-eKj"/>
<constraint firstAttribute="trailing" secondItem="47" secondAttribute="trailing" constant="20" id="QFd-Fp-EyV"/>
@@ -1444,7 +1504,6 @@ Gw
<constraint firstItem="49" firstAttribute="centerY" secondItem="48" secondAttribute="centerY" id="ckN-oZ-KCu"/>
<constraint firstItem="50" firstAttribute="leading" secondItem="48" secondAttribute="trailing" constant="7" id="fag-RQ-WLb"/>
<constraint firstItem="49" firstAttribute="leading" secondItem="48" secondAttribute="trailing" constant="7" id="oD8-n4-bYt"/>
- <constraint firstItem="47" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="49" secondAttribute="trailing" constant="8" symbolic="YES" id="oPS-Gk-Afi"/>
<constraint firstItem="48" firstAttribute="centerY" secondItem="387" secondAttribute="centerY" id="s1X-WI-lHw"/>
</constraints>
</customView>
@@ -1463,7 +1522,7 @@ Gw
</connections>
</button>
<textField horizontalHuggingPriority="249" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="300">
- <rect key="frame" x="17" y="30" width="388" height="14"/>
+ <rect key="frame" x="17" y="29" width="388" height="14"/>
<textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" title="Label" id="301">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" white="0.59999999999999998" alpha="1" colorSpace="calibratedWhite"/>
diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.h b/modules/gui/macosx/VLCConvertAndSaveWindowController.h
index 930b086946..26cf860250 100644
--- a/modules/gui/macosx/VLCConvertAndSaveWindowController.h
+++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.h
@@ -123,6 +123,12 @@
@property (weak) IBOutlet NSTextField *streamChannelLabel;
@property (weak) IBOutlet NSTextField *streamChannelField;
@property (weak) IBOutlet NSMatrix *streamSDPMatrix;
+ at property (weak) IBOutlet NSTextField *streamMountPointLabel;
+ at property (weak) IBOutlet NSTextField *streamMountPointField;
+ at property (weak) IBOutlet NSTextField *streamUsernameLabel;
+ at property (weak) IBOutlet NSTextField *streamUsernameField;
+ at property (weak) IBOutlet NSTextField *streamPasswordLabel;
+ at property (weak) IBOutlet NSTextField *streamPasswordField;
@property (weak) IBOutlet NSButton *streamSDPFileBrowseButton;
@property (weak) IBOutlet NSTextField *streamSDPLabel;
@property (weak) IBOutlet NSTextField *streamSDPField;
diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.m b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
index 454909a753..b66ae7e613 100644
--- a/modules/gui/macosx/VLCConvertAndSaveWindowController.m
+++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
@@ -533,7 +533,7 @@ - (IBAction)closeStreamPanel:(id)sender
return;
/* provide a summary of the user selections */
- NSMutableString * labelContent = [[NSMutableString alloc] initWithFormat:_NS("%@ stream to %@:%@"), [_streamTypePopup titleOfSelectedItem], [_streamAddressField stringValue], [_streamPortField stringValue]];
+ NSMutableString * labelContent = [[NSMutableString alloc] initWithFormat:_NS("%@ stream to %@:%@"), [_streamTypePopup titleOfSelectedItem], [_streamAddressField stringValue] ];
if ([_streamTypePopup indexOfSelectedItem] > 1)
[labelContent appendFormat:@" (\"%@\")", [_streamChannelField stringValue]];
@@ -579,7 +579,10 @@ - (IBAction)closeStreamPanel:(id)sender
- (IBAction)streamTypeToggle:(id)sender
{
NSUInteger index = [_streamTypePopup indexOfSelectedItem];
- if (index <= 1) { // HTTP, MMSH
+ [_streamMountPointField setEnabled:NO];
+ [_streamUsernameField setEnabled:NO];
+ [_streamPasswordField setEnabled:NO];
+ if (index <= 1) { // HTTP , MMSH
[_streamTTLField setEnabled:NO];
[_streamTTLStepper setEnabled:NO];
[_streamSAPCheckbox setEnabled:NO];
@@ -589,11 +592,20 @@ - (IBAction)streamTypeToggle:(id)sender
[_streamTTLStepper setEnabled:YES];
[_streamSAPCheckbox setEnabled:YES];
[_streamSDPMatrix setEnabled:YES];
- } else { // UDP
+ }else if(index == 3) { // UDP
[_streamTTLField setEnabled:YES];
[_streamTTLStepper setEnabled:YES];
[_streamSAPCheckbox setEnabled:YES];
[_streamSDPMatrix setEnabled:NO];
+ }else { //Icecast
+ [_streamTTLField setEnabled:NO];
+ [_streamTTLStepper setEnabled:NO];
+ [_streamSAPCheckbox setEnabled:NO];
+ [_streamSDPMatrix setEnabled:NO];
+ [_streamMountPointField setEnabled:YES];
+ [_streamUsernameField setEnabled:YES];
+ [_streamPasswordField setEnabled:YES];
+
}
[self streamAnnouncementToggle:sender];
}
@@ -954,9 +966,6 @@ - (NSString *)composedOptions
[composedOptions appendFormat:@",soverlay"];
}
- // Close transcode
- [composedOptions appendString:@"}"];
-
if (!b_streaming) {
/* file transcoding */
// add muxer
@@ -968,17 +977,18 @@ - (NSString *)composedOptions
withString:@"\\\""];
[composedOptions appendFormat:@",access=file{no-overwrite},dst=\"%@\"}", _outputDestination];
} else {
- NSString *destination = [NSString stringWithFormat:@"\"%@:%@\"", _outputDestination, [_streamPortField stringValue]];
-
+ [composedOptions appendString:@"}"];
/* streaming */
if ([[[_streamTypePopup selectedItem] title] isEqualToString:@"RTP"])
[composedOptions appendFormat:@":rtp{mux=ts,dst=%@,port=%@", _outputDestination, [_streamPortField stringValue]];
else if ([[[_streamTypePopup selectedItem] title] isEqualToString:@"UDP"])
- [composedOptions appendFormat:@":standard{mux=ts,dst=%@,access=udp", destination];
+ [composedOptions appendFormat:@":standard{mux=ts,dst=%@,port=%@,access=udp", _outputDestination, [_streamPortField stringValue]];
+ else if ([[[_streamTypePopup selectedItem] title] isEqualToString:@"Icecast"])
+ [composedOptions appendFormat:@":standard{mux=ogg,dst=%@:%@@%@,access=shout", [_streamUsernameField stringValue], [_streamPasswordField stringValue], _outputDestination];
else if ([[[_streamTypePopup selectedItem] title] isEqualToString:@"MMSH"])
- [composedOptions appendFormat:@":standard{mux=asfh,dst=%@,access=mmsh", destination];
+ [composedOptions appendFormat:@":standard{mux=asfh,dst=%@,access=mmsh", _outputDestination];
else
- [composedOptions appendFormat:@":standard{mux=%@,dst=%@,access=http", [self.currentProfile firstObject], destination];
+ [composedOptions appendFormat:@":standard{mux=%@,dst=%@,access=http", [self.currentProfile firstObject], _outputDestination];
if ([_streamSAPCheckbox state])
[composedOptions appendFormat:@",sap,name=\"%@\"", [_streamChannelField stringValue]];
--
2.17.1 (Apple Git-112)
More information about the vlc-devel
mailing list