[vlc-commits] cosmetics: fix indentation (2 spaces -> 4 spaces)
Rafaël Carré
git at videolan.org
Fri Jul 29 04:47:04 CEST 2011
vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Thu Jul 28 22:46:10 2011 -0400| [f5b549f5a73c98934d500e13949d09d45b147583] | committer: Rafaël Carré
cosmetics: fix indentation (2 spaces -> 4 spaces)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f5b549f5a73c98934d500e13949d09d45b147583
---
src/control/media_player.c | 4 +-
src/input/item.c | 46 ++++++++---------
src/playlist/item.c | 95 +++++++++++++++++------------------
src/playlist/sort.c | 6 +-
src/video_output/vout_subpictures.c | 24 ++++----
src/win32/specific.c | 6 +-
6 files changed, 89 insertions(+), 92 deletions(-)
diff --git a/src/control/media_player.c b/src/control/media_player.c
index f0c221a..3521c33 100644
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -46,13 +46,13 @@
* mapping of libvlc_navigate_mode_t to vlc_action_t
*/
static const vlc_action_t libvlc_navigate_to_action[] =
- {
+{
ACTIONID_NAV_ACTIVATE,
ACTIONID_NAV_UP,
ACTIONID_NAV_DOWN,
ACTIONID_NAV_LEFT,
ACTIONID_NAV_RIGHT
- };
+};
static const uint32_t libvlc_navigate_to_action_size = \
sizeof( libvlc_navigate_to_action ) / sizeof( libvlc_navigate_to_action[0] );
diff --git a/src/input/item.c b/src/input/item.c
index 4a4eab9..13a1202 100644
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -992,29 +992,27 @@ input_item_node_t *input_item_node_Create( input_item_t *p_input )
static void RecursiveNodeDelete( input_item_node_t *p_node )
{
- for( int i = 0; i < p_node->i_children; i++ )
- RecursiveNodeDelete( p_node->pp_children[i] );
+ for( int i = 0; i < p_node->i_children; i++ )
+ RecursiveNodeDelete( p_node->pp_children[i] );
- vlc_gc_decref( p_node->p_item );
- free( p_node->pp_children );
- free( p_node );
+ vlc_gc_decref( p_node->p_item );
+ free( p_node->pp_children );
+ free( p_node );
}
void input_item_node_Delete( input_item_node_t *p_node )
{
- if( p_node->p_parent )
- {
- for( int i = 0; i < p_node->p_parent->i_children; i++ )
- if( p_node->p_parent->pp_children[i] == p_node )
- {
- REMOVE_ELEM( p_node->p_parent->pp_children,
- p_node->p_parent->i_children,
- i );
- break;
- }
- }
-
- RecursiveNodeDelete( p_node );
+ if( p_node->p_parent )
+ for( int i = 0; i < p_node->p_parent->i_children; i++ )
+ if( p_node->p_parent->pp_children[i] == p_node )
+ {
+ REMOVE_ELEM( p_node->p_parent->pp_children,
+ p_node->p_parent->i_children,
+ i );
+ break;
+ }
+
+ RecursiveNodeDelete( p_node );
}
input_item_node_t *input_item_node_AppendItem( input_item_node_t *p_node, input_item_t *p_item )
@@ -1037,14 +1035,14 @@ void input_item_node_AppendNode( input_item_node_t *p_parent, input_item_node_t
void input_item_node_PostAndDelete( input_item_node_t *p_root )
{
- post_subitems( p_root );
+ post_subitems( p_root );
- vlc_event_t event;
- event.type = vlc_InputItemSubItemTreeAdded;
- event.u.input_item_subitem_tree_added.p_root = p_root;
- vlc_event_send( &p_root->p_item->event_manager, &event );
+ vlc_event_t event;
+ event.type = vlc_InputItemSubItemTreeAdded;
+ event.u.input_item_subitem_tree_added.p_root = p_root;
+ vlc_event_send( &p_root->p_item->event_manager, &event );
- input_item_node_Delete( p_root );
+ input_item_node_Delete( p_root );
}
/* Called by es_out when a new Elementary Stream is added or updated. */
diff --git a/src/playlist/item.c b/src/playlist/item.c
index 4cc3246..4f02349 100644
--- a/src/playlist/item.c
+++ b/src/playlist/item.c
@@ -564,9 +564,8 @@ int playlist_InsertInputItemTree (
playlist_t *p_playlist, playlist_item_t *p_parent,
input_item_node_t *p_node, int i_pos, bool b_flat )
{
- playlist_item_t *p_first_leaf = NULL;
- int i = RecursiveAddIntoParent ( p_playlist, p_parent, p_node, i_pos, b_flat, &p_first_leaf );
- return i;
+ playlist_item_t *p_first_leaf = NULL;
+ return RecursiveAddIntoParent ( p_playlist, p_parent, p_node, i_pos, b_flat, &p_first_leaf );
}
@@ -850,51 +849,51 @@ static int RecursiveAddIntoParent (
input_item_node_t *p_node, int i_pos, bool b_flat,
playlist_item_t **pp_first_leaf )
{
- *pp_first_leaf = NULL;
-
- if( p_parent->i_children == -1 ) ChangeToNode( p_playlist, p_parent );
-
- if( i_pos == PLAYLIST_END ) i_pos = p_parent->i_children;
-
- for( int i = 0; i < p_node->i_children; i++ )
- {
- input_item_node_t *p_child_node = p_node->pp_children[i];
-
- playlist_item_t *p_new_item = NULL;
- bool b_children = p_child_node->i_children > 0;
-
- //Create the playlist item represented by input node, if allowed.
- if( !(b_flat && b_children) )
- {
- p_new_item = playlist_NodeAddInput( p_playlist,
- p_child_node->p_item,
- p_parent,
- PLAYLIST_INSERT, i_pos,
- pl_Locked );
- if( !p_new_item ) return i_pos;
-
- i_pos++;
- }
- //Recurse if any children
- if( b_children )
- {
- //Substitute p_new_item for first child leaf
- //(If flat, continue counting from current position)
- int i_last_pos = RecursiveAddIntoParent(
- p_playlist,
- p_new_item ? p_new_item : p_parent,
- p_child_node,
- ( b_flat ? i_pos : 0 ),
- b_flat,
- &p_new_item );
- //If flat, take position after recursion as current position
- if( b_flat ) i_pos = i_last_pos;
- }
-
- assert( p_new_item != NULL );
- if( i == 0 ) *pp_first_leaf = p_new_item;
- }
- return i_pos;
+ *pp_first_leaf = NULL;
+
+ if( p_parent->i_children == -1 ) ChangeToNode( p_playlist, p_parent );
+
+ if( i_pos == PLAYLIST_END ) i_pos = p_parent->i_children;
+
+ for( int i = 0; i < p_node->i_children; i++ )
+ {
+ input_item_node_t *p_child_node = p_node->pp_children[i];
+
+ playlist_item_t *p_new_item = NULL;
+ bool b_children = p_child_node->i_children > 0;
+
+ //Create the playlist item represented by input node, if allowed.
+ if( !(b_flat && b_children) )
+ {
+ p_new_item = playlist_NodeAddInput( p_playlist,
+ p_child_node->p_item,
+ p_parent,
+ PLAYLIST_INSERT, i_pos,
+ pl_Locked );
+ if( !p_new_item ) return i_pos;
+
+ i_pos++;
+ }
+ //Recurse if any children
+ if( b_children )
+ {
+ //Substitute p_new_item for first child leaf
+ //(If flat, continue counting from current position)
+ int i_last_pos = RecursiveAddIntoParent(
+ p_playlist,
+ p_new_item ? p_new_item : p_parent,
+ p_child_node,
+ ( b_flat ? i_pos : 0 ),
+ b_flat,
+ &p_new_item );
+ //If flat, take position after recursion as current position
+ if( b_flat ) i_pos = i_last_pos;
+ }
+
+ assert( p_new_item != NULL );
+ if( i == 0 ) *pp_first_leaf = p_new_item;
+ }
+ return i_pos;
}
static int RecursiveInsertCopy (
diff --git a/src/playlist/sort.c b/src/playlist/sort.c
index e125b0d..bf0f88e 100644
--- a/src/playlist/sort.c
+++ b/src/playlist/sort.c
@@ -119,9 +119,9 @@ typedef int (*sortfn_t)(const void *,const void *);
static const sortfn_t sorting_fns[NUM_SORT_FNS][2];
static inline sortfn_t find_sorting_fn( unsigned i_mode, unsigned i_type )
{
- if( i_mode>=NUM_SORT_FNS || i_type>1 )
- return 0;
- return sorting_fns[i_mode][i_type];
+ if( i_mode>=NUM_SORT_FNS || i_type>1 )
+ return 0;
+ return sorting_fns[i_mode][i_type];
}
/**
diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 5116938..0ec72b3 100644
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -444,21 +444,21 @@ static void SpuAreaFixOverlap(spu_area_t *dst,
static void SpuAreaFitInside(spu_area_t *area, const spu_area_t *boundary)
{
- spu_area_t a = spu_area_scaled(*area);
+ spu_area_t a = spu_area_scaled(*area);
- const int i_error_x = (a.x + a.width) - boundary->width;
- if (i_error_x > 0)
- a.x -= i_error_x;
- if (a.x < 0)
- a.x = 0;
+ const int i_error_x = (a.x + a.width) - boundary->width;
+ if (i_error_x > 0)
+ a.x -= i_error_x;
+ if (a.x < 0)
+ a.x = 0;
- const int i_error_y = (a.y + a.height) - boundary->height;
- if (i_error_y > 0)
- a.y -= i_error_y;
- if (a.y < 0)
- a.y = 0;
+ const int i_error_y = (a.y + a.height) - boundary->height;
+ if (i_error_y > 0)
+ a.y -= i_error_y;
+ if (a.y < 0)
+ a.y = 0;
- *area = spu_area_unscaled(a, area->scale);
+ *area = spu_area_unscaled(a, area->scale);
}
/**
diff --git a/src/win32/specific.c b/src/win32/specific.c
index e3e0b09..a34fc70 100644
--- a/src/win32/specific.c
+++ b/src/win32/specific.c
@@ -130,9 +130,9 @@ static HANDLE hIPCHelperReady;
typedef struct
{
- int argc;
- int enqueue;
- char data[];
+ int argc;
+ int enqueue;
+ char data[];
} vlc_ipc_data_t;
void system_Configure( libvlc_int_t *p_this, int i_argc, const char *const ppsz_argv[] )
More information about the vlc-commits
mailing list