* set svn:keywords correctly and fixed some minor stuff here and there

diff --git a/modules/gui/minimal_macosx/VLCMinimalVoutWindow.h b/modules/gui/minimal_macosx/VLCMinimalVoutWindow.h
index 1ce8e273907cfe3c2d1b5f8c1fdf24f1668af3ee..4dcc6c2989e3c1f4be6d0391b785b7ca89009dff 100644 (file)
--- a/modules/gui/minimal_macosx/VLCMinimalVoutWindow.h
+++ b/modules/gui/minimal_macosx/VLCMinimalVoutWindow.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * VLCMinimalVoutWindow.h: MacOS X Minimal window for a vout
  *****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
+ * Copyright (C) 2007 the VideoLAN team
  * $Id$
  *
  * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>

diff --git a/modules/gui/minimal_macosx/VLCMinimalVoutWindow.m b/modules/gui/minimal_macosx/VLCMinimalVoutWindow.m
index 5025b36e6df71a3163612ddc3645a039c0361600..1ea5c7b346331e246bc4faa79b2f2ef2910c70fb 100644 (file)
--- a/modules/gui/minimal_macosx/VLCMinimalVoutWindow.m
+++ b/modules/gui/minimal_macosx/VLCMinimalVoutWindow.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * VLCMinimalVoutWindow.m: MacOS X Minimal interface window
  *****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
+ * Copyright (C) 2007 the VideoLAN team
  * $Id$
  *
  * Authors: Pierre d'Herbemont <pdherbemont # videolan.org>

diff --git a/modules/gui/minimal_macosx/VLCOpenGLVoutView.h b/modules/gui/minimal_macosx/VLCOpenGLVoutView.h
index df1b05f45515b404f6278279f28bd22a350cba8d..ecea9c3ecd9069b453e2ace84741dd296d1e3c09 100644 (file)
--- a/modules/gui/minimal_macosx/VLCOpenGLVoutView.h
+++ b/modules/gui/minimal_macosx/VLCOpenGLVoutView.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * VLCOpenGLVoutView.h: MacOS X OpenGL provider
  *****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>

diff --git a/modules/gui/minimal_macosx/VLCOpenGLVoutView.m b/modules/gui/minimal_macosx/VLCOpenGLVoutView.m
index 0b6601ca8174eda7c843fbe97a3d4028f3e51358..4fff7ffc233bfbe48ea93246ad60711843fbb7a6 100644 (file)
--- a/modules/gui/minimal_macosx/VLCOpenGLVoutView.m
+++ b/modules/gui/minimal_macosx/VLCOpenGLVoutView.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * VLCOpenGLVoutView.m: MacOS X OpenGL provider
  *****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
@@ -11,7 +11,7 @@
  *          Eric Petit <titer@m0k.org>
  *          Benjamin Pracht <bigben at videolan dot org>
  *          Damien Fouilleul <damienf at videolan dot org>
- *          Pierr d'Herbemont <pdherbemont at videolan dot org>
+ *          Pierre d'Herbemont <pdherbemont 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/minimal_macosx/intf.h b/modules/gui/minimal_macosx/intf.h
index 0876f4d215c3dde5ac09b5e7e013e9fdf2f43e2f..fe46bb31a5f975bdd605daaf4bb2e199d0dbf890 100644 (file)
--- a/modules/gui/minimal_macosx/intf.h
+++ b/modules/gui/minimal_macosx/intf.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * intf.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -36,9 +36,6 @@
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
- 
-/* switch this to 1, if you want to use Obj-C with GC */
-#define GC_ENABLED 0
 
 /*****************************************************************************
  * intf_sys_t: description and status of the interface

diff --git a/modules/gui/minimal_macosx/macosx.c b/modules/gui/minimal_macosx/macosx.c
index 8d050696b2a29e7e17304df8e320725552a34b33..7281de8855e6717123fca598ccd7cab116e5fff4 100644 (file)
--- a/modules/gui/minimal_macosx/macosx.c
+++ b/modules/gui/minimal_macosx/macosx.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * macosx.m: Mac OS X module for vlc
+ * macosx.m: minimal Mac OS X module for vlc
  *****************************************************************************
- * Copyright (C) 2001-2006 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
@@ -48,7 +48,7 @@ void E_(CloseVideoGL) ( vlc_object_t * );
 vlc_module_begin();
     /* Minimal interface. see intf.m */
     set_shortname( _( "minimal_macosx" ));
