macosx: we need to import intf.h before any import of vlc/vlc.h, because it includes...

diff --git a/modules/gui/macosx/bookmarks.h b/modules/gui/macosx/bookmarks.h
index 30e48caec9cdc770412ae3620ee5de4b35ee4ff4..3cf21cb48009840a16cb4c179bd441f282ea7703 100644 (file)
--- a/modules/gui/macosx/bookmarks.h
+++ b/modules/gui/macosx/bookmarks.h
@@ -22,6 +22,7 @@
  *****************************************************************************/
 
 #import <Cocoa/Cocoa.h>
+#import "intf.h"
 #import <vlc/vlc.h>
 
 @interface VLCBookmarks : NSObject

diff --git a/modules/gui/macosx/bookmarks.m b/modules/gui/macosx/bookmarks.m
index 348e35faec68dda8c6427ba56ea7d0d635635a95..4a2c15c994f76878e2a3ea93fa8332d2de0647cf 100644 (file)
--- a/modules/gui/macosx/bookmarks.m
+++ b/modules/gui/macosx/bookmarks.m
@@ -35,7 +35,6 @@
  *****************************************************************************/
 
 #import "bookmarks.h"
-#import "intf.h"
 #import "wizard.h"
 #import <vlc_interface.h>
 

diff --git a/modules/gui/macosx/extended.h b/modules/gui/macosx/extended.h
index c5fc0cccef6244c2d6b475627c17e5a024821d88..b5b7f65169579bcd030c8b11be9b536d42dc7443 100644 (file)
--- a/modules/gui/macosx/extended.h
+++ b/modules/gui/macosx/extended.h
@@ -26,6 +26,7 @@
  *****************************************************************************/
 
 #import <Cocoa/Cocoa.h>
+#import "intf.h"
 #import <vlc/vlc.h>
 
 @interface VLCExtended : NSObject

diff --git a/modules/gui/macosx/extended.m b/modules/gui/macosx/extended.m
index b1e506ae927f04a401e2510275d9b582b0568dc9..a21ba53488e0f59c0ca0e87a8d43be8dfd4dc339 100644 (file)
--- a/modules/gui/macosx/extended.m
+++ b/modules/gui/macosx/extended.m
@@ -27,7 +27,6 @@
  *****************************************************************************/
 
 #import "extended.h"
-#import "intf.h"
 #import "vout.h"
 #import <vlc_aout.h>
 #import <vlc_vout.h>

diff --git a/modules/gui/macosx/sfilters.h b/modules/gui/macosx/sfilters.h
index a7ab87ae4fca4f00b1b45842ab955b9fc4a7243b..dec8585d92fb4279da4c671d657cc0428faa6aa4 100644 (file)
--- a/modules/gui/macosx/sfilters.h
+++ b/modules/gui/macosx/sfilters.h
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * sfilter.h: MacOS X Subpicture filters dialogue
  *****************************************************************************
- * Copyright (C) 2005-2006 the VideoLAN team
+ * Copyright (C) 2005-2008 the VideoLAN team
  * $Id$
  *
- * Authors: Felix Kühne <fkuehne@users.sf.net>
+ * Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
  *****************************************************************************/
 
 #import <Cocoa/Cocoa.h>
+#import "intf.h"
 #import <vlc/vlc.h>
 
 @interface VLCsFilters : NSObject

diff --git a/modules/gui/macosx/sfilters.m b/modules/gui/macosx/sfilters.m
index fbeb961c5ddcef9a1bb50561fef339684b42fcff..72db2815b3956af6f6e716c56c64b69bfaccfb41 100644 (file)
--- a/modules/gui/macosx/sfilters.m
+++ b/modules/gui/macosx/sfilters.m
@@ -1,10 +1,10 @@
 /*****************************************************************************
  * sfilter.m: MacOS X Subpicture filters dialogue
  *****************************************************************************
- * Copyright (C) 2005-2006 the VideoLAN team
+ * Copyright (C) 2005-2008 the VideoLAN team
  * $Id$
  *
- * Authors: Felix Kühne <fkuehne@users.sf.net>
+ * Authors: Felix Paul Kühne <fkuehne -at -videolan -dot- org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
  *****************************************************************************/
 
 #import "sfilters.h"
-#import "intf.h"
 #import <vlc_vout.h>
 
 /* TODO:
@@ -215,8 +214,7 @@ static VLCsFilters *_o_sharedInstance = nil;
     /* retrieve the time settings */
     x = 0;
     tempInt = config_GetInt( p_intf, "time-color" );
-    while( strtol([[[o_colors objectAtIndex:x] objectAtIndex:1] UTF8String],
-        NULL, 0) != tempInt )
+    while( strtol([[[o_colors objectAtIndex:x] objectAtIndex:1] UTF8String], NULL, 0) != tempInt )
     {
         x = (x + 1);
  
@@ -484,38 +482,20 @@ static VLCsFilters *_o_sharedInstance = nil;
 {
     if( sender == o_marq_enabled_ckb )
     {
-        if( [o_marq_enabled_ckb state] == NSOnState )
-        {
-            [self changeFiltersString:(char *)"marq" onOrOff:VLC_TRUE];
-        }
-        else
-        {
-            [self changeFiltersString:(char *)"marq" onOrOff:VLC_FALSE];
-        }
+        [self changeFiltersString:"marq" onOrOff: [o_marq_enabled_ckb state]];
+
         [self enableMarq];
     }
     if( sender == o_logo_enabled_ckb )
     {
-        if( [o_logo_enabled_ckb state] == NSOnState )
-        {
-            [self changeFiltersString:(char *)"logo" onOrOff:VLC_TRUE];
-        }
-        else
-        {
-            [self changeFiltersString:(char *)"logo" onOrOff:VLC_FALSE];
-        }
+        [self changeFiltersString:"logo" onOrOff: [o_logo_enabled_ckb state]];
+
         [self enableLogo];
     }
     if( sender == o_time_enabled_ckb )
     {
-        if( [o_time_enabled_ckb state] == NSOnState )
-        {
-            [self changeFiltersString:(char *)"time" onOrOff:VLC_TRUE];
-        }
-        else
-        {
-            [self changeFiltersString:(char *)"time" onOrOff:VLC_FALSE];
-        }
+        [self changeFiltersString:"time" onOrOff: [o_time_enabled_ckb state]];
+
         [self enableTime];
     }
 }