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
514be08c
Commit
514be08c
authored
Dec 28, 2012
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx/CAS: added final error checks (close #5900)
parent
0dea876e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
1 deletion
+19
-1
modules/gui/macosx/ConvertAndSave.m
modules/gui/macosx/ConvertAndSave.m
+19
-1
No files found.
modules/gui/macosx/ConvertAndSave.m
View file @
514be08c
...
...
@@ -273,7 +273,18 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
-
(
IBAction
)
finalizePanel
:(
id
)
sender
{
// HTTP, TODO: mux checking, since only MPEG PS, MPEG TS, MPEG 1, OGG, RAW and ASF are allowed
if
(
b_streaming
)
{
if
([[[
_stream_type_pop
selectedItem
]
title
]
isEqualToString
:
@"HTTP"
])
{
NSString
*
muxformat
=
[
self
.
currentProfile
objectAtIndex
:
0
];
if
([
muxformat
isEqualToString
:
@"wav"
]
||
[
muxformat
isEqualToString
:
@"mov"
]
||
[
muxformat
isEqualToString
:
@"mp4"
])
{
NSBeginInformationalAlertSheet
(
_NS
(
"Invalid container format for HTTP streaming"
),
_NS
(
"OK"
),
@""
,
@""
,
_window
,
nil
,
nil
,
nil
,
nil
,
@"%@"
,
_NS
(
"Media encapsulated as %@ cannot be streamed through the HTTP protocol for technical reasons."
),
[[
self
currentEncapsulationFormatAsFileExtension
:
YES
]
uppercaseString
]);
return
;
}
}
}
playlist_t
*
p_playlist
=
pl_Get
(
VLCIntf
);
...
...
@@ -452,6 +463,13 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[
labelContent
release
];
/* catch obvious errors */
if
(
!
[[
_stream_address_fld
stringValue
]
length
]
>
0
)
{
NSBeginInformationalAlertSheet
(
_NS
(
"No Address given"
),
_NS
(
"OK"
),
@""
,
@""
,
_stream_panel
,
nil
,
nil
,
nil
,
nil
,
@"%@"
,
_NS
(
"In order to stream, a valid destination address is required."
));
return
;
}
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
,
...
...
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