Skip to content

V
vlc
Commit 3be150d7 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: removed VLCControllerView, which was superseeded by... 

macosx: removed VLCControllerView, which was superseeded by VLBrushedMetalImageView and VLCThreePartDropView
(cherry picked from commit 84e84d3f)
parent 9edc234f
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 120 deletions
extras/package/macosx/Resources/English.lproj/MainMenu.xib
View file @ 3be150d7
......@@ -21,16 +21,16 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="1617"/>
<integer value="4850"/>
<integer value="29"/>
<integer value="4596"/>
<integer value="4722"/>
<integer value="2770"/>
<integer value="21"/>
<integer value="1617"/>
<integer value="2730"/>
<integer value="29"/>
<integer value="915"/>
<integer value="4850"/>
<integer value="4948"/>
<integer value="4756"/>
<integer value="2770"/>
<integer value="915"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -11224,7 +11224,6 @@ LCAuLi4</string>
<string>1996.ImportedFromIB2</string>
<string>1997.IBPluginDependency</string>
<string>1997.ImportedFromIB2</string>
<string>2.CustomClassName</string>
<string>2.IBPluginDependency</string>
<string>2.ImportedFromIB2</string>
<string>202.IBPluginDependency</string>
......@@ -12072,7 +12071,6 @@ LCAuLi4</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>VLCControllerView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -13172,11 +13170,6 @@ LCAuLi4</string>
<string key="minorKey">../../../modules/gui/macosx/bookmarks.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCControllerView</string>
<string key="superclassName">NSView</string>
<reference key="sourceIdentifier" ref="516086310"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCControls</string>
<string key="superclassName">NSObject</string>
......@@ -15817,11 +15810,6 @@ LCAuLi4</string>
<string key="superclassName">NSImageView</string>
<reference key="sourceIdentifier" ref="386911354"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCControllerView</string>
<string key="superclassName">NSView</string>
<reference key="sourceIdentifier" ref="386911354"/>
</object>
<object class="IBPartialClassDescription">
<string key="className">VLCCustomWindowButtonPrototype</string>
<string key="superclassName">NSButton</string>
......
modules/gui/macosx/misc.h
View file @ 3be150d7
......@@ -85,16 +85,6 @@
@end
/*****************************************************************************
* VLCControllerView
*****************************************************************************/
@interface VLCControllerView : NSView
{
}
@end
/*****************************************************************************
* VLBrushedMetalImageView
*****************************************************************************/
......@@ -187,7 +177,7 @@
@end
/*****************************************************************************
* VLCThreePartImageView interface
* VLCThreePartDropView interface
*****************************************************************************/
@interface VLCThreePartDropView : VLCThreePartImageView
{
......
modules/gui/macosx/misc.m
View file @ 3be150d7
......@@ -377,97 +377,6 @@ static NSMutableArray *blackoutWindows = NULL;
@end
/*****************************************************************************
* VLCControllerView
*****************************************************************************/
@implementation VLCControllerView
- (void)dealloc
{
[self unregisterDraggedTypes];
[super dealloc];
}
- (void)awakeFromNib
{
[self registerForDraggedTypes:[NSArray arrayWithObjects:NSTIFFPboardType,
NSFilenamesPboardType, nil]];
}
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
{
if ((NSDragOperationGeneric & [sender draggingSourceOperationMask])
== NSDragOperationGeneric)
{
return NSDragOperationGeneric;
}
else
{
return NSDragOperationNone;
}
}
- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
{
return YES;
}
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
{
NSPasteboard *o_paste = [sender draggingPasteboard];
NSArray *o_types = [NSArray arrayWithObjects: NSFilenamesPboardType, nil];
NSString *o_desired_type = [o_paste availableTypeFromArray:o_types];
NSData *o_carried_data = [o_paste dataForType:o_desired_type];
if( o_carried_data )
{
if ([o_desired_type isEqualToString:NSFilenamesPboardType])
{
NSArray *o_array = [NSArray array];
NSArray *o_values = [[o_paste propertyListForType: NSFilenamesPboardType] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
NSUInteger count = [o_values count];
input_thread_t * p_input = pl_CurrentInput( VLCIntf );
BOOL b_returned = NO;
if (count == 1 && p_input)
{
b_returned = input_AddSubtitle( p_input, make_URI([[o_values objectAtIndex:0] UTF8String], NULL), true );
vlc_object_release( p_input );
if(!b_returned)
return YES;
}
else if( p_input )
vlc_object_release( p_input );
for( NSUInteger i = 0; i < count; i++)
{
NSDictionary *o_dic;
char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], NULL);
if( !psz_uri )
continue;
o_dic = [NSDictionary dictionaryWithObject:[NSString stringWithCString:psz_uri encoding:NSUTF8StringEncoding] forKey:@"ITEM_URL"];
free( psz_uri );
o_array = [o_array arrayByAddingObject: o_dic];
}
[(VLCPlaylist *)[[VLCMain sharedInstance] playlist] appendArray: o_array atPos: -1 enqueue:NO];
return YES;
}
}
[self setNeedsDisplay:YES];
return YES;
}
- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
{
[self setNeedsDisplay:YES];
}
@end
/*****************************************************************************
* VLBrushedMetalImageView
*****************************************************************************/
......
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