Commit c4afae23 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Remove tabs and trailing spaces

parent 9010845b
......@@ -38,7 +38,7 @@
* Currently, the framework does not support multiple instances of VLCLibrary. Furthermore, you cannot destroy any
* instiantiation of VLCLibrary, as previously noted, this is done automatically by the dynamic link loader.
*/
@interface VLCLibrary : NSObject
@interface VLCLibrary : NSObject
{
void * instance;
}
......
......@@ -35,7 +35,7 @@
{
VLCPlaylist * playlist;
VLCVideoView * videoView;
NSOutlineView *outlineView;
}
- (id)initWithPlaylist:(VLCPlaylist *)aPlaylist;
......
......@@ -119,11 +119,11 @@
{
int i;
NSArray * droppedItems = [[info draggingPasteboard] propertyListForType: NSFilenamesPboardType];
for (i = 0; i < [droppedItems count]; i++)
{
NSString * filename = [droppedItems objectAtIndex:i];
[[self playlist] insertMedia:[VLCMedia mediaWithURL:filename] atIndex:row+i];
}
......@@ -165,7 +165,7 @@
for (i = 0; i < [droppedItems count]; i++)
{
NSString * filename = [droppedItems objectAtIndex:i];
[aPlaylist insertMedia:[VLCMedia mediaWithURL:filename] atIndex:index+i];
}
return YES;
......@@ -175,4 +175,4 @@
{
return NSDragOperationEvery;
}
@end
\ No newline at end of file
@end
......@@ -85,7 +85,7 @@
[NSDictionary dictionaryWithObjectsAndKeys:
@"mp4", @"muxer",
@"file", @"access",
[[filePath copy] autorelease], @"destination",
[[filePath copy] autorelease], @"destination",
nil
], @"outputOptions",
nil
......@@ -186,7 +186,7 @@
[optionsAsArray addObject: [NSString stringWithFormat:@"#transcode{%@}", [subOptions componentsJoinedByString:@","]]];
[subOptions removeAllObjects];
}
NSDictionary * outputOptions = [options objectForKey:@"outputOptions"];
if( outputOptions )
{
......
......@@ -27,10 +27,10 @@
/******************************************************************************
* Implementation VLCVideoLayoutManager
*
* Manage the size of the video layer
* Manage the size of the video layer
*/
@implementation VLCVideoLayoutManager
@implementation VLCVideoLayoutManager
/* Factories */
+ (id)layoutManager
......@@ -47,16 +47,16 @@
CALayer * videolayer = [[layer sublayers] objectAtIndex:0];
CGRect bounds = layer.bounds;
CGRect videoRect = bounds;
CGFloat xRatio = CGRectGetWidth(bounds)/originalVideoSize.width;
CGFloat yRatio = CGRectGetHeight(bounds)/originalVideoSize.height;
CGFloat ratio = fillScreenEntirely ? MAX(xRatio, yRatio) : MIN(xRatio, yRatio);
videoRect.size.width = ratio*originalVideoSize.width;
videoRect.size.height = ratio*originalVideoSize.height;
videoRect.origin.x += (CGRectGetWidth(bounds) - CGRectGetWidth(videoRect))/2.0;
videoRect.origin.y += (CGRectGetHeight(bounds) - CGRectGetHeight(videoRect))/2.0;
videolayer.frame = videoRect;
}
}
......
......@@ -38,7 +38,7 @@
#import <QuartzCore/QuartzCore.h>
/******************************************************************************
* VLCVideoView (Private)
* VLCVideoView (Private)
*/
@interface VLCVideoLayer (Private)
......@@ -51,7 +51,7 @@
@end
/******************************************************************************
* Implementation VLCVideoLayer
* Implementation VLCVideoLayer
*/
@implementation VLCVideoLayer
......@@ -77,19 +77,19 @@
@implementation VLCVideoLayer (Private)
/* This is called by the libvlc module 'opengllayer' as soon as there is one
/* This is called by the libvlc module 'opengllayer' as soon as there is one
* vout available
*/
- (void)addVoutLayer:(CALayer *)voutLayer
{
[CATransaction begin];
voutLayer.name = @"vlcopengllayer";
VLCVideoLayoutManager * layoutManager = [VLCVideoLayoutManager layoutManager];
layoutManager.originalVideoSize = voutLayer.bounds.size;
self.layoutManager = layoutManager;
[self insertSublayer:voutLayer atIndex:0];
[self setNeedsDisplayOnBoundsChange:YES];
......@@ -106,7 +106,7 @@
[CATransaction begin];
[voutLayer removeFromSuperlayer];
[CATransaction commit];
/* Trigger by hand, as it doesn't go through else. Assumed bug from Cocoa */
[self willChangeValueForKey:@"hasVideo"];
self.hasVideo = NO;
......
......@@ -38,11 +38,11 @@
#import <QuartzCore/QuartzCore.h>
/******************************************************************************
* Soon deprecated stuff
* Soon deprecated stuff
*/
/* This is a forward reference to VLCOpenGLVoutView specified in minimal_macosx
library. We could get rid of this, but it prevents warnings from the
library. We could get rid of this, but it prevents warnings from the
compiler. (Scheduled to deletion) */
@interface VLCOpenGLVoutView : NSView
- (void)detachFromVout;
......@@ -58,7 +58,7 @@
@end
/******************************************************************************
* VLCVideoView (Private)
* VLCVideoView (Private)
*/
@interface VLCVideoView (Private)
......@@ -72,7 +72,7 @@
@end
/******************************************************************************
* Implementation VLCVideoView
* Implementation VLCVideoView
*/
@implementation VLCVideoView
......@@ -80,13 +80,13 @@
/* Initializers */
- (id)initWithFrame:(NSRect)rect
{
if (self = [super initWithFrame:rect])
if (self = [super initWithFrame:rect])
{
self.delegate = nil;
self.backColor = [NSColor blackColor];
self.fillScreen = NO;
self.hasVideo = NO;
[self setStretchesVideo:NO];
[self setAutoresizesSubviews:YES];
layoutManager = [[VLCVideoLayoutManager layoutManager] retain];
......@@ -139,14 +139,14 @@
@implementation VLCVideoView (Private)
/* This is called by the libvlc module 'opengllayer' as soon as there is one
/* This is called by the libvlc module 'opengllayer' as soon as there is one
* vout available
*/
- (void)addVoutLayer:(CALayer *)aLayer
{
[CATransaction begin];
[self setWantsLayer: YES];
CALayer * rootLayer = [self layer];
CALayer * rootLayer = [self layer];
aLayer.name = @"vlcopengllayer";
......
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