Commit 80b9aa2b authored by Christophe Massiot's avatar Christophe Massiot

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

* Dropped dependancy on autoconf 2.52.
parent d55f5d62
This diff is collapsed.
...@@ -196,12 +196,16 @@ AC_CHECK_HEADERS(linux/version.h) ...@@ -196,12 +196,16 @@ AC_CHECK_HEADERS(linux/version.h)
AC_HEADER_TIME AC_HEADER_TIME
dnl Mac OS X and other OSes don't have declaration for nanosleep dnl Mac OS X and other OSes don't have declaration for nanosleep
dnl This only works with autoconf 2.52 AC_EGREP_HEADER(nanosleep,time.h,[
AC_CHECK_DECLS(nanosleep) AC_DEFINE(HAVE_DECL_NANOSLEEP, 1,
Define if <time.h> defines nanosleep.)
])
dnl Make sure we have timespecs dnl Make sure we have timespecs
dnl This only works with autoconf 2.52 AC_EGREP_HEADER(timespec,sys/time.h,[
AC_CHECK_TYPES(struct timespec) AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1,
Define if <sys/time.h> defines struct timespec.)
])
dnl Check for threads library dnl Check for threads library
AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h) AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
eject = id; eject = id;
faster = id; faster = id;
fullscreen = id; fullscreen = id;
maxvolume = id;
mute = id; mute = id;
next = id; next = id;
pause = id; pause = id;
......
...@@ -255,11 +255,11 @@ ...@@ -255,11 +255,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.3.1</string> <string>0.4.0</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>VLC#</string> <string>VLC#</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>0.3.1</string> <string>0.4.0</string>
<key>NSMainNibFile</key> <key>NSMainNibFile</key>
<string>MainMenu</string> <string>MainMenu</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>
......
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_controller.h: MacOS X plugin for vlc * intf_controller.h: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Florian G. Pflug <fgp@phlo.org>
* *
...@@ -76,6 +76,7 @@ ...@@ -76,6 +76,7 @@
- (IBAction)mute:(id)sender; - (IBAction)mute:(id)sender;
- (IBAction)fullscreen:(id)fullscreen; - (IBAction)fullscreen:(id)fullscreen;
- (IBAction)eject:(id)sender; - (IBAction)eject:(id)sender;
- (IBAction)maxvolume:(id)sender;
- (IBAction)timesliderUpdate:(id)slider; - (IBAction)timesliderUpdate:(id)slider;
- (IBAction)quit:(id)sender; - (IBAction)quit:(id)sender;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_controller.c: MacOS X plugin for vlc * intf_controller.c: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net> * Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -181,6 +181,11 @@ ...@@ -181,6 +181,11 @@
[o_intf eject]; [o_intf eject];
} }
- (IBAction)maxvolume:(id)sender
{
[o_intf maxvolume];
}
- (IBAction)timesliderUpdate:(id)slider - (IBAction)timesliderUpdate:(id)slider
{ {
switch( [[NSApp currentEvent] type] ) switch( [[NSApp currentEvent] type] )
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_vlc_wrapper.h: MacOS X plugin for vlc * intf_vlc_wrapper.h: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net> * Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
- (void)playSlower; - (void)playSlower;
- (void)playFaster; - (void)playFaster;
- (void)mute; - (void)mute;
- (void)maxvolume;
- (void)fullscreen; - (void)fullscreen;
- (void)eject; - (void)eject;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf_vlc_wrapper.c: MacOS X plugin for vlc * intf_vlc_wrapper.c: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * 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> * Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net> * Jon Lech Johansen <jon-vl@nanocrew.net>
...@@ -242,6 +242,20 @@ static Intf_VLCWrapper *o_intf = nil; ...@@ -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; 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 - (void)fullscreen
{ {
if( p_vout_bank->pp_vout[0] != NULL ) if( p_vout_bank->pp_vout[0] != NULL )
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Functions are prototyped in mtime.h. * Functions are prototyped in mtime.h.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * 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> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* *
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
struct timespec struct timespec
{ {
time_t tv_sec; time_t tv_sec;
long tv_sec; int32_t tv_nsec;
}; };
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment