macosx: fix typo preventing post-processing (refs #11613)

[vlc] / modules / gui / macosx / eyetv.m

diff --git a/modules/gui/macosx/eyetv.m b/modules/gui/macosx/eyetv.m
index b6f59139f5e35966364c30cef47f0f4a873cacc7..f36a288d4a8d3749b44a72ca234255121626f15b 100644 (file)
--- a/modules/gui/macosx/eyetv.m
+++ b/modules/gui/macosx/eyetv.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
 * eyetv.m: small class to control the notification parts of the EyeTV plugin
 *****************************************************************************
-* Copyright (C) 2006-2011 the VideoLAN team
+* Copyright (C) 2006-2011 VLC authors and VideoLAN
 * $Id$
 *
 * Authors: Felix Kühne <fkuehne at videolan dot org>
@@ -30,6 +30,8 @@
 
 @implementation VLCEyeTVController
 
+@synthesize eyeTVRunning = b_eyeTVactive, deviceConnected = b_deviceConnected;
+
 static VLCEyeTVController *_o_sharedInstance = nil;
 
 + (VLCEyeTVController *)sharedInstance
@@ -37,11 +39,11 @@ static VLCEyeTVController *_o_sharedInstance = nil;
     return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
 }
 
-- (id)init 
+- (id)init
 {
-    if (_o_sharedInstance) {
+    if (_o_sharedInstance)
         [self dealloc];
-    } else {
+    else {
         _o_sharedInstance = [super init];
 
         [[NSDistributedNotificationCenter defaultCenter]
@@ -51,36 +53,25 @@ static VLCEyeTVController *_o_sharedInstance = nil;
                          object: @"VLCEyeTVSupport"
              suspensionBehavior: NSNotificationSuspensionBehaviorDeliverImmediately];
     }
-    
+
     return _o_sharedInstance;
 }
 
 - (void)globalNotificationReceived: (NSNotification *)theNotification
 {
     /* update our info on the used device */
-    if( [[theNotification name] isEqualToString: @"DeviceAdded"] )
+    if ([[theNotification name] isEqualToString: @"DeviceAdded"])
         b_deviceConnected = YES;
-    if( [[theNotification name] isEqualToString: @"DeviceRemoved"] )
+    if ([[theNotification name] isEqualToString: @"DeviceRemoved"])
         b_deviceConnected = NO;
 
     /* is eyetv running? */
-    if( [[theNotification name] isEqualToString: @"PluginInit"] )
+    if ([[theNotification name] isEqualToString: @"PluginInit"])
         b_eyeTVactive = YES;
-    if( [[theNotification name] isEqualToString: @"PluginQuit"] )
+    if ([[theNotification name] isEqualToString: @"PluginQuit"])
         b_eyeTVactive = NO;
 }
 
-- (BOOL)isEyeTVrunning
-{
-    return b_eyeTVactive;
-}
-
-- (BOOL)isDeviceConnected
-{
-    return b_deviceConnected;
-}
-
-
 - (void)launchEyeTV
 {
     NSAppleScript *script = [[NSAppleScript alloc] initWithSource:
@@ -89,30 +80,25 @@ static VLCEyeTVController *_o_sharedInstance = nil;
                  "end tell"];
     NSDictionary *errorDict;
     NSAppleEventDescriptor *descriptor = [script executeAndReturnError:&errorDict];
-    if( nil == descriptor ) 
-    {
+    if (nil == descriptor) {
         NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
-        NSLog( @"opening EyeTV failed with error status '%@'", errorString );
+        NSLog(@"opening EyeTV failed with error status '%@'", errorString);
     }
     [script release];
 }
 
-- (int)currentChannel
+- (int)channel
 {
     int currentChannel = 0;
     NSAppleScript *script = [[NSAppleScript alloc] initWithSource:
             @"tell application \"EyeTV\" to get current channel"];
     NSDictionary *errorDict;
     NSAppleEventDescriptor *descriptor = [script executeAndReturnError:&errorDict];
-    if( nil == descriptor ) 
-    {
+    if (nil == descriptor) {
         NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
-        NSLog( @"EyeTV channel inventory failed with error status '%@'", errorString );
-    }
-    else
-    {
+        NSLog(@"EyeTV channel inventory failed with error status '%@'", errorString);
+    } else
         currentChannel = (int)[descriptor int32Value];
-    }
     [script release];
     return currentChannel;
 }
@@ -124,44 +110,37 @@ static VLCEyeTVController *_o_sharedInstance = nil;
     NSDictionary *errorDict;
     NSAppleEventDescriptor *descriptor;
 
-    if( b_yesOrNo == YES )
-    {
+    if (b_yesOrNo == YES) {
         script = [[NSAppleScript alloc] initWithSource:
                     @"tell application \"EyeTV\"\n"
                        "channel_up\n"
                        "get current channel\n"
                      "end tell"];
-        NSLog( @"telling eyetv to switch 1 channel up" );
-    }
-    else
-    {
+        NSLog(@"telling eyetv to switch 1 channel up");
+    } else {
         script = [[NSAppleScript alloc] initWithSource:
                     @"tell application \"EyeTV\"\n"
                        "channel_down\n"
                        "get current channel\n"
                      "end tell"];
-        NSLog( @"telling eyetv to switch 1 channel down" );
+        NSLog(@"telling eyetv to switch 1 channel down");
     }
-    
+
     descriptor = [script executeAndReturnError:&errorDict];
-    if( nil == descriptor ) 
-    {
+    if (nil == descriptor) {
         NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
-        NSLog( @"EyeTV channel change failed with error status '%@'", errorString );
-    }
-    else
-    {
+        NSLog(@"EyeTV channel change failed with error status '%@'", errorString);
+    } else
         currentChannel = (int)[descriptor int32Value];
-    }
+
     [script release];
     return currentChannel;
 }
 
-- (void)selectChannel: (int)theChannelNum
+- (void)setChannel: (int)theChannelNum
 {
     NSAppleScript *script;
-    switch( theChannelNum )
-    {
+    switch(theChannelNum) {
         case -2: // Composite
             script = [[NSAppleScript alloc] initWithSource:
                         @"tell application \"EyeTV\"\n"
@@ -183,8 +162,7 @@ static VLCEyeTVController *_o_sharedInstance = nil;
                          "end tell"];
             break;
         default:
-            if( theChannelNum > 0 )
-            {
+            if (theChannelNum > 0) {
                 NSString *channel_change = [NSString stringWithFormat:
                     @"tell application \"EyeTV\"\n"
                      "  channel_change channel number %d\n"
@@ -197,10 +175,9 @@ static VLCEyeTVController *_o_sharedInstance = nil;
     }
     NSDictionary *errorDict;
     NSAppleEventDescriptor *descriptor = [script executeAndReturnError:&errorDict];
-    if( nil == descriptor ) 
-    {
+    if (nil == descriptor) {
         NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
-        NSLog( @"EyeTV source change failed with error status '%@'", errorString );
+        NSLog(@"EyeTV source change failed with error status '%@'", errorString);
     }
     [script release];
 }
@@ -212,19 +189,16 @@ static VLCEyeTVController *_o_sharedInstance = nil;
             @"tell application \"EyeTV\" to get name of every channel"];
     NSDictionary *errorDict;
     NSAppleEventDescriptor *descriptor = [script executeAndReturnError:&errorDict];
-    if( nil == descriptor ) 
-    {
+    if (nil == descriptor) {
         NSString *errorString = [errorDict objectForKey:NSAppleScriptErrorMessage];
-        NSLog( @"EyeTV channel inventory failed with error status '%@'", errorString );
-    }
-    else
-    {
+        NSLog(@"EyeTV channel inventory failed with error status '%@'", errorString);
+    } else {
         int count = [descriptor numberOfItems];
-        int x=0; 
+        int x=0;
         NSMutableArray *channelArray = [NSMutableArray arrayWithCapacity:count];
-        while( x++ < count ) {
+        while(x++ < count)
             [channelArray addObject:[[descriptor descriptorAtIndex:x] stringValue]];
-        }
+
         channels = [channelArray objectEnumerator];
     }
     [script release];