Skip to content

V
vlc-2-2
Commit 309906f6 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx/CAS: rework misleading SDP UI

parent 6912d838
Hide whitespace changes
Inline Side-by-side
Showing with 225 additions and 230 deletions
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
View file @ 309906f6
......@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">11G45</string>
<string key="IBDocument.SystemVersion">11G63</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1138.51</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
......@@ -12,9 +12,9 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="131"/>
<integer value="2"/>
<integer value="308"/>
<integer value="132"/>
<integer value="468"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -2024,7 +2024,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSWindowTemplate" id="939593274">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{131, 73}, {532, 355}}</string>
<string key="NSWindowRect">{{131, 60}, {532, 368}}</string>
<int key="NSWTFlags">1685586944</int>
<string key="NSWindowTitle">Stream Panel</string>
<string key="NSWindowClass">NSWindow</string>
......@@ -2307,7 +2307,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="NSReuseIdentifierKey">_NS:21</string>
</object>
</object>
<string key="NSFrame">{{17, 214}, {498, 122}}</string>
<string key="NSFrame">{{17, 227}, {498, 122}}</string>
<reference key="NSSuperview" ref="575278109"/>
<string key="NSReuseIdentifierKey">_NS:18</string>
<string key="NSOffsets">{0, 0}</string>
......@@ -2341,13 +2341,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="706187556">
<reference key="NSNextResponder" ref="773564715"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{14, 83}, {221, 16}}</string>
<string key="NSFrame">{{12, 105}, {221, 18}}</string>
<reference key="NSSuperview" ref="773564715"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="423585958">
<int key="NSCellFlags">603979776</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">SAP Announce</string>
<string key="NSContents">SAP Announcement</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="706187556"/>
<int key="NSButtonFlags">1211912448</int>
......@@ -2362,7 +2362,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="683214308">
<reference key="NSNextResponder" ref="773564715"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{132, 40}, {345, 19}}</string>
<string key="NSFrame">{{130, 80}, {345, 19}}</string>
<reference key="NSSuperview" ref="773564715"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="313191672">
......@@ -2379,7 +2379,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="379188040">
<reference key="NSNextResponder" ref="773564715"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{14, 42}, {100, 13}}</string>
<string key="NSFrame">{{12, 82}, {100, 13}}</string>
<reference key="NSSuperview" ref="773564715"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1058358408">
......@@ -2429,91 +2429,125 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSTextColor" ref="361839307"/>
</object>
</object>
<object class="NSButton" id="147954501">
<object class="NSTextField" id="190503833">
<reference key="NSNextResponder" ref="773564715"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{14, 65}, {227, 16}}</string>
<int key="NSvFlags">303</int>
<string key="NSFrame">{{15, 133}, {465, 22}}</string>
<reference key="NSSuperview" ref="773564715"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="533441225">
<int key="NSCellFlags">603979776</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">RTSP Announce</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="147954501"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="839745435"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
<object class="NSTextFieldCell" key="NSCell" id="332915798">
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">4195328</int>
<string key="NSContents">Stream Announcement</string>
<reference key="NSSupport" ref="439159890"/>
<reference key="NSControlView" ref="190503833"/>
<reference key="NSBackgroundColor" ref="382902660"/>
<reference key="NSTextColor" ref="954313256"/>
</object>
</object>
<object class="NSButton" id="185939211">
<object class="NSMatrix" id="908375870">
<reference key="NSNextResponder" ref="773564715"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{244, 83}, {227, 16}}</string>
<string key="NSFrame">{{15, 36}, {465, 36}}</string>
<reference key="NSSuperview" ref="773564715"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="541046006">
<int key="NSCellFlags">603979776</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">HTTP Announce</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="185939211"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="839745435"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
<int key="NSNumRows">2</int>
<int key="NSNumCols">2</int>
<object class="NSMutableArray" key="NSCells">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSButtonCell" id="352336737">
<int key="NSCellFlags">-1543503872</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">None</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="908375870"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage" id="172792332">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSRadioButton</string>
</object>
<reference key="NSAlternateImage" ref="656815839"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<object class="NSButtonCell" id="541046006">
<int key="NSCellFlags">603979776</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">HTTP Announcement</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="908375870"/>
<int key="NSTag">1</int>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="172792332"/>
<reference key="NSAlternateImage" ref="656815839"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<object class="NSButtonCell" id="533441225">
<int key="NSCellFlags">603979776</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">RTSP Announcement</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="908375870"/>
<int key="NSTag">2</int>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="172792332"/>
<reference key="NSAlternateImage" ref="656815839"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<object class="NSButtonCell" id="93983585">
<int key="NSCellFlags">603979776</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">Export SDP as file</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="908375870"/>
<int key="NSTag">3</int>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="172792332"/>
<reference key="NSAlternateImage" ref="656815839"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
</object>
<object class="NSButton" id="882741680">
<reference key="NSNextResponder" ref="773564715"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{244, 65}, {227, 16}}</string>
<reference key="NSSuperview" ref="773564715"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="93983585">
<int key="NSCellFlags">603979776</int>
<string key="NSCellSize">{231, 17}</string>
<string key="NSIntercellSpacing">{3, 2}</string>
<int key="NSMatrixFlags">1140858880</int>
<nil key="NSCellClass"/>
<object class="NSButtonCell" key="NSProtoCell" id="776821974">
<int key="NSCellFlags">-1543373312</int>
<int key="NSCellFlags2">131072</int>
<string key="NSContents">Export SDP as file</string>
<string key="NSContents">None</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="882741680"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="839745435"/>
<reference key="NSAlternateImage" ref="656815839"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSTextField" id="190503833">
<reference key="NSNextResponder" ref="773564715"/>
<int key="NSvFlags">303</int>
<string key="NSFrame">{{15, 120}, {465, 22}}</string>
<reference key="NSSuperview" ref="773564715"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="332915798">
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">4195328</int>
<string key="NSContents">Stream Announcement</string>
<reference key="NSSupport" ref="439159890"/>
<reference key="NSControlView" ref="190503833"/>
<reference key="NSBackgroundColor" ref="382902660"/>
<reference key="NSTextColor" ref="954313256"/>
</object>
<reference key="NSSelectedCell" ref="352336737"/>
<reference key="NSBackgroundColor" ref="382902660"/>
<reference key="NSCellBackgroundColor" ref="382902660"/>
</object>
</object>
<string key="NSFrame">{{2, 2}, {494, 152}}</string>
<string key="NSFrame">{{2, 2}, {494, 165}}</string>
<reference key="NSSuperview" ref="696647107"/>
</object>
</object>
<string key="NSFrame">{{17, 56}, {498, 156}}</string>
<string key="NSFrame">{{17, 56}, {498, 169}}</string>
<reference key="NSSuperview" ref="575278109"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
......@@ -2556,7 +2590,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
</object>
<string key="NSFrameSize">{532, 355}</string>
<string key="NSFrameSize">{532, 368}</string>
<reference key="NSSuperview"/>
<string key="NSReuseIdentifierKey">_NS:122</string>
</object>
......@@ -3248,14 +3282,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">371</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_stream_http_ckb</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="185939211"/>
</object>
<int key="connectionID">372</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_stream_port_fld</string>
......@@ -3272,14 +3298,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">374</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_stream_rtsp_ckb</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="147954501"/>
</object>
<int key="connectionID">375</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_stream_sap_ckb</string>
......@@ -3288,14 +3306,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">376</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_stream_sdp_ckb</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="882741680"/>
</object>
<int key="connectionID">377</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_stream_sdp_fld</string>
......@@ -3466,59 +3476,83 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">streamAnnouncementToggle:</string>
<string key="label">finalizePanel:</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="185939211"/>
<reference key="destination" ref="210468830"/>
</object>
<int key="connectionID">410</int>
<int key="connectionID">413</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_stream_ttl_stepper</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="681462793"/>
</object>
<int key="connectionID">417</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_customize_newProfile_btn</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="236566072"/>
</object>
<int key="connectionID">452</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">newProfileAction:</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="236566072"/>
</object>
<int key="connectionID">459</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">streamAnnouncementToggle:</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="882741680"/>
<reference key="destination" ref="533441225"/>
</object>
<int key="connectionID">411</int>
<int key="connectionID">474</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">streamAnnouncementToggle:</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="147954501"/>
<reference key="destination" ref="93983585"/>
</object>
<int key="connectionID">412</int>
<int key="connectionID">475</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">finalizePanel:</string>
<string key="label">streamAnnouncementToggle:</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="210468830"/>
<reference key="destination" ref="352336737"/>
</object>
<int key="connectionID">413</int>
<int key="connectionID">476</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_stream_ttl_stepper</string>
<object class="IBActionConnection" key="connection">
<string key="label">streamAnnouncementToggle:</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="681462793"/>
<reference key="destination" ref="541046006"/>
</object>
<int key="connectionID">417</int>
<int key="connectionID">477</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_customize_newProfile_btn</string>
<string key="label">_stream_sdp_matrix</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="236566072"/>
<reference key="destination" ref="908375870"/>
</object>
<int key="connectionID">452</int>
<int key="connectionID">478</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">newProfileAction:</string>
<string key="label">streamAnnouncementToggle:</string>
<reference key="source" ref="203744709"/>
<reference key="destination" ref="236566072"/>
<reference key="destination" ref="908375870"/>
</object>
<int key="connectionID">459</int>
<int key="connectionID">479</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
......@@ -4910,43 +4944,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="190503833"/>
<reference ref="706187556"/>
<reference ref="147954501"/>
<reference ref="683214308"/>
<reference ref="379188040"/>
<reference ref="757714396"/>
<reference ref="216857188"/>
<reference ref="185939211"/>
<reference ref="882741680"/>
<reference ref="908375870"/>
</object>
<reference key="parent" ref="575278109"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">338</int>
<reference key="object" ref="882741680"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="93983585"/>
</object>
<reference key="parent" ref="696647107"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">339</int>
<reference key="object" ref="185939211"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="541046006"/>
</object>
<reference key="parent" ref="696647107"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">340</int>
<reference key="object" ref="147954501"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="533441225"/>
</object>
<reference key="parent" ref="696647107"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">341</int>
<reference key="object" ref="216857188"/>
......@@ -5017,21 +5022,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="976724265"/>
<reference key="parent" ref="216857188"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">351</int>
<reference key="object" ref="533441225"/>
<reference key="parent" ref="147954501"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">352</int>
<reference key="object" ref="541046006"/>
<reference key="parent" ref="185939211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">353</int>
<reference key="object" ref="93983585"/>
<reference key="parent" ref="882741680"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">356</int>
<reference key="object" ref="755919972"/>
......@@ -5224,6 +5214,44 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="301930122"/>
<reference key="parent" ref="277074074"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">468</int>
<reference key="object" ref="908375870"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="776821974"/>
<reference ref="533441225"/>
<reference ref="93983585"/>
<reference ref="352336737"/>
<reference ref="541046006"/>
</object>
<reference key="parent" ref="696647107"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">473</int>
<reference key="object" ref="776821974"/>
<reference key="parent" ref="908375870"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">351</int>
<reference key="object" ref="533441225"/>
<reference key="parent" ref="908375870"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">353</int>
<reference key="object" ref="93983585"/>
<reference key="parent" ref="908375870"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">465</int>
<reference key="object" ref="352336737"/>
<reference key="parent" ref="908375870"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">352</int>
<reference key="object" ref="541046006"/>
<reference key="parent" ref="908375870"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
......@@ -5486,12 +5514,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>336.IBViewBoundsToFrameTransform</string>
<string>337.IBPluginDependency</string>
<string>337.IBViewBoundsToFrameTransform</string>
<string>338.IBPluginDependency</string>
<string>338.IBViewBoundsToFrameTransform</string>
<string>339.IBPluginDependency</string>
<string>339.IBViewBoundsToFrameTransform</string>
<string>340.IBPluginDependency</string>
<string>340.IBViewBoundsToFrameTransform</string>
<string>341.IBPluginDependency</string>
<string>341.IBViewBoundsToFrameTransform</string>
<string>342.IBPluginDependency</string>
......@@ -5540,6 +5562,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>404.IBPluginDependency</string>
<string>404.IBViewBoundsToFrameTransform</string>
<string>405.IBPluginDependency</string>
<string>465.IBPluginDependency</string>
<string>468.IBViewBoundsToFrameTransform</string>
<string>47.IBPluginDependency</string>
<string>47.IBViewBoundsToFrameTransform</string>
<string>48.IBPluginDependency</string>
......@@ -5868,9 +5892,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDyIAAwkQAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{366, 101}, {532, 355}}</string>
<string>{{422, 272}, {532, 368}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{366, 101}, {532, 355}}</string>
<string>{{422, 272}, {532, 368}}</string>
<boolean value="NO"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -5943,35 +5967,23 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDbgAAwvYAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDAwAAwigAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDbgAAww0AAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABBUAAAwhgAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwrIAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABBQAAAwxwAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDCgAAwiAAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDAgAAwyAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwhAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBoAAAwnwAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDCgAAwoYAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwtYAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABBiAAAwzYAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -5998,7 +6010,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABD0wAAwzMAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABD0wAAwigAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{359, 563}, {531, 72}}</string>
......@@ -6028,6 +6040,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwowAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABD3QAAwsoAAA</bytes>
</object>
......@@ -6077,7 +6093,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">463</int>
<int key="maxID">479</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
......@@ -6284,15 +6300,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>_stream_announcement_lbl</string>
<string>_stream_channel_fld</string>
<string>_stream_destination_lbl</string>
<string>_stream_http_ckb</string>
<string>_stream_ok_btn</string>
<string>_stream_panel</string>
<string>_stream_port_fld</string>
<string>_stream_port_lbl</string>
<string>_stream_rtsp_ckb</string>
<string>_stream_sap_ckb</string>
<string>_stream_sdp_ckb</string>
<string>_stream_sdp_fld</string>
<string>_stream_sdp_matrix</string>
<string>_stream_ttl_fld</string>
<string>_stream_ttl_lbl</string>
<string>_stream_ttl_stepper</string>
......@@ -6379,8 +6393,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
......@@ -6451,15 +6463,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>_stream_announcement_lbl</string>
<string>_stream_channel_fld</string>
<string>_stream_destination_lbl</string>
<string>_stream_http_ckb</string>
<string>_stream_ok_btn</string>
<string>_stream_panel</string>
<string>_stream_port_fld</string>
<string>_stream_port_lbl</string>
<string>_stream_rtsp_ckb</string>
<string>_stream_sap_ckb</string>
<string>_stream_sdp_ckb</string>
<string>_stream_sdp_fld</string>
<string>_stream_sdp_matrix</string>
<string>_stream_ttl_fld</string>
<string>_stream_ttl_lbl</string>
<string>_stream_ttl_stepper</string>
......@@ -6725,10 +6735,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">_stream_destination_lbl</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">_stream_http_ckb</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">_stream_ok_btn</string>
<string key="candidateClassName">id</string>
......@@ -6745,20 +6751,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">_stream_port_lbl</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">_stream_rtsp_ckb</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">_stream_sap_ckb</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">_stream_sdp_ckb</string>
<string key="name">_stream_sdp_fld</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">_stream_sdp_fld</string>
<string key="name">_stream_sdp_matrix</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
......@@ -6824,6 +6826,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSMenuCheckmark</string>
<string>NSMenuMixedState</string>
<string>NSRadioButton</string>
<string>NSSwitch</string>
<string>dropzone</string>
<string>generic</string>
......@@ -6832,6 +6835,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{11, 11}</string>
<string>{10, 3}</string>
<string>{16, 15}</string>
<string>{15, 15}</string>
<string>{128, 128}</string>
<string>{128, 128}</string>
......
modules/gui/macosx/ConvertAndSave.h
View file @ 309906f6
......@@ -106,10 +106,8 @@
IBOutlet id _stream_port_lbl;
IBOutlet id _stream_port_fld;
IBOutlet id _stream_sap_ckb;
IBOutlet id _stream_http_ckb;
IBOutlet id _stream_rtsp_ckb;
IBOutlet id _stream_sdp_ckb;
IBOutlet id _stream_channel_fld;
IBOutlet id _stream_sdp_matrix;
IBOutlet id _stream_sdp_fld;
NSString * _MRL;
......
modules/gui/macosx/ConvertAndSave.m
View file @ 309906f6
......@@ -197,13 +197,12 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[_stream_ttl_stepper setEnabled:NO];
[_stream_port_lbl setStringValue:_NS("Port")];
[_stream_sap_ckb setStringValue:_NS("SAP Announcement")];
[_stream_http_ckb setStringValue:_NS("HTTP Announcement")];
[_stream_rtsp_ckb setStringValue:_NS("RTSP Announcement")];
[_stream_sdp_ckb setStringValue:_NS("Export SDP as file")];
[[_stream_sdp_matrix cellWithTag:0] setTitle:_NS("None")];
[[_stream_sdp_matrix cellWithTag:1] setTitle:_NS("HTTP Announcement")];
[[_stream_sdp_matrix cellWithTag:2] setTitle:_NS("RTSP Announcement")];
[[_stream_sdp_matrix cellWithTag:3] setTitle:_NS("Export SDP as file")];
[_stream_sap_ckb setState:NSOffState];
[_stream_http_ckb setState:NSOffState];
[_stream_rtsp_ckb setState:NSOffState];
[_stream_sdp_ckb setState:NSOffState];
[_stream_sdp_matrix setEnabled:NO];
/* there is no way to hide single cells, so replace the existing ones with empty cells.. */
id blankCell = [[[NSCell alloc] init] autorelease];
......@@ -453,14 +452,14 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[labelContent release];
/* catch obvious errors */
if (([_stream_http_ckb state] || [_stream_rtsp_ckb state] || [_stream_sap_ckb state]) && ![[_stream_channel_fld stringValue] length] > 0) {
if ([_stream_sap_ckb state] && ![[_stream_channel_fld stringValue] length] > 0) {
NSBeginInformationalAlertSheet(_NS("No Channel Name given"),
_NS("OK"), @"", @"", _stream_panel, nil, nil, nil, nil,
@"%@", _NS("A stream announcement option is enabled. However, no channel name is provided."));
@"%@", _NS("SAP stream announcement is enabled. However, no channel name is provided."));
return;
}
if ([_stream_sdp_ckb state] && ![[_stream_sdp_fld stringValue] length] > 0) {
if ([_stream_sdp_matrix isEnabled] && [_stream_sdp_matrix selectedCell] != [_stream_sdp_matrix cellWithTag:0] && ![[_stream_sdp_fld stringValue] length] > 0) {
NSBeginInformationalAlertSheet(_NS("No SDP URL given"),
_NS("OK"), @"", @"", _stream_panel, nil, nil, nil, nil,
@"%@", _NS("A SDP export is requested, but no URL is provided."));
......@@ -482,31 +481,25 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[_stream_ttl_fld setEnabled:NO];
[_stream_ttl_stepper setEnabled:NO];
[_stream_sap_ckb setEnabled:NO];
[_stream_rtsp_ckb setEnabled:NO];
[_stream_http_ckb setEnabled:NO];
[_stream_sdp_ckb setEnabled:NO];
[_stream_sdp_matrix setEnabled:NO];
} else if (index == 2) { // RTP
[_stream_ttl_fld setEnabled:YES];
[_stream_ttl_stepper setEnabled:YES];
[_stream_sap_ckb setEnabled:YES];
[_stream_rtsp_ckb setEnabled:YES];
[_stream_http_ckb setEnabled:YES];
[_stream_sdp_ckb setEnabled:YES];
[_stream_sdp_matrix setEnabled:YES];
} else { // UDP
[_stream_ttl_fld setEnabled:YES];
[_stream_ttl_stepper setEnabled:YES];
[_stream_sap_ckb setEnabled:YES];
[_stream_rtsp_ckb setEnabled:NO];
[_stream_http_ckb setEnabled:NO];
[_stream_sdp_ckb setEnabled:NO];
[_stream_sdp_matrix setEnabled:NO];
}
[self streamAnnouncementToggle:sender];
}
- (IBAction)streamAnnouncementToggle:(id)sender
{
[_stream_channel_fld setEnabled:([_stream_http_ckb state] || [_stream_rtsp_ckb state] || [_stream_sap_ckb state]) && ([_stream_http_ckb isEnabled] || [_stream_rtsp_ckb isEnabled] || [_stream_sap_ckb isEnabled])];
[_stream_sdp_fld setEnabled:[_stream_sdp_ckb state]];
[_stream_channel_fld setEnabled:[_stream_sap_ckb state] && [_stream_sap_ckb isEnabled]];
[_stream_sdp_fld setEnabled:[_stream_sdp_matrix isEnabled] && ([_stream_sdp_matrix selectedCell] != [_stream_sdp_matrix cellWithTag:0])];
}
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
......@@ -889,7 +882,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
if ([_stream_sap_ckb state])
[composedOptions appendFormat:@",sap,name=\"%@\"", [_stream_channel_fld stringValue]];
if ([_stream_sdp_ckb state])
if ([_stream_sdp_matrix selectedCell] != [_stream_sdp_matrix cellWithTag:0]) //FIXME
[composedOptions appendFormat:@",sdp=%@", [_stream_sdp_fld stringValue]];
[composedOptions appendString:@"} :sout-keep"];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment