From d016a4283ea29e3596172e4c761f6d66c0d44268 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= Date: Sun, 17 Sep 2006 22:39:21 +0000 Subject: [PATCH] * removed an outdated method instead of commenting it --- modules/gui/macosx/AppleRemote.h | 4 +-- modules/gui/macosx/AppleRemote.m | 4 +-- modules/gui/macosx/controls.h | 1 + modules/gui/macosx/controls.m | 3 ++- modules/gui/macosx/embeddedwindow.h | 2 +- modules/gui/macosx/embeddedwindow.m | 2 +- modules/gui/macosx/playlist.h | 2 +- modules/gui/macosx/playlist.m | 42 ----------------------------- modules/gui/macosx/wizard.h | 2 +- 9 files changed, 11 insertions(+), 51 deletions(-) diff --git a/modules/gui/macosx/AppleRemote.h b/modules/gui/macosx/AppleRemote.h index f41db7c4c7..d53225f84e 100644 --- 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 0029f04ab8..1b5dafe6e5 100644 --- 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 a95d5067fd..cd5ab7d7d5 100644 --- a/modules/gui/macosx/controls.h +++ b/modules/gui/macosx/controls.h @@ -7,6 +7,7 @@ * Authors: Jon Lech Johansen * Christophe Massiot * Derk-Jan Hartman + * Felix Kühne * * 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 d78236a7c4..cf69ad320b 100644 --- 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 * Christophe Massiot * Derk-Jan Hartman * Benjamin Pracht + * Felix KŸhne * * 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 ab1c9dba81..5deb2a8a2b 100644 --- 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 diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m index 53553025ee..a90f818cb7 100644 --- 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 diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h index 46e425cdf5..907ec03030 100644 --- 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 diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index a2c99976f0..d1d066af7c 100644 --- 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 55b1656ee7..52fbdb3372 100644 --- 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 -- 2.39.2