Commit 75a0a1de authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files

CodingStyle fixes, use ; when using macros and do not write it in the macro definition.

parent 5ffe7e00
......@@ -269,8 +269,8 @@ struct playlist_add_t
*****************************************************************************/
/* Helpers */
#define PL_LOCK vlc_object_lock( p_playlist );
#define PL_UNLOCK vlc_object_unlock( p_playlist );
#define PL_LOCK vlc_object_lock( p_playlist )
#define PL_UNLOCK vlc_object_unlock( p_playlist )
#define pl_Get( a ) a->p_libvlc->p_playlist
......@@ -278,7 +278,7 @@ VLC_EXPORT( playlist_t *, __pl_Yield, ( vlc_object_t * ) );
#define pl_Yield( a ) __pl_Yield( VLC_OBJECT(a) )
VLC_EXPORT( void, __pl_Release, ( vlc_object_t * ) );
#define pl_Release(a) __pl_Release( VLC_OBJECT(a) );
#define pl_Release(a) __pl_Release( VLC_OBJECT(a) )
/* Playlist control */
#define playlist_Play(p) playlist_Control(p,PLAYLIST_PLAY, VLC_FALSE )
......
......@@ -913,7 +913,7 @@ void PLModel::sort( int column, Qt::SortOrder order )
order == Qt::AscendingOrder ?
ORDER_NORMAL : ORDER_REVERSE );
}
PL_UNLOCK
PL_UNLOCK;
rebuild();
}
......
......@@ -2095,7 +2095,7 @@ static void UpdateItemLength( input_thread_t *p_input, int64_t i_length )
pl_Yield( p_input );
var_SetInteger( pl_Get( p_input ), "item-change",
p_input->p->input.p_item->i_id );
pl_Release( p_input )
pl_Release( p_input );
}
}
......
......@@ -256,7 +256,7 @@ check_input:
/* Release the playlist lock, because we may get stuck
* in input_DestroyThread() for some time. */
PL_UNLOCK
PL_UNLOCK;
/* Destroy input */
input_DestroyThread( p_input );
......@@ -287,7 +287,7 @@ check_input:
{
PL_DEBUG( "dying input" );
PL_UNLOCK;
msleep( 25000 ); // 25 ms
msleep( 25000 ); /* 25 ms */
PL_LOCK;
goto check_input;
}
......@@ -327,7 +327,7 @@ check_input:
{
msg_Dbg( p_playlist, "nothing to play" );
p_playlist->status.i_status = PLAYLIST_STOPPED;
PL_UNLOCK
PL_UNLOCK;
if( b_playexit == VLC_TRUE )
{
......@@ -358,7 +358,7 @@ check_input:
PL_LOCK;
}
}
PL_UNLOCK
PL_UNLOCK;
}
/** Playlist dying last loop */
......@@ -369,11 +369,10 @@ void playlist_LastLoop( playlist_t *p_playlist )
/* If there is an input, kill it */
while( 1 )
{
PL_LOCK
PL_LOCK;
if( p_playlist->p_input == NULL )
{
PL_UNLOCK
PL_UNLOCK;
break;
}
......@@ -384,7 +383,7 @@ void playlist_LastLoop( playlist_t *p_playlist )
/* Unlink current input */
p_input = p_playlist->p_input;
p_playlist->p_input = NULL;
PL_UNLOCK
PL_UNLOCK;
/* Destroy input */
input_DestroyThread( p_input );
......@@ -398,15 +397,14 @@ void playlist_LastLoop( playlist_t *p_playlist )
else if( p_playlist->p_input->b_error || p_playlist->p_input->b_eof )
{
input_StopThread( p_playlist->p_input );
PL_UNLOCK
PL_UNLOCK;
continue;
}
else
{
p_playlist->p_input->b_eof = 1;
}
PL_UNLOCK
PL_UNLOCK;
msleep( INTF_IDLE_SLEEP );
}
......
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