Changeset e4ceccd32365e7199085f248fb09454d8e989054

Timestamp:

27/07/04 18:20:32 (4 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1090945232 +0000

git-parent:

[359a9bafcc9026aa095325087867fc2954f8a8b9]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1090945232 +0000

Message:

-

Files:

• include/darwin_specific.h (modified) (2 diffs)
• modules/gui/macosx/intf.m (modified) (14 diffs)
• modules/gui/macosx/vout.h (modified) (1 diff)
• modules/gui/macosx/vout.m (modified) (15 diffs)
• src/interface/interface.c (modified) (7 diffs)
• src/libvlc.h (modified) (1 diff)
• src/misc/darwin_specific.m (modified) (1 diff)
• src/video_output/video_output.c (modified) (1 diff)
• src/vlc.c (modified) (4 diffs)

include/darwin_specific.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-: darwin_specific.h,v 1.8 2004/01/25 18:17:08 zorglub Exp 
+
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -21 +21 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- *****************************************************************************/
-

modules/gui/macosx/intf.m

@@ -70 +70 @@
-    p_intf->b_play = VLC_TRUE;
-    p_intf->pf_run = Run;
-    
-    [[VLCMain sharedInstance] setIntf: p_intf];
-
-    return( 0 );
@@ -87 +85 @@
-    [p_intf->p_sys->o_sendport release];
-    [p_intf->p_sys->o_pool release];
-
+
-    free( p_intf->p_sys );
-}
@@ -100 +98 @@
-     * (???) --Meuuh */
-    vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
+    [[VLCMain sharedInstance] setIntf: p_intf];
-    [NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
+    [NSApp run];
+    [[VLCMain sharedInstance] terminate];
-}
-
@@ -107 +108 @@
-    int i_ret = 0;
-
-
+//
-
-    if( [target respondsToSelector: @selector(performSelectorOnMainThread:
@@ -114 +115 @@
-        [target performSelectorOnMainThread: sel
-                withObject: [NSValue valueWithPointer: p_arg]
-YES
+NO
-    }
-    else if( NSApp != nil && [[VLCMain sharedInstance] respondsToSelector: @selector(getIntf)] ) 
@@ -162 +163 @@
-    }
-
-
+//
-
-    return( i_ret );
@@ -291 +292 @@
-{
-    unsigned int i_key = 0;
-    intf_thread_t * p_intf = VLCIntf;
-    playlist_t *p_playlist;
-    vlc_value_t val;
@@ -528 +528 @@
-    vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
-}
-
+
-- (BOOL)application:(NSApplication *)o_app openFile:(NSString *)o_filename
-{
@@ -537 +537 @@
-    return( TRUE );
-}
-
+
-- (NSString *)localizedString:(char *)psz
-{
@@ -638 +638 @@
-
-    val.i_int = 0;
-VLCI
+p_i
-
-    i_pressed_modifiers = [o_event modifierFlags];
@@ -659 +659 @@
-        if( p_hotkeys[i].i_key == val.i_int )
-        {
-VLCI
+p_i
-            return YES;
-        }
@@ -697 +697 @@
-{
-    NSDate * o_sleep_date;
+    /* new thread requires a new pool */
-    NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
-
@@ -810 +811 @@
-                if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
-                {
-
+;//
-                }
-            }
@@ -1135 +1136 @@
-- (IBAction)timesliderUpdate:(id)sender
-{
-    intf_thread_t * p_intf;
-    input_thread_t * p_input;
-    float f_updated;

modules/gui/macosx/vout.h

@@ -76 +76 @@
-
-/*****************************************************************************
- * VLCVout interface
- *****************************************************************************/
-@interface VLCVout : NSObject
-{
-}
-
-- (void)createWindow:(NSValue *)o_value;
-- (void)destroyWindow:(NSValue *)o_value;
-
-@end
-
-/*****************************************************************************
- * vout_sys_t: MacOS X video output method descriptor
- *****************************************************************************/
-struct vout_sys_t
-{
-
-
+
-    NSRect s_rect;
-    int b_pos_saved;
-    VLCWindow * o_window;
-
+    int i_opengl;
+    int b_pos_saved;
+    
-    vlc_bool_t b_mouse_moved;
-    mtime_t i_time_mouse_last_moved;

modules/gui/macosx/vout.m

@@ -69 +69 @@
-static void vout_Display   ( vout_thread_t *, picture_t * );
-
-static int  CoSendRequest      ( vout_thread_t *, SEL );
-static int  CoCreateWindow     ( vout_thread_t * );
-static int  CoDestroyWindow    ( vout_thread_t * );
@@ -120 +119 @@
-    }
-
+    p_vout->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
-    p_vout->p_sys->b_mouse_moved = VLC_TRUE;
-    p_vout->p_sys->i_time_mouse_last_moved = mdate();
@@ -160 +160 @@
-            free( p_vout->p_sys );
-            return( 1 );
- 
+
-
-        /* Damn QT isn't thread safe. so keep a lock in the p_vlc object */
@@ -169 +169 @@
-        
-        vlc_mutex_unlock( &p_vout->p_vlc->quicktime_lock );
+        
-        if( err == noErr && p_vout->p_sys->img_dc != 0 )
-        {
@@ -193 +194 @@
-    }
-
-    NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
-    NSArray * o_screens = [NSScreen screens];
-    if( [o_screens count] > 0 && var_Type( p_vout, "video-device" ) == 0 )
@@ -237 +237 @@
-        var_Set( p_vout, "intf-change", val );
-    }
-    [o_pool release];
-
-    if( CoCreateWindow( p_vout ) )
@@ -433 +432 @@
- *****************************************************************************/
-void E_(CloseVideo) ( vlc_object_t *p_this )
-
+
+
-    vout_thread_t * p_vout = (vout_thread_t *)p_this;     
-
@@ -458 +458 @@
-    }
-
+    [o_pool release];
-    free( p_vout->p_sys );
-}
@@ -571 +572 @@
-
-/*****************************************************************************
- * CoSendRequest: send request to interface thread
- *****************************************************************************
- * Returns 0 on success, 1 otherwise
- *****************************************************************************/
-static int CoSendRequest( vout_thread_t *p_vout, SEL sel )
-{
-    int i_ret = 0;
-    vlc_value_t val;
-    intf_thread_t * p_intf;
-
-    VLCVout * o_vlv = [[VLCVout alloc] init];
-
-    if( ( i_ret = ExecuteOnMainThread( o_vlv, sel, (void *)p_vout ) ) )
-    {
-        msg_Err( p_vout, "SendRequest: no way to communicate with mt" );
-    }
-
-    [o_vlv release];
-
-    /*This makes this function dependant of the presence of a macosx 
-    interface. We do not check if this interface exists, since it has 
-    already been done before.*/
-
-    /*p_intf = VLCIntf;
-
-    val.b_bool = VLC_TRUE;
-    var_Create(p_intf,"intf-change",VLC_VAR_BOOL);
-    var_Set(p_intf, "intf-change",val);
-*/
-    return( i_ret );
-}
-
-/*****************************************************************************
- * CoCreateWindow: create new window 
- *****************************************************************************
@@ -610 +578 @@
-static int CoCreateWindow( vout_thread_t *p_vout )
-{
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    
-
+
+
+
+
+
-}
-
@@ -626 +695 @@
-static int CoDestroyWindow( vout_thread_t *p_vout )
-{
-
+
-    VLCHideMouse( p_vout, NO );
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -645 +725 @@
-static int CoToggleFullscreen( vout_thread_t *p_vout )
-{
+    NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+
-    if( !p_vout->p_sys->i_opengl )
-    {
@@ -685 +767 @@
-    }
-
+    [o_pool release];
-    return( 0 );
-}
@@ -1014 +1097 @@
-    return( YES );
-}
-
+
-- (BOOL)performKeyEquivalent:(NSEvent *)o_event
-{
-    return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event];
-}
-
+
-- (void)keyDown:(NSEvent *)o_event
-{
@@ -1739 +1822 @@
-
-@end
-
-/*****************************************************************************
- * VLCVout implementation
- *****************************************************************************/
-@implementation VLCVout
-
-- (void)createWindow:(NSValue *)o_value
-{
-    vlc_value_t val;
-    VLCQTView * o_view;
-    NSScreen * o_screen;
-    vout_thread_t * p_vout;
-    vlc_bool_t b_main_screen;
-    
-    p_vout = (vout_thread_t *)[o_value pointerValue];
-
-    p_vout->p_sys->o_window = [VLCWindow alloc];
-    [p_vout->p_sys->o_window setVout: p_vout];
-    [p_vout->p_sys->o_window setReleasedWhenClosed: YES];
-
-    if( var_Get( p_vout, "video-device", &val ) < 0 )
-    {
-        o_screen = [NSScreen mainScreen];
-        b_main_screen = 1;
-    }
-    else
-    {
-        NSArray *o_screens = [NSScreen screens];
-        unsigned int i_index = val.i_int;
-        
-        if( [o_screens count] < i_index )
-        {
-            o_screen = [NSScreen mainScreen];
-            b_main_screen = 1;
-        }
-        else
-        {
-            i_index--;
-            o_screen = [o_screens objectAtIndex: i_index];
-            config_PutInt( p_vout, "macosx-vdev", i_index );
-            b_main_screen = (i_index == 0);
-        }
-    } 
-
-    if( p_vout->b_fullscreen )
-    {
-        NSRect screen_rect = [o_screen frame];
-        screen_rect.origin.x = screen_rect.origin.y = 0;
-
-        if ( b_main_screen && p_vout->p_sys->p_fullscreen_state == NULL )
-            BeginFullScreen( &p_vout->p_sys->p_fullscreen_state, NULL, 0, 0,
-                             NULL, NULL, fullScreenAllowEvents );
-
-        [p_vout->p_sys->o_window 
-            initWithContentRect: screen_rect
-            styleMask: NSBorderlessWindowMask
-            backing: NSBackingStoreBuffered
-            defer: NO screen: o_screen];
-
-        //[p_vout->p_sys->o_window setLevel: NSPopUpMenuWindowLevel - 1];
-        p_vout->p_sys->b_mouse_moved = YES;
-        p_vout->p_sys->i_time_mouse_last_moved = mdate();
-    }
-    else
-    {
-        unsigned int i_stylemask = NSTitledWindowMask |
-                                   NSMiniaturizableWindowMask |
-                                   NSClosableWindowMask |
-                                   NSResizableWindowMask;
-        
-        if ( p_vout->p_sys->p_fullscreen_state != NULL )
-            EndFullScreen ( p_vout->p_sys->p_fullscreen_state, NULL );
-        p_vout->p_sys->p_fullscreen_state = NULL;
-
-        [p_vout->p_sys->o_window 
-            initWithContentRect: p_vout->p_sys->s_rect
-            styleMask: i_stylemask
-            backing: NSBackingStoreBuffered
-            defer: NO screen: o_screen];
-
-        [p_vout->p_sys->o_window setAlphaValue: config_GetFloat( p_vout, "macosx-opaqueness" )];
-        
-        if( config_GetInt( p_vout, "video-on-top" ) )
-        {
-            [p_vout->p_sys->o_window setLevel: NSStatusWindowLevel];
-        }
-        
-        if( !p_vout->p_sys->b_pos_saved )   
-        {
-            [p_vout->p_sys->o_window center];
-        }
-    }
-
-    if( !p_vout->p_sys->i_opengl )
-    {
-        o_view = [[VLCQTView alloc] init];
-        /* FIXME: [o_view setMenu:] */
-        [p_vout->p_sys->o_window setContentView: o_view];
-        [o_view autorelease];
-
-        [o_view lockFocus];
-        p_vout->p_sys->p_qdport = [o_view qdPort];
-        [o_view unlockFocus];
-    }
-    else
-    {
-#define o_glview p_vout->p_sys->o_glview
-        o_glview = [[VLCGLView alloc] initWithFrame: p_vout->p_sys->s_rect vout: p_vout];
-        [p_vout->p_sys->o_window setContentView: o_glview];
-        [o_glview autorelease];
-#undef o_glview
-    }
-    
-    [p_vout->p_sys->o_window updateTitle];
-    [p_vout->p_sys->o_window makeKeyAndOrderFront: nil];
-
-}
-
-- (void)destroyWindow:(NSValue *)o_value
-{
-    vout_thread_t * p_vout;
-
-    p_vout = (vout_thread_t *)[o_value pointerValue];
-
-    if( !p_vout->b_fullscreen )
-    {
-        NSRect s_rect;
-
-        s_rect = [[p_vout->p_sys->o_window contentView] frame];
-        p_vout->p_sys->s_rect.size = s_rect.size;
-
-        s_rect = [p_vout->p_sys->o_window frame];
-        p_vout->p_sys->s_rect.origin = s_rect.origin;
-
-        p_vout->p_sys->b_pos_saved = YES;
-    }
-    
-    p_vout->p_sys->p_qdport = nil;
-    [p_vout->p_sys->o_window close];
-    p_vout->p_sys->o_window = nil;
-}
-
-@end

src/interface/interface.c

@@ -61 +61 @@
-                            vlc_value_t , vlc_value_t , void * );
-
+#ifdef SYS_DARWIN
+/*****************************************************************************
+ * VLCApplication interface
+ *****************************************************************************/
+@interface VLCApplication : NSApplication
+{
+}
+
+@end
+#endif
+
-/*****************************************************************************
- * intf_Create: prepare interface before main loop
@@ -132 +143 @@
-{
-#ifdef SYS_DARWIN
+    NSAutoreleasePool * o_pool;
+
-    if( p_intf->b_block )
-    {
@@ -144 +157 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        RunInterface( p_intf );
-        p_intf->b_die = VLC_TRUE;
@@ -162 +172 @@
-    else
-    {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#else
-    if( p_intf->b_block )
@@ -184 +205 @@
-    else
-    {
-#endif
-        /* Run the interface in a separate thread */
-        if( vlc_thread_create( p_intf, "interface", RunInterface,
@@ -193 +213 @@
-        }
-    }
+#endif
-
-    return VLC_SUCCESS;
@@ -419 +440 @@
-    return VLC_SUCCESS;
-}
+
+#ifdef SYS_DARWIN
+/*****************************************************************************
+ * VLCApplication implementation 
+ *****************************************************************************/
+@implementation VLCApplication 
+
+- (void)stop: (id)sender
+{
+    NSEvent *o_event;
+    NSAutoreleasePool *o_pool;
+    [super stop:sender];
+
+    o_pool = [[NSAutoreleasePool alloc] init];
+    /* send a dummy event to break out of the event loop */
+    o_event = [NSEvent mouseEventWithType: NSLeftMouseDown
+                location: NSMakePoint( 1, 1 ) modifierFlags: 0
+                timestamp: 1 windowNumber: [[NSApp mainWindow] windowNumber]
+                context: [NSGraphicsContext currentContext] eventNumber: 1
+                clickCount: 1 pressure: 0.0];
+    [NSApp postEvent: o_event atStart: YES];
+    [o_pool release];
+}
+
+- (void)terminate: (id)sender
+{
+    if( [NSApp isRunning] )
+        [NSApp stop:sender];
+    [super terminate: sender];
+}
+
+@end
+#endif
+

