macosx: copyright fixes

modules/gui/macosx/AppleRemote.h

@@ -32,7 +32,7 @@
  * 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>
  *

modules/gui/macosx/AppleRemote.m

@@ -32,7 +32,7 @@
  * 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>
  *

modules/gui/macosx/AudioEffects.h

 /*****************************************************************************
  * 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>
@@ -48,6 +48,22 @@
     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;
@@ -106,6 +122,7 @@
 
 /* Equalizer */
 - (void)setupEqualizer;
+- (void)rebuildEqMenu;
 - (void)equalizerUpdated;
 - (void)setBandSlidersValues:(float *)values;
 - (void)initBandSliders;
@@ -115,6 +132,10 @@
 - (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;

modules/gui/macosx/AudioEffects.m

 /*****************************************************************************
  * 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>
@@ -54,12 +54,22 @@ static VLCAudioEffects *_o_sharedInstance = nil;
         [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 */
@@ -67,12 +77,16 @@ static VLCAudioEffects *_o_sharedInstance = nil;
     [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")];
@@ -190,7 +204,7 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
 {
     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 )
     {
@@ -234,11 +248,37 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
             }
         }
         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];
@@ -360,33 +400,52 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
 }
 - (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
 {
@@ -419,6 +478,64 @@ static bool GetEqualizerStatus( intf_thread_t *p_custom_intf,
     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

modules/gui/macosx/CompatibilityFixes.h

 /*****************************************************************************
- * 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>

modules/gui/macosx/MainWindow.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/MainWindow.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/TrackSynchronization.h

 /*****************************************************************************
  * 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$
  *

modules/gui/macosx/TrackSynchronization.m

 /*****************************************************************************
  * 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$
  *

modules/gui/macosx/VideoView.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/VideoView.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/about.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/about.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/applescript.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/applescript.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/bookmarks.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/bookmarks.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/controls.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/controls.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/coredialogs.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/coredialogs.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/eyetv.h

-/*****************************************************************************
-* eyetv.h: small class to control the notification parts of the EyeTV plugin
-*****************************************************************************
-* Copyright (C) 2006-2007 the VideoLAN team
-* $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.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

modules/gui/macosx/eyetv.m

 /*****************************************************************************
 * 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>

modules/gui/macosx/intf.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/intf.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/macosx.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/misc.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/misc.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/open.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/open.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/output.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/output.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/playlist.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/playlist.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/playlistinfo.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/playlistinfo.m

 /*****************************************************************************
  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>

modules/gui/macosx/prefs.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/prefs.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/prefs_widgets.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/prefs_widgets.m

 /*****************************************************************************
  * 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>

modules/gui/macosx/simple_prefs.h

 /*****************************************************************************
 * 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>

modules/gui/macosx/simple_prefs.m

 /*****************************************************************************
 * 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>

modules/gui/macosx/wizard.h

 /*****************************************************************************
  * 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>

modules/gui/macosx/wizard.m

 /*****************************************************************************
  * 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>