Changeset 3a361d2f7684140a9adfc005185840bafb192f7c

Timestamp:

07/05/02 00:59:46 (7 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1020725986 +0000

git-parent:

[a4fcb5e2e8d543bdb6b50bc339d00324ae99b2f6]

git-author:

Christophe Massiot <massiot@videolan.org> 1020725986 +0000

Message:

Improvements of the OS X GUI.

Files:

• extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
• extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib (modified) (previous)
• include/config.h (modified) (2 diffs)
• plugins/macosx/intf_controller.c (modified) (2 diffs)
• plugins/macosx/intf_controller.h (modified) (2 diffs)
• plugins/macosx/intf_macosx.c (modified) (2 diffs)
• plugins/macosx/intf_open.h (modified) (2 diffs)
• plugins/macosx/intf_vlc_wrapper.c (modified) (5 diffs)
• plugins/macosx/intf_vlc_wrapper.h (modified) (3 diffs)
• plugins/macosx/macosx.h (modified) (3 diffs)
• src/interface/intf_eject.c (modified) (5 diffs)

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

@@ -4 +4 @@
-        {
-            ACTIONS = {
+                eject = id; 
-                faster = id; 
+                fullscreen = id; 
+                mute = id; 
-                next = id; 
-                pause = id; 

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

@@ -4 +4 @@
-<dict>
-    <key>IBDocumentLocation</key>
-729 10 500 426 0 0 1600 1178
+13 255 500 426 0 0 1152 746
-    <key>IBEditorPositions</key>
-    <dict>
+        <key>235</key>
+        <string>401 417 350 182 0 0 1152 746 </string>
-        <key>29</key>
-
+
+
+
-        <key>460</key>
-120 456 104 66 0 0 1600 1178
+84 279 104 66 0 0 1152 746
-    </dict>
-    <key>IBFramework Version</key>
-    <string>248.0</string>
+    <key>IBOpenObjects</key>
+    <array>
+        <integer>29</integer>
+        <integer>21</integer>
+    </array>
-    <key>IBSystem Version</key>
-    <string>5Q125</string>

include/config.h

@@ -106 +106 @@
-/* Duration between the time we receive the data packet, and the time we will
- * mark it to be presented */
-2
+35
-
-/*****************************************************************************
@@ -135 +135 @@
- *   song from the interface)
- * - long, in order to perform the buffer calculations as few as possible */
-10
+9
-
-/*****************************************************************************

plugins/macosx/intf_controller.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-6 2002/04/23 03:21:21 jlj
+7 2002/05/06 22:59:46 massiot
- *
- * Authors: Florian G. Pflug <fgp@phlo.org>
@@ -156 +156 @@
-}
-
+- (IBAction)mute:(id)sender
+{
+    NSMenuItem * item = (NSMenuItem *)sender;
+
+    [o_intf mute];
+
+    if( p_main->p_intf->p_sys->b_mute )
+    {
+        [item setState:NSOnState];
+    }
+    else
+    {
+        [item setState:NSOffState];
+    }
+}
+
+- (IBAction)fullscreen:(id)sender
+{
+    [o_intf fullscreen];
+}
+
+- (IBAction)eject:(id)sender
+{
+    [o_intf eject];
+}
+
-- (IBAction)timesliderUpdate:(id)slider
-{

plugins/macosx/intf_controller.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-5 2002/04/23 03:21:21 jlj
+6 2002/05/06 22:59:46 massiot
- *
- * Authors: Florian G. Pflug <fgp@phlo.org>
@@ -74 +74 @@
-- (IBAction)prev:(id)sender;
-- (IBAction)next:(id)sender;
+- (IBAction)mute:(id)sender;
+- (IBAction)fullscreen:(id)fullscreen;
+- (IBAction)eject:(id)sender;
-- (IBAction)timesliderUpdate:(id)slider;
-- (IBAction)quit:(id)sender;

plugins/macosx/intf_macosx.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-2 2002/04/16 23:00:54
+3 2002/05/06 22:59:46
- *
- * Authors: Colin Delacroix <colin@zoy.org>
@@ -68 +68 @@
-    p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
-    p_intf->p_sys->o_port = [[NSPort port] retain];
+    p_intf->p_sys->b_mute = 0;
-
-    [[NSApplication sharedApplication] autorelease];

plugins/macosx/intf_open.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-1 2002/04/23 03:21:21 jlj
+2 2002/05/06 22:59:46 massiot
- *
- * Authors: Jon Lech Johansen <jon-vl@nanocrew.net> 
@@ -26 +26 @@
- *****************************************************************************/
-#import <Cocoa/Cocoa.h>
+
+NSArray *GetEjectableMediaOfClass( const char *psz_class );
-
-/*****************************************************************************

plugins/macosx/intf_vlc_wrapper.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-0 2002/04/23 03:21:21 jlj
+1 2002/05/06 22:59:46 massiot
- *
- * Authors: Florian G. Pflug <fgp@phlo.org>
- *          Jon Lech Johansen <jon-vl@nanocrew.net>
+ *          Christophe Massiot <massiot@via.ecp.fr>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -27 +28 @@
-#include <string.h>
-
+#include <IOKit/storage/IOCDMedia.h>
+#include <IOKit/storage/IODVDMedia.h>
+
-#include <videolan/vlc.h>
-
-#include "interface.h"
-#include "intf_playlist.h"
+#include "intf_eject.h"
-
-#include "video.h"
-#include "video_output.h"
+#include "audio_output.h"
+
-#include "stream_control.h"
-#include "input_ext-intf.h"
@@ -78 +85 @@
-
-        return( 1 );
+    }
+
+    if( p_input_bank->pp_input[0] != NULL )
+    {
+        vlc_mutex_lock( &p_input_bank->pp_input[0]->stream.stream_lock );
+
+        if( !p_input_bank->pp_input[0]->b_die )
+        {
+            /* New input or stream map change */
+            if( p_input_bank->pp_input[0]->stream.b_changed ||
+                p_main->p_intf->p_sys->i_part !=
+                p_input_bank->pp_input[0]->stream.p_selected_area->i_part )
+            {
+                [self setupMenus];
+            }
+        }
+
+        vlc_mutex_unlock( &p_input_bank->pp_input[0]->stream.stream_lock );
+    }
+    else
+    {
+        [self setupMenus];
-    }
-
@@ -196 +225 @@
-}
-
+- (void)mute
+{
+    if( p_aout_bank->pp_aout[0] == NULL ) return;
+
+    if( p_main->p_intf->p_sys->b_mute )
+    {
+        p_aout_bank->pp_aout[0]->i_volume = 
+                            p_main->p_intf->p_sys->i_saved_volume;
+    }
+    else
+    {
+        p_main->p_intf->p_sys->i_saved_volume = 
+                            p_aout_bank->pp_aout[0]->i_volume;
+        p_aout_bank->pp_aout[0]->i_volume = 0;
+    }
+    p_main->p_intf->p_sys->b_mute = !p_main->p_intf->p_sys->b_mute;
+}
+
+- (void)fullscreen
+{
+    if( p_vout_bank->pp_vout[0] != NULL )
+    {
+        p_vout_bank->pp_vout[0]->i_changes |= VOUT_FULLSCREEN_CHANGE;
+    }
+}
+
+- (void)eject
+{
+    /* FIXME : this will only eject the first drive found */
+    NSArray * o_devices = GetEjectableMediaOfClass(kIODVDMediaClass);
+    const char * psz_device;
+
+    if ( o_devices == nil )
+    {
+        o_devices = GetEjectableMediaOfClass(kIOCDMediaClass);
+    }
+
+    psz_device = [[o_devices objectAtIndex:0] cString];
+    intf_Eject( psz_device );
+}
+
-/* playback info */
-
@@ -419 +489 @@
-}
-
+- (void)setupMenus
+{
+#if 0
+    NSMenu * o_main_menu = [NSApp mainMenu];
+    NSMenuItem * o_program_item = [o_main_menu itemWithTitle:@"Program"];
+
+    if( p_input_bank->pp_input[0] == NULL )
+    {
+        NSMenu * o_program = [o_program_item submenu];
+        [o_program_item setEnabled:0];
+        [o_program removeItemAtIndex:0];
+    }
+    else
+    {
+        NSMenu * o_program = [o_program_item submenu];
+        [o_program_item setEnabled:1];
+        [o_program removeItemAtIndex:0];
+    }
+#endif
+}
+
-@end

