X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2FConvertAndSave.m;h=d884e0acc1923acc93e616733d86fac3af97a6e3;hb=ff241764f59729c01a0dcf4b149803a63c071bcd;hp=06afd0ec6359a3b2f0ba8dd1621d5293f15348c4;hpb=907320e927650de9e2bfaa2f29e2f17bbe3b8696;p=vlc diff --git a/modules/gui/macosx/ConvertAndSave.m b/modules/gui/macosx/ConvertAndSave.m index 06afd0ec63..d884e0acc1 100644 --- a/modules/gui/macosx/ConvertAndSave.m +++ b/modules/gui/macosx/ConvertAndSave.m @@ -1,5 +1,5 @@ /***************************************************************************** - * ConvertAndSave.h: MacOS X interface module + * ConvertAndSave.m: MacOS X interface module ***************************************************************************** * Copyright (C) 2012 Felix Paul Kühne * $Id$ @@ -23,6 +23,7 @@ #import "ConvertAndSave.h" #import "intf.h" +#import "playlist.h" #import #import @@ -43,6 +44,18 @@ #define ASF 12 /* 13-15 are present, but not set */ +@interface VLCConvertAndSave (Internal) +- (void)updateDropView; +- (void)updateOKButton; +- (void)resetCustomizationSheetBasedOnProfile:(NSString *)profileString; +- (void)selectCellByEncapsulationFormat:(NSString *)format; +- (NSString *)currentEncapsulationFormatAsFileExtension:(BOOL)b_extension; +- (NSString *)composedOptions; +- (void)updateCurrentProfile; +- (void)storeProfilesOnDisk; +- (void)recreateProfilePopup; +@end + @implementation VLCConvertAndSave @synthesize MRL=_MRL, outputDestination=_outputDestination, profileNames=_profileNames, profileValueList=_profileValueList, currentProfile=_currentProfile; @@ -98,6 +111,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil; [defaults registerDefaults:appDefaults]; [defaultProfiles release]; + [defaultProfileNames release]; } + (VLCConvertAndSave *)sharedInstance @@ -133,17 +147,23 @@ static VLCConvertAndSave *_o_sharedInstance = nil; - (void)awakeFromNib { [_window setTitle: _NS("Convert & Save")]; - [_cancel_btn setTitle: _NS("Cancel")]; [_ok_btn setTitle: _NS("Save")]; - [_drop_lbl setStringValue: _NS("Drop Media here")]; - [_drop_btn setTitle: _NS("Open Media...")]; + [_drop_lbl setStringValue: _NS("Drop media here")]; + [_drop_btn setTitle: _NS("Open media...")]; [_profile_lbl setStringValue: _NS("Choose Profile")]; - [_profile_btn setTitle: _NS("Customize")]; + [_profile_btn setTitle: _NS("Customize...")]; [_destination_lbl setStringValue: _NS("Choose Destination")]; [_destination_filename_stub_lbl setStringValue: _NS("Choose an output location")]; [_destination_filename_lbl setHidden: YES]; + [_destination_browse_btn setTitle:_NS("Browse...")]; + [_destination_stream_btn setTitle:_NS("Setup Streaming...")]; + [_destination_stream_lbl setStringValue:@"Select Streaming Method"]; + [_destination_itwantafile_btn setTitle:_NS("Save as File")]; + [_destination_itwantastream_btn setTitle:_NS("Stream")]; + [_destination_cancel_btn setHidden:YES]; [_customize_ok_btn setTitle: _NS("Apply")]; [_customize_cancel_btn setTitle: _NS("Cancel")]; + [_customize_newProfile_btn setTitle: _NS("Save as new Profile...")]; [[_customize_tabview tabViewItemAtIndex:0] setLabel: _NS("Encapsulation")]; [[_customize_tabview tabViewItemAtIndex:1] setLabel: _NS("Video codec")]; [[_customize_tabview tabViewItemAtIndex:2] setLabel: _NS("Audio codec")]; @@ -167,6 +187,22 @@ static VLCConvertAndSave *_o_sharedInstance = nil; [_customize_aud_samplerate_lbl setStringValue: _NS("Sample Rate")]; [_customize_subs_ckb setTitle: _NS("Subtitles")]; [_customize_subs_overlay_ckb setTitle: _NS("Overlay subtitles on the video")]; + [_stream_ok_btn setTitle:_NS("Close")]; + [_stream_destination_lbl setStringValue:_NS("Stream Destination")]; + [_stream_announcement_lbl setStringValue:_NS("Stream Announcement")]; + [_stream_type_lbl setStringValue:_NS("Type")]; + [_stream_address_lbl setStringValue:_NS("Address")]; + [_stream_ttl_lbl setStringValue:_NS("TTL")]; + [_stream_ttl_fld setEnabled:NO]; + [_stream_ttl_stepper setEnabled:NO]; + [_stream_port_lbl setStringValue:_NS("Port")]; + [_stream_sap_ckb setStringValue:_NS("SAP Announcement")]; + [[_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_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]; @@ -177,11 +213,9 @@ static VLCConvertAndSave *_o_sharedInstance = nil; /* fetch profiles from defaults */ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - _profileValueList = [[defaults arrayForKey:@"CASProfiles"] retain]; - _profileNames = [[defaults arrayForKey:@"CASProfileNames"] retain]; - - [_profile_pop removeAllItems]; - [_profile_pop addItemsWithTitles: _profileNames]; + [self setProfileValueList: [defaults arrayForKey:@"CASProfiles"]]; + [self setProfileNames: [defaults arrayForKey:@"CASProfileNames"]]; + [self recreateProfilePopup]; _videoCodecs = [[NSArray alloc] initWithObjects: [NSArray arrayWithObjects:@"MPEG-1", @"MPEG-2", @"MPEG-4", @"DIVX 1", @"DIVX 2", @"DIVX 3", @"H.263", @"H.264", @"VP8", @"WMV1", @"WMV2", @"M-JPEG", @"Theora", @"Dirac", nil], @@ -222,6 +256,8 @@ static VLCConvertAndSave *_o_sharedInstance = nil; [_customize_vid_scale_pop addItemWithTitle:@"2"]; [_ok_btn setEnabled: NO]; + + [self resetCustomizationSheetBasedOnProfile:[self.profileValueList objectAtIndex:0]]; } # pragma mark - @@ -235,83 +271,377 @@ static VLCConvertAndSave *_o_sharedInstance = nil; # pragma mark - # pragma mark User Interaction -- (IBAction)windowButtonAction:(id)sender +- (IBAction)finalizePanel:(id)sender { + 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"] || [muxformat isEqualToString:@"mkv"]) { + 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); + + input_item_t *p_input = input_item_New([_MRL UTF8String], [[_dropin_media_lbl stringValue] UTF8String]); + if (!p_input) + return; + + input_item_AddOption(p_input, [[self composedOptions] UTF8String], VLC_INPUT_OPTION_TRUSTED); + if (b_streaming) + input_item_AddOption(p_input, [[NSString stringWithFormat:@"ttl=%@", [_stream_ttl_fld stringValue]] UTF8String], VLC_INPUT_OPTION_TRUSTED); + + int returnValue; + returnValue = playlist_AddInput(p_playlist, p_input, PLAYLIST_STOP, PLAYLIST_END, true, pl_Unlocked); + + if (returnValue == VLC_SUCCESS) { + /* let's "play" */ + PL_LOCK; + playlist_item_t *p_item = playlist_ItemGetByInput(p_playlist, p_input); + playlist_Control(p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, NULL, + p_item); + PL_UNLOCK; + } + else + msg_Err(VLCIntf, "CAS: playlist add input failed :("); + + /* we're done with this input */ + vlc_gc_decref(p_input); + + [_window performClose:sender]; } - (IBAction)openMedia:(id)sender { + /* preliminary implementation until the open panel is cleaned up */ + NSOpenPanel * openPanel = [NSOpenPanel openPanel]; + [openPanel setCanChooseDirectories:NO]; + [openPanel setResolvesAliases:YES]; + [openPanel setAllowsMultipleSelection:NO]; + [openPanel beginSheetModalForWindow:_window completionHandler:^(NSInteger returnCode) { + if (returnCode == NSOKButton) + { + [self setMRL: [NSString stringWithUTF8String:vlc_path2uri([[[openPanel URL] path] UTF8String], NULL)]]; + [self updateOKButton]; + [self updateDropView]; + } + }]; } -- (IBAction)profileSelection:(id)sender +- (IBAction)switchProfile:(id)sender { - NSInteger index = [sender indexOfSelectedItem]; - if (index != ([sender numberOfItems] - 1)) - { - if (_currentProfile) - [_currentProfile release]; - _currentProfile = [[NSMutableArray alloc] initWithArray: [[_profileValueList objectAtIndex:index] componentsSeparatedByString:@";"]]; - } + NSUInteger index = [_profile_pop indexOfSelectedItem]; + if (index < ([self.profileValueList count] - 1)) + [self resetCustomizationSheetBasedOnProfile:[self.profileValueList objectAtIndex:index]]; } - (IBAction)customizeProfile:(id)sender { - [self resetCustomizationSheetBasedOnProfile:[_profileValueList objectAtIndex:[_profile_pop indexOfSelectedItem]]]; [NSApp beginSheet:_customize_panel modalForWindow:_window modalDelegate:self didEndSelector:NULL contextInfo:nil]; } - (IBAction)closeCustomizationSheet:(id)sender { - // sender == _customize_ok_btn ? [_customize_panel orderOut:sender]; [NSApp endSheet: _customize_panel]; + + if (sender == _customize_ok_btn) + [self updateCurrentProfile]; +} + +- (IBAction)newProfileAction:(id)sender +{ + /* show panel */ + VLCEnterTextPanel * panel = [VLCEnterTextPanel sharedInstance]; + [panel setTitle: _NS("Save as new profile")]; + [panel setSubTitle: _NS("Enter a name for the new profile:")]; + [panel setCancelButtonLabel: _NS("Cancel")]; + [panel setOKButtonLabel: _NS("Save")]; + [panel setTarget:self]; + + [panel runModalForWindow:_customize_panel]; +} + +- (IBAction)deleteProfileAction:(id)sender +{ + /* show panel */ + VLCSelectItemInPopupPanel * panel = [VLCSelectItemInPopupPanel sharedInstance]; + [panel setTitle:_NS("Remove a profile")]; + [panel setSubTitle:_NS("Select the profile you would like to remove:")]; + [panel setOKButtonLabel:_NS("Remove")]; + [panel setCancelButtonLabel:_NS("Cancel")]; + [panel setPopupButtonContent:self.profileNames]; + [panel setTarget:self]; + + [panel runModalForWindow:_window]; +} + +- (IBAction)iWantAFile:(id)sender +{ + NSRect boxFrame = [_destination_box frame]; + NSRect subViewFrame = [_destination_itwantafile_view frame]; + subViewFrame.origin.x = (boxFrame.size.width - subViewFrame.size.width) / 2; + subViewFrame.origin.y = ((boxFrame.size.height - subViewFrame.size.height) / 2) - 15.; + [_destination_itwantafile_view setFrame: subViewFrame]; + [[_destination_itwantafile_btn animator] setHidden: YES]; + [[_destination_itwantastream_btn animator] setHidden: YES]; + [_destination_box performSelector:@selector(addSubview:) withObject:_destination_itwantafile_view afterDelay:0.2]; + [[_destination_cancel_btn animator] setHidden:NO]; + b_streaming = NO; + [_ok_btn setTitle:_NS("Save")]; +} + +- (IBAction)iWantAStream:(id)sender +{ + NSRect boxFrame = [_destination_box frame]; + NSRect subViewFrame = [_destination_itwantastream_view frame]; + subViewFrame.origin.x = (boxFrame.size.width - subViewFrame.size.width) / 2; + subViewFrame.origin.y = ((boxFrame.size.height - subViewFrame.size.height) / 2) - 15.; + [_destination_itwantastream_view setFrame: subViewFrame]; + [[_destination_itwantafile_btn animator] setHidden: YES]; + [[_destination_itwantastream_btn animator] setHidden: YES]; + [_destination_box performSelector:@selector(addSubview:) withObject:_destination_itwantastream_view afterDelay:0.2]; + [[_destination_cancel_btn animator] setHidden:NO]; + b_streaming = YES; + [_ok_btn setTitle:_NS("Stream")]; +} + +- (IBAction)cancelDestination:(id)sender +{ + if ([_destination_itwantastream_view superview] != nil) + [_destination_itwantastream_view removeFromSuperview]; + if ([_destination_itwantafile_view superview] != nil) + [_destination_itwantafile_view removeFromSuperview]; + + [_destination_cancel_btn setHidden:YES]; + [[_destination_itwantafile_btn animator] setHidden: NO]; + [[_destination_itwantastream_btn animator] setHidden: NO]; + b_streaming = NO; } -- (IBAction)chooseDestination:(id)sender +- (IBAction)browseFileDestination:(id)sender { - NSSavePanel * saveFilePanel = [[NSSavePanel alloc] init]; + NSSavePanel * saveFilePanel = [NSSavePanel savePanel]; [saveFilePanel setCanSelectHiddenExtension: YES]; [saveFilePanel setCanCreateDirectories: YES]; - [saveFilePanel beginSheetForDirectory:nil file:nil modalForWindow:_window modalDelegate:self didEndSelector:@selector(savePanelDidEnd:returnCode:contextInfo:) contextInfo:nil]; + if ([[_customize_encap_matrix selectedCell] tag] != RAW) // there is no clever guess for this + [saveFilePanel setAllowedFileTypes:[NSArray arrayWithObject:[self currentEncapsulationFormatAsFileExtension:YES]]]; + [saveFilePanel beginSheetModalForWindow:_window completionHandler:^(NSInteger returnCode) { + if (returnCode == NSOKButton) { + [self setOutputDestination:[[saveFilePanel URL] path]]; + [_destination_filename_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:_outputDestination]]; + [[_destination_filename_stub_lbl animator] setHidden: YES]; + [[_destination_filename_lbl animator] setHidden: NO]; + } else { + [self setOutputDestination:@""]; + [[_destination_filename_lbl animator] setHidden: YES]; + [[_destination_filename_stub_lbl animator] setHidden: NO]; + } + [self updateOKButton]; + }]; } -- (void)savePanelDidEnd:(NSSavePanel *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo +- (IBAction)showStreamPanel:(id)sender { - if (returnCode == NSOKButton) { - _outputDestination = [[sheet URL] path]; - [_destination_filename_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:_outputDestination]]; - [[_destination_filename_stub_lbl animator] setHidden: YES]; - [[_destination_filename_lbl animator] setHidden: NO]; - } else { - _outputDestination = @""; - [[_destination_filename_lbl animator] setHidden: YES]; - [[_destination_filename_stub_lbl animator] setHidden: NO]; + [NSApp beginSheet:_stream_panel modalForWindow:_window modalDelegate:self didEndSelector:NULL contextInfo:nil]; +} + +- (IBAction)closeStreamPanel:(id)sender +{ + /* provide a summary of the user selections */ + NSMutableString * labelContent = [[NSMutableString alloc] initWithFormat:_NS("%@ stream to %@:%@"), [_stream_type_pop titleOfSelectedItem], [_stream_address_fld stringValue], [_stream_port_fld stringValue]]; + + if ([_stream_type_pop indexOfSelectedItem] > 1) + [labelContent appendFormat:@" (\"%@\")", [_stream_channel_fld stringValue]]; + + [_destination_stream_lbl setStringValue:labelContent]; + [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, + @"%@", _NS("SAP stream announcement is enabled. However, no channel name is provided.")); + return; + } + + 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.")); + return; + } + + /* store destination for further reference and update UI */ + [self setOutputDestination: [_stream_address_fld stringValue]]; [self updateOKButton]; + + [_stream_panel orderOut:sender]; + [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_ttl_stepper setEnabled:NO]; + [_stream_sap_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_sdp_matrix setEnabled:YES]; + } else { // UDP + [_stream_ttl_fld setEnabled:YES]; + [_stream_ttl_stepper setEnabled:YES]; + [_stream_sap_ckb setEnabled:YES]; + [_stream_sdp_matrix setEnabled:NO]; + } + [self streamAnnouncementToggle:sender]; +} + +- (IBAction)streamAnnouncementToggle:(id)sender +{ + [_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])]; + + if ([[_stream_sdp_matrix selectedCell] tag] == 3) + [_stream_sdp_browsefile_btn setEnabled: YES]; + else + [_stream_sdp_browsefile_btn setEnabled: NO]; +} + +- (IBAction)sdpFileLocationSelector:(id)sender +{ + NSSavePanel * saveFilePanel = [NSSavePanel savePanel]; + [saveFilePanel setCanSelectHiddenExtension: YES]; + [saveFilePanel setCanCreateDirectories: YES]; + [saveFilePanel setAllowedFileTypes:[NSArray arrayWithObject:@"sdp"]]; + [saveFilePanel beginSheetModalForWindow:_stream_panel completionHandler:^(NSInteger returnCode) { + if (returnCode == NSOKButton) + [_stream_sdp_fld setStringValue:[[saveFilePanel URL] path]]; + }]; } - (BOOL)performDragOperation:(id )sender { NSPasteboard *paste = [sender draggingPasteboard]; - NSArray *types = [NSArray arrayWithObject: NSFilenamesPboardType]; + NSArray *types = [NSArray arrayWithObjects: NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]; NSString *desired_type = [paste availableTypeFromArray: types]; NSData *carried_data = [paste dataForType: desired_type]; - if( carried_data ) { - if( [desired_type isEqualToString:NSFilenamesPboardType] ) { + if (carried_data) { + if ([desired_type isEqualToString:NSFilenamesPboardType]) { NSArray *values = [[paste propertyListForType: NSFilenamesPboardType] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)]; if ([values count] > 0) { - [self setMRL: [NSString stringWithUTF8String:make_URI([[values objectAtIndex:0] UTF8String], NULL)]]; + [self setMRL: [NSString stringWithUTF8String:vlc_path2uri([[values objectAtIndex:0] UTF8String], NULL)]]; [self updateOKButton]; [self updateDropView]; return YES; } + } else if ([desired_type isEqualToString:@"VLCPlaylistItemPboardType"]) { + NSArray * array = [[[VLCMain sharedInstance] playlist] draggedItems]; + NSUInteger count = [array count]; + if (count > 0) { + playlist_t * p_playlist = pl_Get(VLCIntf); + playlist_item_t * p_item = NULL; + + PL_LOCK; + /* let's look for the first proper input item */ + for (NSUInteger x = 0; x < count; x++) { + p_item = [[array objectAtIndex:x] pointerValue]; + if (p_item) { + if (p_item->p_input) { + if (p_item->p_input->psz_uri != nil) { + [self setMRL: [NSString stringWithFormat:@"%s", p_item->p_input->psz_uri]]; + [self updateDropView]; + [self updateOKButton]; + + PL_UNLOCK; + + return YES; + } + } + } + } + PL_UNLOCK; + } } } return NO; } +- (void)panel:(VLCEnterTextPanel *)panel returnValue:(NSUInteger)value text:(NSString *)text +{ + if (value == NSOKButton) { + if ([text length] > 0) { + /* prepare current data */ + [self updateCurrentProfile]; + + /* add profile to arrays */ + NSMutableArray * workArray = [[NSMutableArray alloc] initWithArray:self.profileNames]; + [workArray addObject:text]; + [self setProfileNames:[[[NSArray alloc] initWithArray:workArray] autorelease]]; + [workArray release]; + workArray = [[NSMutableArray alloc] initWithArray:self.profileValueList]; + [workArray addObject:[[[NSArray alloc] initWithArray:self.currentProfile] autorelease]]; + [self setProfileValueList:[[[NSArray alloc] initWithArray:workArray] autorelease]]; + [workArray release]; + + /* update UI */ + [self recreateProfilePopup]; + [_profile_pop selectItemWithTitle:text]; + + /* update internals */ + [self switchProfile:self]; + [self storeProfilesOnDisk]; + } + } +} + +- (void)panel:(VLCSelectItemInPopupPanel *)panel returnValue:(NSUInteger)value item:(NSUInteger)item +{ + if (value == NSOKButton) { + /* remove requested profile from the arrays */ + NSMutableArray * workArray = [[NSMutableArray alloc] initWithArray:self.profileNames]; + [workArray removeObjectAtIndex:item]; + [self setProfileNames:[[[NSArray alloc] initWithArray:workArray] autorelease]]; + [workArray release]; + workArray = [[NSMutableArray alloc] initWithArray:self.profileValueList]; + [workArray removeObjectAtIndex:item]; + [self setProfileValueList:[[[NSArray alloc] initWithArray:workArray] autorelease]]; + [workArray release]; + + /* update UI */ + [_profile_pop removeAllItems]; + [_profile_pop addItemsWithTitles:self.profileNames]; + [_profile_pop addItemWithTitle:_NS("Custom")]; + [[_profile_pop menu] addItem:[NSMenuItem separatorItem]]; + [_profile_pop addItemWithTitle:_NS("Organize Profiles...")]; + [[_profile_pop lastItem] setTarget: self]; + [[_profile_pop lastItem] setAction: @selector(deleteProfileAction:)]; + + /* update internals */ + [self switchProfile:self]; + [self storeProfilesOnDisk]; + } +} + # pragma mark - # pragma mark Private Functionality - (void)updateDropView @@ -330,7 +660,7 @@ static VLCConvertAndSave *_o_sharedInstance = nil; subViewFrame.origin.y = (boxFrame.size.height - subViewFrame.size.height) / 2; [_dropin_view setFrame: subViewFrame]; [[_drop_image_view animator] setHidden: YES]; - [_drop_box performSelector:@selector(addSubview:) withObject:_dropin_view afterDelay:0.4]; + [_drop_box performSelector:@selector(addSubview:) withObject:_dropin_view afterDelay:0.6]; } } else { [_dropin_view removeFromSuperview]; @@ -416,46 +746,255 @@ static VLCConvertAndSave *_o_sharedInstance = nil; } } } + + [self setCurrentProfile: [[[NSMutableArray alloc] initWithArray: [profileString componentsSeparatedByString:@";"]] autorelease]]; } - (void)selectCellByEncapsulationFormat:(NSString *)format { if ([format isEqualToString:@"ts"]) [_customize_encap_matrix selectCellWithTag:MPEGTS]; - else if([format isEqualToString:@"webm"]) + else if ([format isEqualToString:@"webm"]) [_customize_encap_matrix selectCellWithTag:WEBM]; - else if([format isEqualToString:@"ogg"]) + else if ([format isEqualToString:@"ogg"]) [_customize_encap_matrix selectCellWithTag:OGG]; - else if([format isEqualToString:@"ogm"]) + else if ([format isEqualToString:@"ogm"]) [_customize_encap_matrix selectCellWithTag:OGG]; - else if([format isEqualToString:@"mp4"]) + else if ([format isEqualToString:@"mp4"]) [_customize_encap_matrix selectCellWithTag:MP4]; - else if([format isEqualToString:@"mov"]) + else if ([format isEqualToString:@"mov"]) [_customize_encap_matrix selectCellWithTag:MP4]; - else if([format isEqualToString:@"ps"]) + else if ([format isEqualToString:@"ps"]) [_customize_encap_matrix selectCellWithTag:MPEGPS]; - else if([format isEqualToString:@"mjpeg"]) + else if ([format isEqualToString:@"mpjpeg"]) [_customize_encap_matrix selectCellWithTag:MJPEG]; - else if([format isEqualToString:@"wav"]) + else if ([format isEqualToString:@"wav"]) [_customize_encap_matrix selectCellWithTag:WAV]; - else if([format isEqualToString:@"flv"]) + else if ([format isEqualToString:@"flv"]) [_customize_encap_matrix selectCellWithTag:FLV]; - else if([format isEqualToString:@"mpg"]) + else if ([format isEqualToString:@"mpeg1"]) [_customize_encap_matrix selectCellWithTag:MPEG1]; - else if([format isEqualToString:@"mkv"]) + else if ([format isEqualToString:@"mkv"]) [_customize_encap_matrix selectCellWithTag:MKV]; - else if([format isEqualToString:@"raw"]) + else if ([format isEqualToString:@"raw"]) [_customize_encap_matrix selectCellWithTag:RAW]; - else if([format isEqualToString:@"avi"]) + else if ([format isEqualToString:@"avi"]) [_customize_encap_matrix selectCellWithTag:AVI]; - else if([format isEqualToString:@"asf"]) + else if ([format isEqualToString:@"asf"]) [_customize_encap_matrix selectCellWithTag:ASF]; - else if([format isEqualToString:@"wmv"]) + else if ([format isEqualToString:@"wmv"]) [_customize_encap_matrix selectCellWithTag:ASF]; else msg_Err(VLCIntf, "CAS: unknown encap format requested for customization"); } +- (NSString *)currentEncapsulationFormatAsFileExtension:(BOOL)b_extension +{ + NSUInteger cellTag = [[_customize_encap_matrix selectedCell] tag]; + NSString * returnValue; + switch (cellTag) { + case MPEGTS: + returnValue = @"ts"; + break; + case WEBM: + returnValue = @"webm"; + break; + case OGG: + returnValue = @"ogg"; + break; + case MP4: + { + if (b_extension) + returnValue = @"m4v"; + else + returnValue = @"mp4"; + break; + } + case MPEGPS: + { + if (b_extension) + returnValue = @"mpg"; + else + returnValue = @"ps"; + break; + } + case MJPEG: + returnValue = @"mjpeg"; + break; + case WAV: + returnValue = @"wav"; + break; + case FLV: + returnValue = @"flv"; + break; + case MPEG1: + { + if (b_extension) + returnValue = @"mpg"; + else + returnValue = @"mpeg1"; + break; + } + case MKV: + returnValue = @"mkv"; + break; + case RAW: + returnValue = @"raw"; + break; + case AVI: + returnValue = @"avi"; + break; + case ASF: + returnValue = @"asf"; + break; + + default: + returnValue = @"none"; + break; + } + + return returnValue; +} + +- (NSString *)composedOptions +{ + NSMutableString *composedOptions = [[NSMutableString alloc] initWithString:@":sout=#transcode{"]; + if ([[self.currentProfile objectAtIndex:1] intValue]) { + // video is enabled + [composedOptions appendFormat:@"vcodec=%@", [self.currentProfile objectAtIndex:4]]; + if (![[self.currentProfile objectAtIndex:4] isEqualToString:@"none"]) { + if ([[self.currentProfile objectAtIndex:5] intValue] > 0) // bitrate + [composedOptions appendFormat:@",vb=%@", [self.currentProfile objectAtIndex:5]]; + if ([[self.currentProfile objectAtIndex:6] floatValue] > 0.) // scale + [composedOptions appendFormat:@",scale=%@", [self.currentProfile objectAtIndex:6]]; + if ([[self.currentProfile objectAtIndex:7] floatValue] > 0.) // fps + [composedOptions appendFormat:@",fps=%@", [self.currentProfile objectAtIndex:7]]; + if ([[self.currentProfile objectAtIndex:8] intValue] > 0) // width + [composedOptions appendFormat:@",width=%@", [self.currentProfile objectAtIndex:8]]; + if ([[self.currentProfile objectAtIndex:9] intValue] > 0) // height + [composedOptions appendFormat:@",height=%@", [self.currentProfile objectAtIndex:9]]; + } + } + if ([[self.currentProfile objectAtIndex:2] intValue]) { + // audio is enabled + + // add another comma in case video is enabled + if ([[self.currentProfile objectAtIndex:1] intValue]) + [composedOptions appendString:@","]; + + [composedOptions appendFormat:@"acodec=%@", [self.currentProfile objectAtIndex:10]]; + if (![[self.currentProfile objectAtIndex:10] isEqualToString:@"none"]) { + [composedOptions appendFormat:@",ab=%@", [self.currentProfile objectAtIndex:11]]; // bitrate + [composedOptions appendFormat:@",channels=%@", [self.currentProfile objectAtIndex:12]]; // channel number + [composedOptions appendFormat:@",samplerate=%@", [self.currentProfile objectAtIndex:13]]; // sample rate + } + } + if ([self.currentProfile objectAtIndex:3]) { + // subtitles enabled + [composedOptions appendFormat:@",scodec=%@", [self.currentProfile objectAtIndex:14]]; + if ([[self.currentProfile objectAtIndex:15] intValue]) + [composedOptions appendFormat:@",soverlay"]; + } + + if (!b_streaming) { + /* file transcoding */ + // add muxer + [composedOptions appendFormat:@"}:standard{mux=%@", [self.currentProfile objectAtIndex:0]]; + + // add output destination + [composedOptions appendFormat:@",dst=%@,access=file}", _outputDestination]; + } else { + /* streaming */ + if ([[[_stream_type_pop selectedItem] title] isEqualToString:@"RTP"]) + [composedOptions appendFormat:@":rtp{mux=ts,dst=%@,port=%@", _outputDestination, [_stream_port_fld stringValue]]; + else if ([[[_stream_type_pop selectedItem] title] isEqualToString:@"UDP"]) + [composedOptions appendFormat:@":standard{mux=ts,dst=%@,port=%@,access=udp", _outputDestination, [_stream_port_fld stringValue]]; + else if ([[[_stream_type_pop selectedItem] title] isEqualToString:@"MMSH"]) + [composedOptions appendFormat:@":standard{mux=asfh,dst=%@,port=%@,access=mmsh", _outputDestination, [_stream_port_fld stringValue]]; + else + [composedOptions appendFormat:@":standard{mux=%@,dst=%@,port=%@,access=http", [self.currentProfile objectAtIndex:0], [_stream_port_fld stringValue], _outputDestination]; + + if ([_stream_sap_ckb state]) + [composedOptions appendFormat:@",sap,name=\"%@\"", [_stream_channel_fld stringValue]]; + if ([_stream_sdp_matrix selectedCell] != [_stream_sdp_matrix cellWithTag:0]) { + 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"]; + } + + NSString * returnString = [NSString stringWithString:composedOptions]; + [composedOptions release]; + + return returnString; +} + +- (void)updateCurrentProfile +{ + [self.currentProfile removeAllObjects]; + + NSInteger i; + [self.currentProfile addObject: [self currentEncapsulationFormatAsFileExtension:NO]]; + [self.currentProfile addObject: [NSString stringWithFormat:@"%li", [_customize_vid_ckb state]]]; + [self.currentProfile addObject: [NSString stringWithFormat:@"%li", [_customize_aud_ckb state]]]; + [self.currentProfile addObject: [NSString stringWithFormat:@"%li", [_customize_subs_ckb state]]]; + i = [_customize_vid_codec_pop indexOfSelectedItem]; + if (i >= 0) + [self.currentProfile addObject: [[_videoCodecs objectAtIndex:1] objectAtIndex:i]]; + else + [self.currentProfile addObject: @"none"]; + [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_vid_bitrate_fld intValue]]]; + [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [[[_customize_vid_scale_pop selectedItem] title] intValue]]]; + [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_vid_framerate_fld intValue]]]; + [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_vid_width_fld intValue]]]; + [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_vid_height_fld intValue]]]; + i = [_customize_aud_codec_pop indexOfSelectedItem]; + if (i >= 0) + [self.currentProfile addObject: [[_audioCodecs objectAtIndex:1] objectAtIndex:i]]; + else + [self.currentProfile addObject: @"none"]; + [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_aud_bitrate_fld intValue]]]; + [self.currentProfile addObject: [NSString stringWithFormat:@"%i", [_customize_aud_channels_fld intValue]]]; + [self.currentProfile addObject: [[_customize_aud_samplerate_pop selectedItem] title]]; + i = [_customize_subs_pop indexOfSelectedItem]; + if (i >= 0) + [self.currentProfile addObject: [[_subsCodecs objectAtIndex:1] objectAtIndex:i]]; + else + [self.currentProfile addObject: @"none"]; + [self.currentProfile addObject: [NSString stringWithFormat:@"%li", [_customize_subs_overlay_ckb state]]]; +} + +- (void)storeProfilesOnDisk +{ + NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults]; + [defaults setObject:_profileNames forKey:@"CASProfileNames"]; + [defaults setObject:_profileValueList forKey:@"CASProfiles"]; + [defaults synchronize]; +} + +- (void)recreateProfilePopup +{ + [_profile_pop removeAllItems]; + [_profile_pop addItemsWithTitles:self.profileNames]; + [_profile_pop addItemWithTitle:_NS("Custom")]; + [[_profile_pop menu] addItem:[NSMenuItem separatorItem]]; + [_profile_pop addItemWithTitle:_NS("Organize Profiles...")]; + [[_profile_pop lastItem] setTarget: self]; + [[_profile_pop lastItem] setAction: @selector(deleteProfileAction:)]; +} + @end # pragma mark - @@ -465,17 +1004,51 @@ static VLCConvertAndSave *_o_sharedInstance = nil; - (void)awakeFromNib { - [self registerForDraggedTypes:[NSArray arrayWithObject: NSFilenamesPboardType]]; + [self registerForDraggedTypes:[NSArray arrayWithObjects: NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]]; } - (NSDragOperation)draggingEntered:(id )sender { + b_activeDragAndDrop = YES; + [self setNeedsDisplay:YES]; + + [[NSCursor dragCopyCursor] set]; + if ((NSDragOperationGeneric & [sender draggingSourceOperationMask]) == NSDragOperationGeneric) return NSDragOperationGeneric; return NSDragOperationNone; } +- (void)draggingEnded:(id < NSDraggingInfo >)sender +{ + [[NSCursor arrowCursor] set]; + b_activeDragAndDrop = NO; + [self setNeedsDisplay:YES]; +} + +- (void)draggingExited:(id < NSDraggingInfo >)sender +{ + [[NSCursor arrowCursor] set]; + b_activeDragAndDrop = NO; + [self setNeedsDisplay:YES]; +} + +- (void)drawRect:(NSRect)dirtyRect +{ + if (b_activeDragAndDrop) { + [[NSColor colorWithCalibratedRed:(.154/.255) green:(.154/.255) blue:(.154/.255) alpha:1.] setFill]; + NSRect frameRect = [[self contentView] bounds]; + frameRect.origin.x += 10; + frameRect.origin.y += 10; + frameRect.size.width -= 17; + frameRect.size.height -= 17; + NSFrameRectWithWidthUsingOperation(frameRect, 4., NSCompositeHighlight); + } + + [super drawRect:dirtyRect]; +} + - (BOOL)prepareForDragOperation:(id )sender { return YES; @@ -497,15 +1070,12 @@ static VLCConvertAndSave *_o_sharedInstance = nil; - (void)awakeFromNib { - [self registerForDraggedTypes:[NSArray arrayWithObject: NSFilenamesPboardType]]; + [self registerForDraggedTypes:[NSArray arrayWithObjects: NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]]; } - (NSDragOperation)draggingEntered:(id )sender { - if ((NSDragOperationGeneric & [sender draggingSourceOperationMask]) == NSDragOperationGeneric) - return NSDragOperationGeneric; - - return NSDragOperationNone; + return [[[self superview] superview] draggingEntered:sender]; } - (BOOL)prepareForDragOperation:(id )sender @@ -529,15 +1099,12 @@ static VLCConvertAndSave *_o_sharedInstance = nil; - (void)awakeFromNib { - [self registerForDraggedTypes:[NSArray arrayWithObject: NSFilenamesPboardType]]; + [self registerForDraggedTypes:[NSArray arrayWithObjects: NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]]; } - (NSDragOperation)draggingEntered:(id )sender { - if ((NSDragOperationGeneric & [sender draggingSourceOperationMask]) == NSDragOperationGeneric) - return NSDragOperationGeneric; - - return NSDragOperationNone; + return [[[self superview] superview] draggingEntered:sender]; } - (BOOL)prepareForDragOperation:(id )sender