-    set_description( _("Mac OS X minimal interface") );
+    set_description( _("Minimal Mac OS X interface") );
     set_capability( "interface", 50 );
     set_callbacks( E_(OpenIntf), E_(CloseIntf) );
     set_category( CAT_INTERFACE );
@@ -56,7 +56,7 @@ vlc_module_begin();
 
     add_submodule();
         /* Will be loaded even without interface module. see voutgl.m */
-        set_description( "Mac OS X minimal OpenGL video output (opens a borderless window)" );
+        set_description( _("Minimal Mac OS X OpenGL video output (opens a borderless window)") );
         set_capability( "opengl provider", 50 );
         set_category( CAT_VIDEO);
         set_subcategory( SUBCAT_VIDEO_VOUT );

diff --git a/modules/gui/minimal_macosx/voutagl.m b/modules/gui/minimal_macosx/voutagl.m
index 9c6af42d1d4f023be6008ad0111a32f29c4a0967..60b9ae8a969940decfe9bcfa77525927d699e51f 100644 (file)
--- a/modules/gui/minimal_macosx/voutagl.m
+++ b/modules/gui/minimal_macosx/voutagl.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * voutagl.c: MacOS X agl OpenGL provider (used by webbrowser.plugin)
  *****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
@@ -66,7 +66,7 @@ int aglInit( vout_thread_t * p_vout )
     pixFormat = aglChoosePixelFormat(NULL, 0, ATTRIBUTES);
     if( NULL == pixFormat )
     {
-        msg_Err( p_vout, "no screen renderer available for required attributes." );
+        msg_Err( p_vout, "No screen renderer available for required attributes." );
         return VLC_EGENERIC;
     }
     
@@ -74,7 +74,7 @@ int aglInit( vout_thread_t * p_vout )
     aglDestroyPixelFormat(pixFormat);
     if( NULL == p_vout->p_sys->agl_ctx )
     {
-        msg_Err( p_vout, "cannot create AGL context." );
+        msg_Err( p_vout, "Cannot create AGL context." );
         return VLC_EGENERIC;
     }
     else {

diff --git a/modules/gui/minimal_macosx/voutgl.h b/modules/gui/minimal_macosx/voutgl.h
index 7dea3f133a8d14b110af25fa6832b34da574a27d..8069c4f4eed989020bd7fd8fbc0d90bbe9cf7852 100644 (file)
--- a/modules/gui/minimal_macosx/voutgl.h
+++ b/modules/gui/minimal_macosx/voutgl.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * voutgl.h: MacOS X OpenGL provider
  *****************************************************************************
- * Copyright (C) 2001-2006 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>

diff --git a/modules/gui/minimal_macosx/voutgl.m b/modules/gui/minimal_macosx/voutgl.m
index 67d17c9a5ebe6a0c0a0dab0880cda1fe9bc06565..3db8bc526a8996973a7c316fad76125dd47aca32 100644 (file)
--- a/modules/gui/minimal_macosx/voutgl.m
+++ b/modules/gui/minimal_macosx/voutgl.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * voutgl.m: MacOS X OpenGL provider
  *****************************************************************************
- * Copyright (C) 2001-2004 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
@@ -40,7 +40,7 @@ int E_(OpenVideoGL)  ( vlc_object_t * p_this )
 
     if( !CGDisplayUsesOpenGLAcceleration( kCGDirectMainDisplay ) )
     {
-        msg_Warn( p_vout, "no OpenGL hardware acceleration found. "
+        msg_Warn( p_vout, "No OpenGL hardware acceleration found. "
                           "Video display will be slow" );
         return( 1 );
     }