Commit d1adb68e authored by Sam Hocevar's avatar Sam Hocevar

* ./plugins/macosx/*: additional minor fixes.

parent 58ac1870
/***************************************************************************** /*****************************************************************************
* intf_controller.c: MacOS X plugin for vlc * intf_controller.m: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: intf_controller.m,v 1.8 2002/06/02 22:31:52 massiot Exp $ * $Id: intf_controller.m,v 1.9 2002/06/08 19:32:19 sam 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>
......
/***************************************************************************** /*****************************************************************************
* intf_macosx.c: MacOS X interface plugin * intf_macosx.m: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: intf_macosx.m,v 1.4 2002/06/02 12:16:31 massiot Exp $ * $Id: intf_macosx.m,v 1.5 2002/06/08 19:32:19 sam Exp $
* *
* Authors: Colin Delacroix <colin@zoy.org> * Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org> * Florian G. Pflug <fgp@phlo.org>
......
/***************************************************************************** /*****************************************************************************
* intf_open.c: MacOS X plugin for vlc * intf_open.m: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: intf_open.m,v 1.4 2002/06/02 22:31:52 massiot Exp $ * $Id: intf_open.m,v 1.5 2002/06/08 19:32:19 sam Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* *
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* macosx.h: MacOS X plugin for vlc * macosx.h: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: macosx.h,v 1.12 2002/06/02 12:16:31 massiot Exp $ * $Id: macosx.h,v 1.13 2002/06/08 19:32:19 sam Exp $
* *
* Authors: Colin Delacroix <colin@zoy.org> * Authors: Colin Delacroix <colin@zoy.org>
* Eugenio Jarosiewicz <ej0@cise.ufl.edu> * Eugenio Jarosiewicz <ej0@cise.ufl.edu>
...@@ -67,6 +67,8 @@ struct vout_sys_s ...@@ -67,6 +67,8 @@ struct vout_sys_s
MatrixRecordPtr p_matrix; MatrixRecordPtr p_matrix;
DecompressorComponent img_dc; DecompressorComponent img_dc;
ImageDescriptionHandle h_img_descr; ImageDescriptionHandle h_img_descr;
intf_thread_t *p_intf;
}; };
/***************************************************************************** /*****************************************************************************
......
/***************************************************************************** /*****************************************************************************
* macosx.c: MacOS X plugin for vlc * macosx.m: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: macosx.m,v 1.2 2002/06/01 12:32:00 sam Exp $ * $Id: macosx.m,v 1.3 2002/06/08 19:32:19 sam Exp $
* *
* Authors: Colin Delacroix <colin@zoy.org> * Authors: Colin Delacroix <colin@zoy.org>
* Eugenio Jarosiewicz <ej0@cise.ufl.edu> * Eugenio Jarosiewicz <ej0@cise.ufl.edu>
......
...@@ -39,8 +39,6 @@ ...@@ -39,8 +39,6 @@
struct picture_sys_s struct picture_sys_s
{ {
intf_thread_t *p_intf;
void *p_info; void *p_info;
unsigned int i_size; unsigned int i_size;
...@@ -103,7 +101,7 @@ static int vout_Create( vout_thread_t *p_vout ) ...@@ -103,7 +101,7 @@ static int vout_Create( vout_thread_t *p_vout )
} }
if( p_intf->p_module == NULL if( p_intf->p_module == NULL
|| strcmp( p_intf->p_module->psz_name, MODULE_STRING ) != 0 ) || strcmp( p_intf->p_module->psz_object_name, MODULE_STRING ) != 0 )
{ {
msg_Err( p_vout, "MacOS X interface module required" ); msg_Err( p_vout, "MacOS X interface module required" );
vlc_object_release( p_intf ); vlc_object_release( p_intf );
......
/***************************************************************************** /*****************************************************************************
* vout_qdview.c: MacOS X plugin for vlc * vout_qdview.m: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: vout_qdview.m,v 1.3 2002/05/18 18:48:24 massiot Exp $ * $Id: vout_qdview.m,v 1.4 2002/06/08 19:32:19 sam 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>
......
/***************************************************************************** /*****************************************************************************
* vout_vlc_wrapper.c: MacOS X plugin for vlc * vout_vlc_wrapper.m: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: vout_vlc_wrapper.m,v 1.4 2002/06/01 23:42:04 massiot Exp $ * $Id: vout_vlc_wrapper.m,v 1.5 2002/06/08 19:32:19 sam Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* *
...@@ -126,14 +126,7 @@ static Vout_VLCWrapper *o_vout = nil; ...@@ -126,14 +126,7 @@ static Vout_VLCWrapper *o_vout = nil;
break; break;
case ' ': case ' ':
if ( p_input_bank->pp_input[0] != NULL ) input_SetStatus( p_vout, INPUT_STATUS_PAUSE );
{
input_SetStatus( p_input_bank->pp_input[0], INPUT_STATUS_PAUSE );
vlc_mutex_lock( &p_main->p_playlist->change_lock );
p_main->p_playlist->b_stopped = 0;
vlc_mutex_unlock( &p_main->p_playlist->change_lock );
}
break; break;
default: default:
......
/***************************************************************************** /*****************************************************************************
* vout_window.c: MacOS X plugin for vlc * vout_window.m: MacOS X plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: vout_window.m,v 1.2 2002/06/01 12:32:00 sam Exp $ * $Id: vout_window.m,v 1.3 2002/06/08 19:32:19 sam Exp $
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* *
......
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