src/libvlc.h

@@ -1317 +1317 @@
-    { NULL, 0, 0 }
-};
+

src/misc/darwin_specific.m

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
-: darwin_specific.m,v 1.18 2004/01/06 12:02:06 zorglub Exp 
+
- *
- * Authors: Sam Hocevar <sam@zoy.org>

src/video_output/video_output.c

@@ -1100 +1100 @@
- *****************************************************************************
- * This function is called when the thread ends after a sucessful
-s
+
- *****************************************************************************/
-static void EndThread( vout_thread_t *p_vout )

src/vlc.c

@@ -36 +36 @@
-#   include <time.h>                                               /* time() */
-#endif
-#ifdef HAVE_STRINGS_H
-#   include <strings.h>                                         /* strncmp() */
-#endif
-
-#include <vlc/vlc.h>
-
-#ifdef SYS_DARWIN
-#include <Cocoa/Cocoa.h>
-#endif
-
-/*****************************************************************************
@@ -52 +45 @@
-static void SigHandler  ( int i_signal );
-#endif
-
-#ifdef SYS_DARWIN
-/*****************************************************************************
- * VLCApplication interface
- *****************************************************************************/
-@interface VLCApplication : NSApplication
-{
-}
-
-@end
-
-/*****************************************************************************
- * VLCApplication implementation 
- *****************************************************************************/
-@implementation VLCApplication 
-
-- (void)stop: (id)sender
-{
-    NSEvent *o_event;
-    [super stop:sender];
-
-    /* send a dummy event to break out of the event loop */
-    o_event = [NSEvent mouseEventWithType: NSLeftMouseDown
-                location: NSMakePoint( 1, 1 ) modifierFlags: 0
-                timestamp: 1 windowNumber: [[NSApp mainWindow] windowNumber]
-                context: [NSGraphicsContext currentContext] eventNumber: 1
-                clickCount: 1 pressure: 0.0];
-    [NSApp postEvent: o_event atStart: YES];
-}
-
-- (void)terminate: (id)sender
-{
-    if( [NSApp isRunning] )
-        [NSApp stop:sender];
-    [super terminate: sender];
-}
-
-@end
-
-#endif /* SYS_DARWIN */
-
-/*****************************************************************************
@@ -151 +104 @@
-    }
-
-#ifdef HAVE_STRINGS_H
-    /* if first 3 chars of argv[0] are cli, then this is clivlc
-     * We detect this specifically for Mac OS X, so you can launch vlc
-     * from the commandline even if you are not logged in on the GUI */
-    if( i_argc > 0 )
-    {
-        char *psz_temp;
-        char *psz_program = psz_temp = ppsz_argv[0];
-        while( *psz_temp )
-        {
-            if( *psz_temp == '/' ) psz_program = ++psz_temp;
-            else ++psz_temp;
-        }
-        b_cli = !strncmp( psz_program, "cli", 3 );
-    }
-#endif
-
-#ifdef SYS_DARWIN
-    if( !b_cli )
-    {
-        [VLCApplication sharedApplication];
-    }
-
-    i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE );
-    
-    if( !b_cli )
-    {
-        /* This is a blocking call */
-        [NSApp run];
-    }
-#else
-    i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE );
-#endif /* SYS_DARWIN */
-
-    /* Finish the threads */
@@ -190 +111 @@
-    /* Destroy the libvlc structure */
-    VLC_Destroy( 0 );
-
-#ifdef SYS_DARWIN
-    if( !b_cli )
-    {
-        [NSApp terminate:NULL];
-    }
-#endif /* SYS_DARWIN */
-
-    return i_ret;