* removed an outdated method instead of commenting it

diff --git a/modules/gui/macosx/AppleRemote.h b/modules/gui/macosx/AppleRemote.h
index f41db7c4c79a60177934906923af275a4ca4cf6c..d53225f84ec62fc7dde1cc0f5e6f9d091f59ff6d 100644 (file)
--- a/modules/gui/macosx/AppleRemote.h
+++ b/modules/gui/macosx/AppleRemote.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * AppleRemote.h
  * AppleRemote
- * $Id:$
+ * $Id$
  *
  * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
  * Copyright (c) 2006 martinkahr.com. All rights reserved.
@@ -28,7 +28,7 @@
  *
  * Note that changes made by any members or contributors of the VideoLAN team
  * (i.e. changes that were checked in into one of VideoLAN's source code
- * repositories are licensed under the GNU General Public License version 2,
+ * repositories) are licensed under the GNU General Public License version 2,
  * or (at your option) any later version. 
  * Thus, the following statements apply to our changes:
  *

diff --git a/modules/gui/macosx/AppleRemote.m b/modules/gui/macosx/AppleRemote.m
index 0029f04ab8d62c35f1f2c21d0abb3f24c7f1d5b0..1b5dafe6e548d9685cc583365ae9400d6d3a3cac 100644 (file)
--- a/modules/gui/macosx/AppleRemote.m
+++ b/modules/gui/macosx/AppleRemote.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * AppleRemote.m
  * AppleRemote
- * $Id:$
+ * $Id$
  *
  * Created by Martin Kahr on 11.03.06 under a MIT-style license. 
  * Copyright (c) 2006 martinkahr.com. All rights reserved.
@@ -28,7 +28,7 @@
  *
  * Note that changes made by any members or contributors of the VideoLAN team
  * (i.e. changes that were checked in to one of VideoLAN's source code
- * repositories are licensed under the GNU General Public License version 2,
+ * repositories) are licensed under the GNU General Public License version 2,
  * or (at your option) any later version. 
  * Thus, the following statements apply to our changes:
  *

diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h
index a95d5067fdb3e67bca738a5b8bec7239ab36a0eb..cd5ab7d7d5ced281c1d37968972ac84b5c514fda 100644 (file)
--- a/modules/gui/macosx/controls.h
+++ b/modules/gui/macosx/controls.h
@@ -7,6 +7,7 @@
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
+ *          Felix Kühne <fkuehne at videolan 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

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index d78236a7c4ee017d132d8a1a5397572d6fe35a93..cf69ad320bb0281c79963487db364cf8124c82b6 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -1,13 +1,14 @@
 /*****************************************************************************
  * controls.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
+ * Copyright (C) 2002-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *          Derk-Jan Hartman <hartman at videolan dot org>
  *          Benjamin Pracht <bigben at videolan doit org>
+ *          Felix K\9fhne <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

diff --git a/modules/gui/macosx/embeddedwindow.h b/modules/gui/macosx/embeddedwindow.h
index ab1c9dba819cffae10f8995d2d931fe1fcea563e..5deb2a8a2b5c6bb6f7e09a455061c0e0e391f366 100644 (file)
--- a/modules/gui/macosx/embeddedwindow.h
+++ b/modules/gui/macosx/embeddedwindow.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * embeddedwindow.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
+ * Copyright (C) 2005-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Benjamin Pracht <bigben at videolan dot org> 

diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m
index 53553025eeb6b3da9db41f6b6fdb105cb3fafd62..a90f818cb75e55f7c608c8d4481e4b624f06a8b8 100644 (file)
--- a/modules/gui/macosx/embeddedwindow.m
+++ b/modules/gui/macosx/embeddedwindow.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * embeddedwindow.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
+ * Copyright (C) 2005-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Benjamin Pracht <bigben at videolan dot org>

diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index 46e425cdf53f29d24af2e3c5ed8690f1e3e49dff..907ec03030311051c2a04fc6e4fe75195a97245b 100644 (file)
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * playlist.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
+ * Copyright (C) 2002-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index a2c99976f0715bf57f0e23425ad4d9893a2ebbae..d1d066af7ca69aee52c0cfe62e7c2cc288b15e69 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -1067,49 +1067,7 @@ NSLog( @"expandable" );
     [self playlistUpdated];
     vlc_object_release( p_playlist );
 }
-/* FIXME!!
-- (IBAction)handlePopUp:(id)sender
 
-{
-    intf_thread_t * p_intf = VLCIntf;
-    vlc_value_t val1,val2;
-    playlist_t * p_playlist = pl_Yield( p_intf );
-
-    switch( [o_loop_popup indexOfSelectedItem] )
-    {
-        case 1:
-
-             val1.b_bool = 0;
-             var_Set( p_playlist, "loop", val1 );
-             val1.b_bool = 1;
-             var_Set( p_playlist, "repeat", val1 );
-             vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat One" ) );
-        break;
-
-        case 2:
-             val1.b_bool = 0;
-             var_Set( p_playlist, "repeat", val1 );
-             val1.b_bool = 1;
-             var_Set( p_playlist, "loop", val1 );
-             vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat All" ) );
-        break;
-
-        default:
-             var_Get( p_playlist, "repeat", &val1 );
-             var_Get( p_playlist, "loop", &val2 );
-             if( val1.b_bool || val2.b_bool )
-             {
-                  val1.b_bool = 0;
-                  var_Set( p_playlist, "repeat", val1 );
-                  var_Set( p_playlist, "loop", val1 );
-                  vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Repeat Off" ) );
-             }
-         break;
-     }
-     vlc_object_release( p_playlist );
-     [self playlistUpdated];
-}
-*/
 - (NSMutableArray *)subSearchItem:(playlist_item_t *)p_item
 {
     playlist_t *p_playlist = pl_Yield( VLCIntf );

diff --git a/modules/gui/macosx/wizard.h b/modules/gui/macosx/wizard.h
index 55b1656ee7526a3421a06e28df7b928a835a3f0b..52fbdb3372d63e63bf7eab0b987a64a4ec404173 100644 (file)
--- a/modules/gui/macosx/wizard.h
+++ b/modules/gui/macosx/wizard.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * wizard.h: MacOS X Streaming Wizard
  *****************************************************************************
- * Copyright (C) 2005 the VideoLAN team
+ * Copyright (C) 2005-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Felix Kühne <fkuehne@users.sf.net>