...
 
Commits (7)
......@@ -207,7 +207,7 @@ static int Open( vlc_object_t *p_this )
|| shout_set_protocol( p_shout, SHOUT_PROTOCOL_ICY ) != SHOUTERR_SUCCESS
|| shout_set_port( p_shout, url.i_port ) != SHOUTERR_SUCCESS
|| shout_set_password( p_shout, url.psz_password ) != SHOUTERR_SUCCESS
|| shout_set_mount( p_shout, url.psz_path ) != SHOUTERR_SUCCESS
|| shout_set_mount( p_shout, (url.psz_path != NULL ) ? url.psz_path : "/" ) != SHOUTERR_SUCCESS
|| shout_set_user( p_shout, url.psz_username ) != SHOUTERR_SUCCESS
|| shout_set_agent( p_shout, "VLC media player " VERSION ) != SHOUTERR_SUCCESS
|| shout_set_name( p_shout, psz_name ) != SHOUTERR_SUCCESS
......@@ -217,16 +217,14 @@ static int Open( vlc_object_t *p_this )
/* || shout_set_nonblocking( p_shout, 1 ) != SHOUTERR_SUCCESS */
)
{
msg_Err( p_access, "failed to initialize shout streaming to %s:%i/%s",
url.psz_host, url.i_port, url.psz_path );
msg_Err( p_access, "failed to initialize shout streaming to %s:%i/%s; %s [<Hostname>:<port>/<filePath>;<last shout error that occured in this connection> eg,http://server:8000/mpd.ogg.m3u; ]",
url.psz_host, url.i_port, url.psz_path,shout_get_error(p_shout) );
free( psz_name );
free( psz_description );
free( psz_genre );
free( psz_url );
goto error;
}
free( psz_name );
free( psz_description );
free( psz_genre );
......
This diff is collapsed.
This diff is collapsed.
......@@ -123,6 +123,12 @@
@property (weak) IBOutlet NSTextField *streamChannelLabel;
@property (weak) IBOutlet NSTextField *streamChannelField;
@property (weak) IBOutlet NSMatrix *streamSDPMatrix;
@property (weak) IBOutlet NSTextField *streamMountPointLabel;
@property (weak) IBOutlet NSTextField *streamMountPointField;
@property (weak) IBOutlet NSTextField *streamUsernameLabel;
@property (weak) IBOutlet NSTextField *streamUsernameField;
@property (weak) IBOutlet NSTextField *streamPasswordLabel;
@property (weak) IBOutlet NSTextField *streamPasswordField;
@property (weak) IBOutlet NSButton *streamSDPFileBrowseButton;
@property (weak) IBOutlet NSTextField *streamSDPLabel;
@property (weak) IBOutlet NSTextField *streamSDPField;
......
......@@ -519,7 +519,7 @@
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]];
......@@ -556,7 +556,10 @@
- (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];
......@@ -566,11 +569,20 @@
[_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];
}
......@@ -930,7 +942,7 @@
if ([[self.currentProfile objectAtIndex:15] intValue])
[composedOptions appendFormat:@",soverlay"];
}
if (!b_streaming) {
/* file transcoding */
// add muxer
......@@ -942,11 +954,14 @@
withString:@"\\\""];
[composedOptions appendFormat:@",access=file{no-overwrite},dst=\"%@\"}", _outputDestination];
} else {
[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=%@,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=%@,port=%@,access=mmsh", _outputDestination, [_streamPortField stringValue]];
else
......@@ -970,7 +985,7 @@
}
}
[composedOptions appendString:@"} :sout-keep"];
[composedOptions appendString:@"}"];
}
return [NSString stringWithString:composedOptions];
......
This diff is collapsed.