Commit bfdbb36f authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files

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

parent a0e5fe35
......@@ -22,6 +22,7 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "intf.h"
#import <vlc/vlc.h>
@interface VLCBookmarks : NSObject
......
......@@ -35,7 +35,6 @@
*****************************************************************************/
#import "bookmarks.h"
#import "intf.h"
#import "wizard.h"
#import <vlc_interface.h>
......
......@@ -26,6 +26,7 @@
*****************************************************************************/
#import <Cocoa/Cocoa.h>
#import "intf.h"
#import <vlc/vlc.h>
@interface VLCExtended : NSObject
......
......@@ -27,7 +27,6 @@
*****************************************************************************/
#import "extended.h"
#import "intf.h"
#import "vout.h"
#import <vlc_aout.h>
#import <vlc_vout.h>
......
/*****************************************************************************
* 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
......
/*****************************************************************************
* 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];
}
}
......
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