* or (at your option) any later version.
* Thus, the following statements apply to our changes:
*
- * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2006-2007 VLC authors and VideoLAN
* Authors: Eric Petit <titer@m0k.org>
* Felix Kühne <fkuehne at videolan dot org>
*
* or (at your option) any later version.
* Thus, the following statements apply to our changes:
*
- * Copyright (C) 2006-2009 the VideoLAN team
+ * Copyright (C) 2006-2009 VLC authors and VideoLAN
* Authors: Eric Petit <titer@m0k.org>
* Felix Kühne <fkuehne at videolan dot org>
*
/*****************************************************************************
* AudioEffects.h: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2004-2011 the VideoLAN team
+ * Copyright (C) 2004-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
IBOutlet id o_eq_band10_sld;
IBOutlet id o_eq_preamp_sld;
+ /* equalizer presets */
+ IBOutlet id o_eqp_panel;
+ IBOutlet id o_eqp_ok_btn;
+ IBOutlet id o_eqp_cancel_btn;
+ IBOutlet id o_eqp_new_lbl;
+ IBOutlet id o_eqp_new_fld;
+ IBOutlet id o_eq_manage_panel;
+ IBOutlet id o_eq_manage_ok_btn;
+ IBOutlet id o_eq_manage_cancel_btn;
+ IBOutlet id o_eq_manage_rename_btn;
+ IBOutlet id o_eq_manage_delete_btn;
+ IBOutlet id o_eq_manage_table;
+ NSMutableArray *o_eq_custom_presets;
+ NSMutableArray *o_eq_custom_presetnames;
+ NSInteger i_to_be_renamed_preset;
+
/* Compressor */
IBOutlet id o_comp_enable_ckb;
IBOutlet id o_comp_reset_btn;
/* Equalizer */
- (void)setupEqualizer;
+- (void)rebuildEqMenu;
- (void)equalizerUpdated;
- (void)setBandSlidersValues:(float *)values;
- (void)initBandSliders;
- (IBAction)eq_enable:(id)sender;
- (IBAction)eq_preampSliderUpdated:(id)sender;
- (IBAction)eq_twopass:(id)sender;
+- (IBAction)eq_nameButtonAction:(id)sender;
+- (IBAction)eq_manageAction:(id)sender;
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView;
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;
/* Compressor */
- (void)resetCompressor;
/*****************************************************************************
* AudioEffects.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2004-2011 the VideoLAN team
+ * Copyright (C) 2004-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
[self dealloc];
} else {
p_intf = VLCIntf;
+ o_eq_custom_presets = [[NSMutableArray alloc] init];
+ o_eq_custom_presetnames = [[NSMutableArray alloc] init];
_o_sharedInstance = [super init];
}
return _o_sharedInstance;
}
+- (void)dealloc
+{
+ [o_eq_custom_presets release];
+ [o_eq_custom_presetnames release];
+
+ [super dealloc];
+}
+
- (void)awakeFromNib
{
/* setup the user's language */
[o_eq_enable_ckb setTitle:_NS("Enable")];
[o_eq_twopass_ckb setTitle:_NS("2 Pass")];
[o_eq_preamp_lbl setStringValue:_NS("Preamp")];
- [o_eq_presets_popup removeAllItems];
- for( int i = 0; i < NB_PRESETS ; i++ )
- {
- [o_eq_presets_popup addItemWithTitle: _NS(preset_list_text[i])];
- [[o_eq_presets_popup lastItem] setTag: i];
- }
+ [self rebuildEqMenu];
+ [o_eqp_panel setTitle: _NS("New Preset Name")];
+ [o_eqp_ok_btn setTitle: _NS("OK")];
+ [o_eqp_cancel_btn setTitle: _NS("Cancel")];
+ [o_eqp_new_lbl setStringValue: _NS("New Preset Name")];
+ [o_eq_manage_panel setTitle: _NS("Manage Presets")];
+ [o_eq_manage_ok_btn setTitle: _NS("OK")];
+ [o_eq_manage_cancel_btn setTitle: _NS("Cancel")];
+ [o_eq_manage_rename_btn setTitle: _NS("Rename")];
+ [o_eq_manage_delete_btn setTitle: _NS("Delete")];
/* Compressor */
[o_comp_enable_ckb setTitle:_NS("Enable dynamic range compressor")];
{
vlc_object_t *p_object= VLC_OBJECT(getAout());
if( p_object == NULL )
- p_object = pl_Get( VLCIntf );
+ p_object = vlc_object_hold(pl_Get( VLCIntf ));
if( p_object )
{
}
}
free( psz_preset );
+ vlc_object_release( p_object );
}
[self equalizerUpdated];
}
+- (void)rebuildEqMenu
+{
+ [o_eq_presets_popup removeAllItems];
+ [o_eq_presets_popup addItemWithTitle: _NS("Add Preset")];
+ [[o_eq_presets_popup lastItem] setTag: 300];
+ [o_eq_presets_popup addItemWithTitle: _NS("Manage Presets")];
+ [[o_eq_presets_popup lastItem] setTag: 301];
+ [[o_eq_presets_popup menu] addItem: [NSMenuItem separatorItem]];
+ for (int i = 0; i < NB_PRESETS ; i++)
+ {
+ [o_eq_presets_popup addItemWithTitle: _NS(preset_list_text[i])];
+ [[o_eq_presets_popup lastItem] setTag: i];
+ }
+ if ([o_eq_custom_presetnames count] > 0)
+ {
+ [[o_eq_presets_popup menu] addItem: [NSMenuItem separatorItem]];
+ NSUInteger count = [o_eq_custom_presetnames count];
+ for (unsigned int i = 0; i < count; i++)
+ {
+ [o_eq_presets_popup addItemWithTitle: [o_eq_custom_presetnames objectAtIndex:i]];
+ [[o_eq_presets_popup lastItem] setTag: i + 200];
+ }
+ }
+}
+
- (void)equalizerUpdated
{
float f_preamp, f_band[10];
}
- (IBAction)eq_changePreset:(id)sender
{
- vlc_object_t *p_object= VLC_OBJECT(getAout());
- if( p_object == NULL )
- p_object = vlc_object_hold(pl_Get( p_intf ));
NSInteger numberOfChosenPreset = [[sender selectedItem] tag];
-
- var_SetString( p_object , "equalizer-preset" , preset_list[numberOfChosenPreset] );
-
- NSString *preset = @"";
- const char *psz_values;
- for( int i = 0; i < EQZ_BANDS_MAX; i++ )
+ if (numberOfChosenPreset == 300)
{
- preset = [preset stringByAppendingFormat:@"%.1f ", eqz_preset_10b[numberOfChosenPreset].f_amp[i] ];
+ // add new preset
+ i_to_be_renamed_preset = -1;
+ [NSApp runModalForWindow: o_eqp_panel];
}
- psz_values = [preset UTF8String];
- var_SetString( p_object, "equalizer-bands", psz_values );
- var_SetFloat( p_object, "equalizer-preamp", eqz_preset_10b[[[sender selectedItem] tag]].f_preamp);
-
- [o_eq_preamp_sld setFloatValue: eqz_preset_10b[numberOfChosenPreset].f_preamp];
-
- [self setBandSlidersValues:(float *)eqz_preset_10b[numberOfChosenPreset].f_amp];
-
- /* save changed to config */
- config_PutPsz( p_intf, "equalizer-bands", psz_values );
- config_PutFloat( p_intf, "equalizer-preamp", eqz_preset_10b[numberOfChosenPreset].f_preamp );
- config_PutPsz( p_intf, "equalizer-preset", preset_list[numberOfChosenPreset] );
+ else if(numberOfChosenPreset == 301)
+ {
+ // manage presets
+ [o_eq_manage_table reloadData];
+ [NSApp runModalForWindow: o_eq_manage_panel];
+ }
+ else if(numberOfChosenPreset >= 200)
+ {
+ // custom preset, TODO
+ }
+ else
+ {
+ vlc_object_t *p_object= VLC_OBJECT(getAout());
+ if( p_object == NULL )
+ p_object = vlc_object_hold(pl_Get( p_intf ));
- vlc_object_release( p_object );
+ var_SetString( p_object , "equalizer-preset" , preset_list[numberOfChosenPreset] );
+
+ NSString *preset = @"";
+ const char *psz_values;
+ for( int i = 0; i < EQZ_BANDS_MAX; i++ )
+ {
+ preset = [preset stringByAppendingFormat:@"%.1f ", eqz_preset_10b[numberOfChosenPreset].f_amp[i] ];
+ }
+ psz_values = [preset UTF8String];
+ var_SetString( p_object, "equalizer-bands", psz_values );
+ var_SetFloat( p_object, "equalizer-preamp", eqz_preset_10b[numberOfChosenPreset].f_preamp);
+
+ [o_eq_preamp_sld setFloatValue: eqz_preset_10b[numberOfChosenPreset].f_preamp];
+
+ [self setBandSlidersValues:(float *)eqz_preset_10b[numberOfChosenPreset].f_amp];
+
+ /* save changed to config */
+ config_PutPsz( p_intf, "equalizer-bands", psz_values );
+ config_PutFloat( p_intf, "equalizer-preamp", eqz_preset_10b[numberOfChosenPreset].f_preamp );
+ config_PutPsz( p_intf, "equalizer-preset", preset_list[numberOfChosenPreset] );
+
+ vlc_object_release( p_object );
+ }
}
- (IBAction)eq_preampSliderUpdated:(id)sender
{
vlc_object_release( p_object );
}
+- (IBAction)eq_nameButtonAction:(id)sender
+{
+ [NSApp stopModal];
+ [[sender window] orderOut:sender];
+
+ if (sender == o_eqp_ok_btn)
+ {
+ if (i_to_be_renamed_preset != -1)
+ {
+ // rename existing preset
+ [o_eq_custom_presetnames replaceObjectAtIndex:i_to_be_renamed_preset withObject:[o_eqp_new_fld stringValue]];
+ [o_eq_manage_table reloadData];
+ [self rebuildEqMenu];
+ }
+ else
+ {
+ // add new preset
+ [o_eq_custom_presetnames addObject: [o_eqp_new_fld stringValue]];
+ [self rebuildEqMenu];
+
+ // TODO
+ }
+ }
+}
+
+- (IBAction)eq_manageAction:(id)sender
+{
+ if (sender == o_eq_manage_cancel_btn || sender == o_eq_manage_ok_btn) {
+ [NSApp stopModal];
+ [[sender window] orderOut:sender];
+ }
+ else if( sender == o_eq_manage_delete_btn )
+ {
+ [o_eq_custom_presets removeObjectAtIndex: [o_eq_manage_table selectedRow]];
+ [o_eq_custom_presetnames removeObjectAtIndex: [o_eq_manage_table selectedRow]];
+ [o_eq_manage_table reloadData];
+ [self rebuildEqMenu];
+ }
+ else
+ {
+ i_to_be_renamed_preset = [o_eq_manage_table selectedRow];
+ [o_eqp_new_fld setStringValue: [o_eq_custom_presetnames objectAtIndex: i_to_be_renamed_preset]];
+ [NSApp stopModal];
+ [[sender window] orderOut:sender];
+ [NSApp runModalForWindow: o_eqp_panel];
+ }
+}
+
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
+{
+ return [o_eq_custom_presets count];
+}
+
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+ return [o_eq_custom_presetnames objectAtIndex:rowIndex];
+}
+
#pragma mark -
#pragma mark Compressor
- (void)resetCompressor
/*****************************************************************************
- * sdkfixes.h: MacOS X interface module
+ * CompatibilityFixes.h: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2011 VideoLAN
+ * Copyright (C) 2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
/*****************************************************************************
* MainWindow.h: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2011 VideoLAN
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
/*****************************************************************************
* MainWindow.h: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2011 VideoLAN
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
/*****************************************************************************
* TrackSynchronization.h: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2011 VideoLAN
+ * Copyright (C) 2011 VLC authors and VideoLAN
* Copyright (C) 2011 Felix Paul Kühne
* $Id$
*
/*****************************************************************************
* TrackSynchronization.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2011 VideoLAN
+ * Copyright (C) 2011 VLC authors and VideoLAN
* Copyright (C) 2011 Felix Paul Kühne
* $Id$
*
/*****************************************************************************
* VideoView.h: MacOS X video output module
*****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Derk-Jan Hartman <hartman at videolan dot org>
/*****************************************************************************
* VideoView.m: MacOS X video output module
*****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Derk-Jan Hartman <hartman at videolan dot org>
/*****************************************************************************
* about.h: MacOS X About Panel
*****************************************************************************
- * Copyright (C) 2001-2007 the VideoLAN team
+ * Copyright (C) 2001-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
/*****************************************************************************
* about.m: MacOS X About Panel
*****************************************************************************
- * Copyright (C) 2001-2011 the VideoLAN team
+ * Copyright (C) 2001-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
/*****************************************************************************
* applescript.h: MacOS X AppleScript support
*****************************************************************************
- * Copyright (C) 2002-2003, 2005, 2007 the VideoLAN team
+ * Copyright (C) 2002-2003, 2005, 2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
/*****************************************************************************
* applescript.m: MacOS X AppleScript support
*****************************************************************************
- * Copyright (C) 2002-2009 the VideoLAN team
+ * Copyright (C) 2002-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
/*****************************************************************************
* bookmarks.h: MacOS X Bookmarks window
*****************************************************************************
- * Copyright (C) 2005, 2007 the VideoLAN team
+ * Copyright (C) 2005, 2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Kühne <fkuehne at videolan dot org>
/*****************************************************************************
* bookmarks.m: MacOS X Bookmarks window
*****************************************************************************
- * Copyright (C) 2005 - 2007 the VideoLAN team
+ * Copyright (C) 2005 - 2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Kühne <fkuehne at videolan dot org>
/*****************************************************************************
* controls.h: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* controls.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* coredialogs.h: Mac OS X Core Dialogs
*****************************************************************************
- * Copyright (C) 2005-2009 the VideoLAN team
+ * Copyright (C) 2005-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Derk-Jan Hartman <hartman at videolan dot org>
/*****************************************************************************
* coredialogs.m: Mac OS X Core Dialogs
*****************************************************************************
- * Copyright (C) 2005-2009 the VideoLAN team
+ * Copyright (C) 2005-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Derk-Jan Hartman <hartman at videolan dot org>
-/*****************************************************************************\r
-* eyetv.h: small class to control the notification parts of the EyeTV plugin\r
-*****************************************************************************\r
-* Copyright (C) 2006-2007 the VideoLAN team\r
-* $Id$\r
-*\r
-* Authors: Felix Kühne <fkuehne at videolan dot org>\r
-*\r
-* This program is free software; you can redistribute it and/or modify\r
-* it under the terms of the GNU General Public License as published by\r
-* the Free Software Foundation; either version 2 of the License, or\r
-* (at your option) any later version.\r
-*\r
-* This program is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* along with this program; if not, write to the Free Software\r
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.\r
-*****************************************************************************/\r
-\r
-#import <Cocoa/Cocoa.h>\r
-\r
-\r
-@interface VLCEyeTVController : NSObject\r
-{\r
- BOOL b_eyeTVactive;\r
- BOOL b_deviceConnected;\r
-}\r
-- (void)globalNotificationReceived: (NSNotification *)theNotification;\r
-- (BOOL)isEyeTVrunning;\r
-- (BOOL)isDeviceConnected;\r
-- (void)launchEyeTV;\r
-- (int)currentChannel;\r
-- (int)switchChannelUp:(BOOL)b_yesOrNo;\r
-- (void)selectChannel:(int)theChannelNum;\r
-- (NSEnumerator *)allChannels;\r
-\r
-@end\r
+/*****************************************************************************
+* eyetv.h: small class to control the notification parts of the EyeTV plugin
+*****************************************************************************
+* Copyright (C) 2006-2007 VLC authors and VideoLAN
+* $Id$
+*
+* Authors: Felix 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
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+*****************************************************************************/
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface VLCEyeTVController : NSObject
+{
+ BOOL b_eyeTVactive;
+ BOOL b_deviceConnected;
+}
+- (void)globalNotificationReceived: (NSNotification *)theNotification;
+- (BOOL)isEyeTVrunning;
+- (BOOL)isDeviceConnected;
+- (void)launchEyeTV;
+- (int)currentChannel;
+- (int)switchChannelUp:(BOOL)b_yesOrNo;
+- (void)selectChannel:(int)theChannelNum;
+- (NSEnumerator *)allChannels;
+
+@end
/*****************************************************************************
* 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>
/*****************************************************************************
* intf.h: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* intf.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* macosx.m: Mac OS X module for vlc
*****************************************************************************
- * Copyright (C) 2001-2011 the VideoLAN team
+ * Copyright (C) 2001-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Colin Delacroix <colin@zoy.org>
/*****************************************************************************
* misc.h: code not specific to vlc
*****************************************************************************
- * Copyright (C) 2003-2011 the VideoLAN team
+ * Copyright (C) 2003-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* misc.m: code not specific to vlc
*****************************************************************************
- * Copyright (C) 2003-2011 the VideoLAN team
+ * Copyright (C) 2003-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* open.h: Open dialogues for VLC's MacOS X port
*****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* open.m: Open dialogues for VLC's MacOS X port
*****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* output.h: MacOS X Output Dialog
*****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* output.m: MacOS X Output Dialog
*****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* playlist.h: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2006 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* playlist.m: MacOS X interface module
*****************************************************************************
-* Copyright (C) 2002-2009 the VideoLAN team
+* Copyright (C) 2002-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* playlistinfo.h: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2008 the VideoLAN team
+ * Copyright (C) 2002-2008 VLC authors and VideoLAN
* $Id$
*
* Authors: Benjamin Pracht <bigben at videolan dot org>
/*****************************************************************************
r playlistinfo.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2009 the VideoLAN team
+ * Copyright (C) 2002-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Benjamin Pracht <bigben at videolan dot org>
/*****************************************************************************
* prefs.h: MacOS X module for vlc
*****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* prefs.m: MacOS X module for vlc
*****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2006 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
/*****************************************************************************
* prefs_widgets.h: Preferences controls
*****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Derk-Jan Hartman <hartman at videolan.org>
/*****************************************************************************
* prefs_widgets.m: Preferences controls
*****************************************************************************
- * Copyright (C) 2002-2011 the VideoLAN team
+ * Copyright (C) 2002-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Derk-Jan Hartman <hartman at videolan.org>
/*****************************************************************************
* simple_prefs.h: Simple Preferences for Mac OS X
*****************************************************************************
-* Copyright (C) 2008-2011 the VideoLAN team
+* Copyright (C) 2008-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
/*****************************************************************************
* simple_prefs.m: Simple Preferences for Mac OS X
*****************************************************************************
-* Copyright (C) 2008-2011 the VideoLAN team
+* Copyright (C) 2008-2011 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
/*****************************************************************************
* wizard.h: MacOS X Streaming Wizard
*****************************************************************************
- * Copyright (C) 2005-2007 the VideoLAN team
+ * Copyright (C) 2005-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Kühne <fkuehne at videolan dot org>
/*****************************************************************************
* wizard.m: MacOS X Streaming Wizard
*****************************************************************************
- * Copyright (C) 2005-2009 the VideoLAN team
+ * Copyright (C) 2005-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Kühne <fkuehne at videolan dot org>