* Menu item to maximize the volume in Mac OS X ;

* Dropped dependancy on autoconf 2.52.

configure.in

@@ -196,12 +196,16 @@ AC_CHECK_HEADERS(linux/version.h)
 AC_HEADER_TIME
 
 dnl Mac OS X and other OSes don't have declaration for nanosleep
-dnl This only works with autoconf 2.52
-AC_CHECK_DECLS(nanosleep)
+AC_EGREP_HEADER(nanosleep,time.h,[
+  AC_DEFINE(HAVE_DECL_NANOSLEEP, 1,
+            Define if <time.h> defines nanosleep.)
+])
 
 dnl Make sure we have timespecs
-dnl This only works with autoconf 2.52
-AC_CHECK_TYPES(struct timespec)
+AC_EGREP_HEADER(timespec,sys/time.h,[
+  AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1,
+            Define if <sys/time.h> defines struct timespec.)
+])
 
 dnl Check for threads library
 AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)

extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib

@@ -6,6 +6,7 @@
                 eject = id; 
                 faster = id; 
                 fullscreen = id; 
+                maxvolume = id; 
                 mute = id; 
                 next = id; 
                 pause = id; 

extras/MacOSX/vlc.pbproj/project.pbxproj

@@ -255,11 +255,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.1</string>
+	<string>0.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>VLC#</string>
 	<key>CFBundleVersion</key>
-	<string>0.3.1</string>
+	<string>0.4.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

plugins/macosx/intf_controller.h

@@ -2,7 +2,7 @@
  * intf_controller.h: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_controller.h,v 1.6 2002/05/06 22:59:46 massiot Exp $
+ * $Id: intf_controller.h,v 1.7 2002/05/18 13:33:44 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *
@@ -76,6 +76,7 @@
 - (IBAction)mute:(id)sender;
 - (IBAction)fullscreen:(id)fullscreen;
 - (IBAction)eject:(id)sender;
+- (IBAction)maxvolume:(id)sender;
 - (IBAction)timesliderUpdate:(id)slider;
 - (IBAction)quit:(id)sender;
 

plugins/macosx/intf_controller.m

@@ -2,7 +2,7 @@
  * intf_controller.c: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_controller.m,v 1.1 2002/05/12 20:56:33 massiot Exp $
+ * $Id: intf_controller.m,v 1.2 2002/05/18 13:33:44 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -181,6 +181,11 @@
     [o_intf eject];
 }
 
+- (IBAction)maxvolume:(id)sender
+{
+    [o_intf maxvolume];
+}
+
 - (IBAction)timesliderUpdate:(id)slider
 {
     switch( [[NSApp currentEvent] type] )

plugins/macosx/intf_vlc_wrapper.h

@@ -2,7 +2,7 @@
  * intf_vlc_wrapper.h: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_vlc_wrapper.h,v 1.7 2002/05/12 01:39:36 massiot Exp $
+ * $Id: intf_vlc_wrapper.h,v 1.8 2002/05/18 13:33:44 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -46,6 +46,7 @@
 - (void)playSlower;
 - (void)playFaster;
 - (void)mute;
+- (void)maxvolume;
 - (void)fullscreen;
 - (void)eject;
 

plugins/macosx/intf_vlc_wrapper.m

@@ -2,7 +2,7 @@
  * intf_vlc_wrapper.c: MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: intf_vlc_wrapper.m,v 1.2 2002/05/14 20:13:04 massiot Exp $
+ * $Id: intf_vlc_wrapper.m,v 1.3 2002/05/18 13:33:44 massiot Exp $
  *
  * Authors: Florian G. Pflug <fgp@phlo.org>
  *          Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -242,6 +242,20 @@ static Intf_VLCWrapper *o_intf = nil;
     p_main->p_intf->p_sys->b_mute = !p_main->p_intf->p_sys->b_mute;
 }
 
+- (void)maxvolume
+{
+    if( p_aout_bank->pp_aout[0] == NULL ) return;
+
+    if( p_main->p_intf->p_sys->b_mute )
+    {
+        p_main->p_intf->p_sys->i_saved_volume = VOLUME_MAX;
+    }
+    else
+    {
+        p_aout_bank->pp_aout[0]->i_volume = VOLUME_MAX;
+    }
+}
+
 - (void)fullscreen
 {
     if( p_vout_bank->pp_vout[0] != NULL )

src/misc/mtime.c

@@ -3,7 +3,7 @@
  * Functions are prototyped in mtime.h.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: mtime.c,v 1.30 2002/05/17 16:38:41 sam Exp $
+ * $Id: mtime.c,v 1.31 2002/05/18 13:33:44 massiot Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -55,8 +55,8 @@
 #if defined(HAVE_NANOSLEEP) && !defined(HAVE_STRUCT_TIMESPEC)
 struct timespec
 {
-    time_t tv_sec;
-    long tv_sec;
+    time_t  tv_sec;
+    int32_t tv_nsec;
 };
 #endif