plugins/macosx/intf_vlc_wrapper.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-5 2002/04/23 03:21:21 jlj
+6 2002/05/06 22:59:46 massiot
- *
- * Authors: Florian G. Pflug <fgp@phlo.org>
@@ -46 +46 @@
-- (void)playSlower;
-- (void)playFaster;
+- (void)mute;
+- (void)fullscreen;
+- (void)eject;
-
-/* playback info */
@@ -68 +71 @@
-- (void)openNet:(NSString*)o_protocol addr:(NSString*)o_addr port:(int)i_port baddr:(NSString*)o_baddr;
-- (void)openNetChannel:(NSString*)o_addr port:(int)i_port;
+- (void)setupMenus;
-
-@end

plugins/macosx/macosx.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-7 2002/04/25 23:07:23
+8 2002/05/06 22:59:46
- *
- * Authors: Colin Delacroix <colin@zoy.org>
@@ -38 +38 @@
-    NSPort *o_port;
-    NSAutoreleasePool *o_pool;
+
+    boolean_t b_mute;
+    int i_saved_volume;
+    
+    int i_part;
-} intf_sys_t;
-
@@ -53 +58 @@
-    boolean_t b_mouse_pointer_visible;
-    mtime_t i_time_mouse_last_moved;
-
+
-    CodecType i_codec;
-    CGrafPtr p_qdport;

src/interface/intf_eject.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-9 2002/04/04 22:08:05
+10 2002/05/06 22:59:46
- *
- * Author: Julien Blache <jb@technologeek.org> for the Linux part
- *               with code taken from the Linux "eject" command
+ *         Jon Lech Johanson <jon-vl@nanocrew.net> for Darwin
- *
- * This program is free software; you can redistribute it and/or modify
@@ -82 +83 @@
-int intf_Eject( const char *psz_device )
-{
-    int i_fd;
-    int i_ret;
-
@@ -100 +100 @@
-        strlen( psz_disk ) > 4 )
-    {
-
+/usr/sbin/
-        snprintf( sz_cmd, sizeof(sz_cmd), EJECT_CMD, psz_disk );
-#undef EJECT_CMD
@@ -128 +128 @@
-    return 1;
-
-
+
+
+
-
-    /* This code could be extended to support CD/DVD-ROM chargers */
@@ -165 +167 @@
-
-    return i_ret;
+#endif
-}
-