Commit 42bf6ff2 authored by Jean-Paul Saman's avatar Jean-Paul Saman

vougl.m: cosmetics

parent 5886a523
/***************************************************************************** /*****************************************************************************
* voutgl.m: MacOS X OpenGL provider * voutgl.m: MacOS X OpenGL provider
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2004, 2007 the VideoLAN team * Copyright (C) 2001-2004, 2007-2009 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Colin Delacroix <colin@zoy.org> * Authors: Colin Delacroix <colin@zoy.org>
...@@ -61,18 +61,18 @@ struct vout_sys_t ...@@ -61,18 +61,18 @@ struct vout_sys_t
NSAutoreleasePool * o_pool; NSAutoreleasePool * o_pool;
VLCGLView * o_glview; VLCGLView * o_glview;
VLCVoutView * o_vout_view; VLCVoutView * o_vout_view;
bool b_saved_frame; bool b_saved_frame;
NSRect s_frame; NSRect s_frame;
bool b_got_frame; bool b_got_frame;
/* Mozilla plugin-related variables */ /* Mozilla plugin-related variables */
bool b_embedded; bool b_embedded;
AGLContext agl_ctx; AGLContext agl_ctx;
AGLDrawable agl_drawable; AGLDrawable agl_drawable;
int i_offx, i_offy; int i_offx, i_offy;
int i_width, i_height; int i_width, i_height;
WindowRef theWindow; WindowRef theWindow;
WindowGroupRef winGroup; WindowGroupRef winGroup;
bool b_clipped_out; bool b_clipped_out;
Rect clipBounds, viewBounds; Rect clipBounds, viewBounds;
}; };
...@@ -110,7 +110,7 @@ int OpenVideoGL ( vlc_object_t * p_this ) ...@@ -110,7 +110,7 @@ int OpenVideoGL ( vlc_object_t * p_this )
p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL ) if( p_vout->p_sys == NULL )
return( 1 ); return VLC_ENOMEM;
memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) ); memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
...@@ -174,7 +174,6 @@ int OpenVideoGL ( vlc_object_t * p_this ) ...@@ -174,7 +174,6 @@ int OpenVideoGL ( vlc_object_t * p_this )
[o_pool release]; [o_pool release];
/* Check to see if initVout: was successfull */ /* Check to see if initVout: was successfull */
if( !p_vout->p_sys->o_vout_view ) if( !p_vout->p_sys->o_vout_view )
{ {
return VLC_EGENERIC; return VLC_EGENERIC;
......
...@@ -138,7 +138,7 @@ struct libvlc_media_list_view_t ...@@ -138,7 +138,7 @@ struct libvlc_media_list_view_t
libvlc_media_list_view_item_at_index_func_t pf_item_at_index; libvlc_media_list_view_item_at_index_func_t pf_item_at_index;
libvlc_media_list_view_children_at_index_func_t pf_children_at_index; libvlc_media_list_view_children_at_index_func_t pf_children_at_index;
libvlc_media_list_view_constructor_func_t pf_constructor; libvlc_media_list_view_constructor_func_t pf_constructor;
libvlc_media_list_view_release_func_t pf_release; libvlc_media_list_view_release_func_t pf_release;
/* Notification callback */ /* Notification callback */
...@@ -151,9 +151,9 @@ struct libvlc_media_player_t ...@@ -151,9 +151,9 @@ struct libvlc_media_player_t
int i_refcount; int i_refcount;
vlc_mutex_t object_lock; vlc_mutex_t object_lock;
input_thread_t * p_input_thread; input_thread_t * p_input_thread;
struct libvlc_instance_t * p_libvlc_instance; /* Parent instance */ struct libvlc_instance_t * p_libvlc_instance; /* Parent instance */
libvlc_media_t * p_md; /* current media descriptor */ libvlc_media_t * p_md; /* current media descriptor */
libvlc_event_manager_t * p_event_manager; libvlc_event_manager_t * p_event_manager;
struct struct
{ {
void *hwnd; void *hwnd;
...@@ -170,9 +170,9 @@ struct libvlc_media_list_player_t ...@@ -170,9 +170,9 @@ struct libvlc_media_list_player_t
int i_refcount; int i_refcount;
vlc_mutex_t object_lock; vlc_mutex_t object_lock;
libvlc_media_list_path_t current_playing_item_path; libvlc_media_list_path_t current_playing_item_path;
libvlc_media_t * p_current_playing_item; libvlc_media_t * p_current_playing_item;
libvlc_media_list_t * p_mlist; libvlc_media_list_t * p_mlist;
libvlc_media_player_t * p_mi; libvlc_media_player_t * p_mi;
}; };
struct libvlc_media_library_t struct libvlc_media_library_t
...@@ -189,7 +189,7 @@ struct libvlc_media_discoverer_t ...@@ -189,7 +189,7 @@ struct libvlc_media_discoverer_t
libvlc_instance_t * p_libvlc_instance; libvlc_instance_t * p_libvlc_instance;
services_discovery_t * p_sd; services_discovery_t * p_sd;
libvlc_media_list_t * p_mlist; libvlc_media_list_t * p_mlist;
bool running; bool running;
vlc_dictionary_t catname_to_submedialist; vlc_dictionary_t catname_to_submedialist;
}; };
......
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