Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
7759c84b
Commit
7759c84b
authored
Jul 28, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: CAS: implemented UI logic for the stream-out sheet
parent
412b2d72
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
114 additions
and
84 deletions
+114
-84
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
...package/macosx/Resources/English.lproj/ConvertAndSave.xib
+70
-81
modules/gui/macosx/ConvertAndSave.h
modules/gui/macosx/ConvertAndSave.h
+4
-1
modules/gui/macosx/ConvertAndSave.m
modules/gui/macosx/ConvertAndSave.m
+40
-2
No files found.
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib
View file @
7759c84b
This diff is collapsed.
Click to expand it.
modules/gui/macosx/ConvertAndSave.h
View file @
7759c84b
...
@@ -93,7 +93,6 @@
...
@@ -93,7 +93,6 @@
IBOutlet
id
_stream_panel
;
IBOutlet
id
_stream_panel
;
IBOutlet
id
_stream_ok_btn
;
IBOutlet
id
_stream_ok_btn
;
IBOutlet
id
_stream_cancel_btn
;
IBOutlet
id
_stream_destination_lbl
;
IBOutlet
id
_stream_destination_lbl
;
IBOutlet
id
_stream_announcement_lbl
;
IBOutlet
id
_stream_announcement_lbl
;
IBOutlet
id
_stream_type_lbl
;
IBOutlet
id
_stream_type_lbl
;
...
@@ -119,6 +118,8 @@
...
@@ -119,6 +118,8 @@
NSArray
*
_audioCodecs
;
NSArray
*
_audioCodecs
;
NSArray
*
_subsCodecs
;
NSArray
*
_subsCodecs
;
NSMutableArray
*
_currentProfile
;
NSMutableArray
*
_currentProfile
;
BOOL
b_streaming
;
}
}
@property
(
readwrite
,
nonatomic
,
retain
)
NSString
*
MRL
;
@property
(
readwrite
,
nonatomic
,
retain
)
NSString
*
MRL
;
@property
(
readwrite
,
nonatomic
,
retain
)
NSString
*
outputDestination
;
@property
(
readwrite
,
nonatomic
,
retain
)
NSString
*
outputDestination
;
...
@@ -141,6 +142,8 @@
...
@@ -141,6 +142,8 @@
-
(
IBAction
)
browseFileDestination
:(
id
)
sender
;
-
(
IBAction
)
browseFileDestination
:(
id
)
sender
;
-
(
IBAction
)
showStreamPanel
:(
id
)
sender
;
-
(
IBAction
)
showStreamPanel
:(
id
)
sender
;
-
(
IBAction
)
closeStreamPanel
:(
id
)
sender
;
-
(
IBAction
)
closeStreamPanel
:(
id
)
sender
;
-
(
IBAction
)
streamTypeToggle
:(
id
)
sender
;
-
(
IBAction
)
streamAnnouncementToggle
:(
id
)
sender
;
-
(
void
)
updateDropView
;
-
(
void
)
updateDropView
;
...
...
modules/gui/macosx/ConvertAndSave.m
View file @
7759c84b
...
@@ -174,8 +174,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
...
@@ -174,8 +174,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[
_customize_aud_samplerate_lbl
setStringValue
:
_NS
(
"Sample Rate"
)];
[
_customize_aud_samplerate_lbl
setStringValue
:
_NS
(
"Sample Rate"
)];
[
_customize_subs_ckb
setTitle
:
_NS
(
"Subtitles"
)];
[
_customize_subs_ckb
setTitle
:
_NS
(
"Subtitles"
)];
[
_customize_subs_overlay_ckb
setTitle
:
_NS
(
"Overlay subtitles on the video"
)];
[
_customize_subs_overlay_ckb
setTitle
:
_NS
(
"Overlay subtitles on the video"
)];
[
_stream_ok_btn
setTitle
:
_NS
(
"Set"
)];
[
_stream_ok_btn
setTitle
:
_NS
(
"Close"
)];
[
_stream_cancel_btn
setTitle
:
_NS
(
"Cancel"
)];
[
_stream_destination_lbl
setStringValue
:
_NS
(
"Stream Destination"
)];
[
_stream_destination_lbl
setStringValue
:
_NS
(
"Stream Destination"
)];
[
_stream_announcement_lbl
setStringValue
:
_NS
(
"Stream Announcement"
)];
[
_stream_announcement_lbl
setStringValue
:
_NS
(
"Stream Announcement"
)];
[
_stream_type_lbl
setStringValue
:
_NS
(
"Type"
)];
[
_stream_type_lbl
setStringValue
:
_NS
(
"Type"
)];
...
@@ -186,6 +185,10 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
...
@@ -186,6 +185,10 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[
_stream_http_ckb
setStringValue
:
_NS
(
"HTTP Announcement"
)];
[
_stream_http_ckb
setStringValue
:
_NS
(
"HTTP Announcement"
)];
[
_stream_rtsp_ckb
setStringValue
:
_NS
(
"RTSP Announcement"
)];
[
_stream_rtsp_ckb
setStringValue
:
_NS
(
"RTSP Announcement"
)];
[
_stream_sdp_ckb
setStringValue
:
_NS
(
"Export SDP as file"
)];
[
_stream_sdp_ckb
setStringValue
:
_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
];
/* there is no way to hide single cells, so replace the existing ones with empty cells.. */
/* there is no way to hide single cells, so replace the existing ones with empty cells.. */
id
blankCell
=
[[[
NSCell
alloc
]
init
]
autorelease
];
id
blankCell
=
[[[
NSCell
alloc
]
init
]
autorelease
];
...
@@ -375,6 +378,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
...
@@ -375,6 +378,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[[
_destination_itwantastream_btn
animator
]
setHidden
:
YES
];
[[
_destination_itwantastream_btn
animator
]
setHidden
:
YES
];
[
_destination_box
performSelector
:
@selector
(
addSubview
:)
withObject
:
_destination_itwantafile_view
afterDelay
:
0
.
2
];
[
_destination_box
performSelector
:
@selector
(
addSubview
:)
withObject
:
_destination_itwantafile_view
afterDelay
:
0
.
2
];
[[
_destination_cancel_btn
animator
]
setHidden
:
NO
];
[[
_destination_cancel_btn
animator
]
setHidden
:
NO
];
b_streaming
=
NO
;
}
}
-
(
IBAction
)
iWantAStream
:(
id
)
sender
-
(
IBAction
)
iWantAStream
:(
id
)
sender
...
@@ -388,6 +392,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
...
@@ -388,6 +392,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[[
_destination_itwantastream_btn
animator
]
setHidden
:
YES
];
[[
_destination_itwantastream_btn
animator
]
setHidden
:
YES
];
[
_destination_box
performSelector
:
@selector
(
addSubview
:)
withObject
:
_destination_itwantastream_view
afterDelay
:
0
.
2
];
[
_destination_box
performSelector
:
@selector
(
addSubview
:)
withObject
:
_destination_itwantastream_view
afterDelay
:
0
.
2
];
[[
_destination_cancel_btn
animator
]
setHidden
:
NO
];
[[
_destination_cancel_btn
animator
]
setHidden
:
NO
];
b_streaming
=
NO
;
}
}
-
(
IBAction
)
cancelDestination
:(
id
)
sender
-
(
IBAction
)
cancelDestination
:(
id
)
sender
...
@@ -400,6 +405,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
...
@@ -400,6 +405,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[
_destination_cancel_btn
setHidden
:
YES
];
[
_destination_cancel_btn
setHidden
:
YES
];
[[
_destination_itwantafile_btn
animator
]
setHidden
:
NO
];
[[
_destination_itwantafile_btn
animator
]
setHidden
:
NO
];
[[
_destination_itwantastream_btn
animator
]
setHidden
:
NO
];
[[
_destination_itwantastream_btn
animator
]
setHidden
:
NO
];
b_streaming
=
NO
;
}
}
-
(
IBAction
)
browseFileDestination
:(
id
)
sender
-
(
IBAction
)
browseFileDestination
:(
id
)
sender
...
@@ -438,6 +444,38 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
...
@@ -438,6 +444,38 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[
NSApp
endSheet
:
_stream_panel
];
[
NSApp
endSheet
:
_stream_panel
];
}
}
-
(
IBAction
)
streamTypeToggle
:(
id
)
sender
{
NSUInteger
index
=
[
_stream_type_pop
indexOfSelectedItem
];
if
(
index
<=
1
)
{
// HTTP, MMSH
[
_stream_ttl_fld
setEnabled
:
NO
];
[
_stream_sap_ckb
setEnabled
:
NO
];
[
_stream_rtsp_ckb
setEnabled
:
NO
];
[
_stream_http_ckb
setEnabled
:
NO
];
[
_stream_sdp_ckb
setEnabled
:
NO
];
}
else
if
(
index
==
2
)
{
// RTP
[
_stream_ttl_fld
setEnabled
:
YES
];
[
_stream_sap_ckb
setEnabled
:
YES
];
[
_stream_rtsp_ckb
setEnabled
:
YES
];
[
_stream_http_ckb
setEnabled
:
YES
];
[
_stream_sdp_ckb
setEnabled
:
YES
];
[
_stream_channel_fld
setEnabled
:
YES
];
[
_stream_sdp_fld
setEnabled
:[
_stream_sdp_ckb
state
]];
}
else
{
// UDP
[
_stream_ttl_fld
setEnabled
:
YES
];
[
_stream_sap_ckb
setEnabled
:
YES
];
[
_stream_rtsp_ckb
setEnabled
:
NO
];
[
_stream_http_ckb
setEnabled
:
NO
];
[
_stream_sdp_ckb
setEnabled
:
NO
];
[
_stream_channel_fld
setEnabled
:
YES
];
}
}
-
(
IBAction
)
streamAnnouncementToggle
:(
id
)
sender
{
[
_stream_sdp_fld
setEnabled
:[
_stream_sdp_ckb
state
]];
}
-
(
BOOL
)
performDragOperation
:(
id
<
NSDraggingInfo
>
)
sender
-
(
BOOL
)
performDragOperation
:(
id
<
NSDraggingInfo
>
)
sender
{
{
NSPasteboard
*
paste
=
[
sender
draggingPasteboard
];
NSPasteboard
*
paste
=
[
sender
draggingPasteboard
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment