[vlc-devel] commit: vougl.m: cosmetics (Jean-Paul Saman )
git version control
git at videolan.org
Tue Mar 17 16:07:53 CET 2009
vlc | branch: master | Jean-Paul Saman <jpsaman at videolan.org> | Mon Mar 2 15:08:45 2009 +0100| [42bf6ff2745694b9da7f60464d66d887a40a1843] | committer: Jean-Paul Saman
vougl.m: cosmetics
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=42bf6ff2745694b9da7f60464d66d887a40a1843
---
modules/gui/macosx/voutgl.m | 13 ++++++-------
src/control/libvlc_internal.h | 12 ++++++------
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m
index 2b3f0c1..0704953 100644
--- a/modules/gui/macosx/voutgl.m
+++ b/modules/gui/macosx/voutgl.m
@@ -1,7 +1,7 @@
/*****************************************************************************
* voutgl.m: MacOS X OpenGL provider
*****************************************************************************
- * Copyright (C) 2001-2004, 2007 the VideoLAN team
+ * Copyright (C) 2001-2004, 2007-2009 the VideoLAN team
* $Id$
*
* Authors: Colin Delacroix <colin at zoy.org>
@@ -61,18 +61,18 @@ struct vout_sys_t
NSAutoreleasePool * o_pool;
VLCGLView * o_glview;
VLCVoutView * o_vout_view;
- bool b_saved_frame;
+ bool b_saved_frame;
NSRect s_frame;
- bool b_got_frame;
+ bool b_got_frame;
/* Mozilla plugin-related variables */
- bool b_embedded;
+ bool b_embedded;
AGLContext agl_ctx;
AGLDrawable agl_drawable;
int i_offx, i_offy;
int i_width, i_height;
WindowRef theWindow;
WindowGroupRef winGroup;
- bool b_clipped_out;
+ bool b_clipped_out;
Rect clipBounds, viewBounds;
};
@@ -110,7 +110,7 @@ int OpenVideoGL ( vlc_object_t * p_this )
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
- return( 1 );
+ return VLC_ENOMEM;
memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
@@ -174,7 +174,6 @@ int OpenVideoGL ( vlc_object_t * p_this )
[o_pool release];
/* Check to see if initVout: was successfull */
-
if( !p_vout->p_sys->o_vout_view )
{
return VLC_EGENERIC;
diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h
index d54b437..d24d8a9 100644
--- a/src/control/libvlc_internal.h
+++ b/src/control/libvlc_internal.h
@@ -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_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;
/* Notification callback */
@@ -151,9 +151,9 @@ struct libvlc_media_player_t
int i_refcount;
vlc_mutex_t object_lock;
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_event_manager_t * p_event_manager;
+ libvlc_event_manager_t * p_event_manager;
struct
{
void *hwnd;
@@ -170,9 +170,9 @@ struct libvlc_media_list_player_t
int i_refcount;
vlc_mutex_t object_lock;
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_player_t * p_mi;
+ libvlc_media_player_t * p_mi;
};
struct libvlc_media_library_t
@@ -189,7 +189,7 @@ struct libvlc_media_discoverer_t
libvlc_instance_t * p_libvlc_instance;
services_discovery_t * p_sd;
libvlc_media_list_t * p_mlist;
- bool running;
+ bool running;
vlc_dictionary_t catname_to_submedialist;
};
More information about the vlc-devel
mailing list