Commit 2ad63ccb authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx/CAS: fix SDP announcements

parent 309906f6
...@@ -861,7 +861,6 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -861,7 +861,6 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
[composedOptions appendFormat:@",soverlay"]; [composedOptions appendFormat:@",soverlay"];
} }
if (!b_streaming) { if (!b_streaming) {
/* file transcoding */ /* file transcoding */
// add muxer // add muxer
...@@ -882,8 +881,21 @@ static VLCConvertAndSave *_o_sharedInstance = nil; ...@@ -882,8 +881,21 @@ static VLCConvertAndSave *_o_sharedInstance = nil;
if ([_stream_sap_ckb state]) if ([_stream_sap_ckb state])
[composedOptions appendFormat:@",sap,name=\"%@\"", [_stream_channel_fld stringValue]]; [composedOptions appendFormat:@",sap,name=\"%@\"", [_stream_channel_fld stringValue]];
if ([_stream_sdp_matrix selectedCell] != [_stream_sdp_matrix cellWithTag:0]) //FIXME if ([_stream_sdp_matrix selectedCell] != [_stream_sdp_matrix cellWithTag:0]) {
[composedOptions appendFormat:@",sdp=%@", [_stream_sdp_fld stringValue]]; NSInteger tag = [[_stream_sdp_matrix selectedCell] tag];
switch (tag) {
case 1:
[composedOptions appendFormat:@",sdp=\"http://%@\"", [_stream_sdp_fld stringValue]];
break;
case 2:
[composedOptions appendFormat:@",sdp=\"rtsp://%@\"", [_stream_sdp_fld stringValue]];
break;
case 3:
[composedOptions appendFormat:@",sdp=\"file://%s\"", vlc_path2uri([[_stream_sdp_fld stringValue] UTF8String], NULL)];
default:
break;
}
}
[composedOptions appendString:@"} :sout-keep"]; [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