VLC_PUBLIC_API void
libvlc_media_list_player_set_media_player(
libvlc_media_list_player_t * p_mlp,
- libvlc_media_player_t * p_mi,
- libvlc_exception_t * p_e );
+ libvlc_media_player_t * p_mi );
VLC_PUBLIC_API void
libvlc_media_list_player_set_media_list(
libvlc_media_list_player_t * p_mlp,
- libvlc_media_list_t * p_mlist,
- libvlc_exception_t * p_e );
+ libvlc_media_list_t * p_mlist );
/**
* Play media list
* \return true for playing and false for not playing
*/
VLC_PUBLIC_API int
- libvlc_media_list_player_is_playing( libvlc_media_list_player_t * p_mlp,
- libvlc_exception_t * p_e );
+ libvlc_media_list_player_is_playing( libvlc_media_list_player_t * p_mlp );
/**
* Get current libvlc_state of media list player
*
* \param p_mlp media list player instance
- * \param p_e initialized exception instance
* \return libvlc_state_t for media list player
*/
VLC_PUBLIC_API libvlc_state_t
- libvlc_media_list_player_get_state( libvlc_media_list_player_t * p_mlp,
- libvlc_exception_t * p_e );
+ libvlc_media_list_player_get_state( libvlc_media_list_player_t * p_mlp );
/**
* Play media list item at position index
* Stop playing media list
*
* \param p_mlp media list player instance
- * \param p_e initialized exception instance
*/
VLC_PUBLIC_API void
- libvlc_media_list_player_stop( libvlc_media_list_player_t * p_mlp,
- libvlc_exception_t * p_e );
+ libvlc_media_list_player_stop( libvlc_media_list_player_t * p_mlp );
/**
* Play next item from media list
*
* \param p_mlp media list player instance
* \param e_mode playback mode specification
- * \param p_e initialized exception instance
*/
VLC_PUBLIC_API void
libvlc_media_list_player_set_playback_mode(
libvlc_media_list_player_t * p_mlp,
- libvlc_playback_mode_t e_mode,
- libvlc_exception_t * p_e );
+ libvlc_playback_mode_t e_mode );
/** @} media_list_player */
* \param p_mi the Media Player
* \param p_md the Media. Afterwards the p_md can be safely
* destroyed.
- * \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_media_player_set_media( libvlc_media_player_t *, libvlc_media_t *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_media_player_set_media( libvlc_media_player_t *, libvlc_media_t * );
/**
* Get the media used by the media_player.
*
* \param p_mi the Media Player
- * \param p_e an initialized exception pointer
* \return the media associated with p_mi, or NULL if no
* media is associated
*/
-VLC_PUBLIC_API libvlc_media_t * libvlc_media_player_get_media( libvlc_media_player_t *, libvlc_exception_t * );
+VLC_PUBLIC_API libvlc_media_t * libvlc_media_player_get_media( libvlc_media_player_t * );
/**
* Get the Event Manager from which the media player send event.
*
* \param p_mi the Media Player
- * \param p_e an initialized exception pointer
* \return the event manager associated with p_mi
*/
-VLC_PUBLIC_API libvlc_event_manager_t * libvlc_media_player_event_manager ( libvlc_media_player_t *, libvlc_exception_t * );
+VLC_PUBLIC_API libvlc_event_manager_t * libvlc_media_player_event_manager ( libvlc_media_player_t * );
/**
* is_playing
*
* \param p_mi the Media Player
- * \param p_e an initialized exception pointer
* \return 1 if the media player is playing, 0 otherwise
*/
-VLC_PUBLIC_API int libvlc_media_player_is_playing ( libvlc_media_player_t *, libvlc_exception_t * );
+VLC_PUBLIC_API int libvlc_media_player_is_playing ( libvlc_media_player_t * );
/**
* Play
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_media_player_stop ( libvlc_media_player_t *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_media_player_stop ( libvlc_media_player_t * );
/**
* Set the NSView handler where the media player should render its video output.
*
* \param p_mi the Media Player
* \param drawable the NSView handler
- * \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_media_player_set_nsobject ( libvlc_media_player_t *p_mi, void * drawable, libvlc_exception_t *p_e );
+VLC_PUBLIC_API void libvlc_media_player_set_nsobject ( libvlc_media_player_t *p_mi, void * drawable );
/**
* Get the NSView handler previously set with libvlc_media_player_set_nsobject().
* \param drawable the agl handler
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_media_player_set_agl ( libvlc_media_player_t *p_mi, uint32_t drawable, libvlc_exception_t *p_e );
+VLC_PUBLIC_API void libvlc_media_player_set_agl ( libvlc_media_player_t *p_mi, uint32_t drawable );
/**
* Get the agl handler previously set with libvlc_media_player_set_agl().
*
* \param p_mi the Media Player
* \param drawable the ID of the X window
- * \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_media_player_set_xwindow ( libvlc_media_player_t *p_mi, uint32_t drawable, libvlc_exception_t *p_e );
+VLC_PUBLIC_API void libvlc_media_player_set_xwindow ( libvlc_media_player_t *p_mi, uint32_t drawable );
/**
* Get the X Window System window identifier previously set with
*
* \param p_mi the Media Player
* \param drawable windows handle of the drawable
- * \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_media_player_set_hwnd ( libvlc_media_player_t *p_mi, void *drawable, libvlc_exception_t *p_e );
+VLC_PUBLIC_API void libvlc_media_player_set_hwnd ( libvlc_media_player_t *p_mi, void *drawable );
/**
* Get the Windows API window handle (HWND) previously set with
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
- * \return current movie state as libvlc_state_t
*/
-VLC_PUBLIC_API libvlc_state_t libvlc_media_player_get_state( libvlc_media_player_t *, libvlc_exception_t *);
+VLC_PUBLIC_API libvlc_state_t libvlc_media_player_get_state( libvlc_media_player_t *);
/**
* Get movie fps rate
libvlc_media_list_player_t * p_mlp,
int i_relative_position,
libvlc_exception_t * p_e);
-static void stop(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e);
+static void stop(libvlc_media_list_player_t * p_mlp);
/*
* Private functions
static inline libvlc_event_manager_t * mplayer_em(libvlc_media_list_player_t * p_mlp)
{
assert_locked(p_mlp);
- return libvlc_media_player_event_manager(p_mlp->p_mi, NULL);
+ return libvlc_media_player_event_manager(p_mlp->p_mi);
}
/**************************************************************************
if (!p_mlp->p_mi)
p_mlp->p_mi = libvlc_media_player_new_from_media(p_md, NULL);
- libvlc_media_player_set_media(p_mlp->p_mi, p_md, NULL);
+ libvlc_media_player_set_media(p_mlp->p_mi, p_md);
install_media_player_observer(p_mlp);
libvlc_media_release(p_md); /* for libvlc_media_list_item_at_index */
/**************************************************************************
* set_media_player (Public)
**************************************************************************/
-void libvlc_media_list_player_set_media_player(libvlc_media_list_player_t * p_mlp, libvlc_media_player_t * p_mi, libvlc_exception_t * p_e)
+void libvlc_media_list_player_set_media_player(libvlc_media_list_player_t * p_mlp, libvlc_media_player_t * p_mi)
{
- VLC_UNUSED(p_e);
-
lock(p_mlp);
if (p_mlp->p_mi)
/**************************************************************************
* set_media_list (Public)
**************************************************************************/
-void libvlc_media_list_player_set_media_list(libvlc_media_list_player_t * p_mlp, libvlc_media_list_t * p_mlist, libvlc_exception_t * p_e)
+void libvlc_media_list_player_set_media_list(libvlc_media_list_player_t * p_mlp, libvlc_media_list_t * p_mlist)
{
- VLC_UNUSED( p_e );
assert (p_mlist);
lock(p_mlp);
* is_playing (Public)
**************************************************************************/
int
-libvlc_media_list_player_is_playing(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
+libvlc_media_list_player_is_playing(libvlc_media_list_player_t * p_mlp)
{
- libvlc_state_t state = libvlc_media_player_get_state(p_mlp->p_mi, p_e);
+ libvlc_state_t state = libvlc_media_player_get_state(p_mlp->p_mi);
return (state == libvlc_Opening) || (state == libvlc_Buffering) ||
(state == libvlc_Playing);
}
* State (Public)
**************************************************************************/
libvlc_state_t
-libvlc_media_list_player_get_state(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
+libvlc_media_list_player_get_state(libvlc_media_list_player_t * p_mlp)
{
if (!p_mlp->p_mi)
return libvlc_Ended;
- return libvlc_media_player_get_state(p_mlp->p_mi, p_e);
+ return libvlc_media_player_get_state(p_mlp->p_mi);
}
/**************************************************************************
* Play item at index (Public)
**************************************************************************/
-void libvlc_media_list_player_play_item_at_index(libvlc_media_list_player_t * p_mlp, int i_index, libvlc_exception_t * p_e)
+void libvlc_media_list_player_play_item_at_index(libvlc_media_list_player_t * p_mlp, int i_index, libvlc_exception_t *p_e)
{
- VLC_UNUSED(p_e);
-
lock(p_mlp);
set_current_playing_item(p_mlp, libvlc_media_list_path_with_root_index(i_index));
libvlc_media_player_play(p_mlp->p_mi, p_e);
*
* Lock must be held.
**************************************************************************/
-static void stop(libvlc_media_list_player_t * p_mlp, libvlc_exception_t * p_e)
+static void stop(libvlc_media_list_player_t * p_mlp)
{
assert_locked(p_mlp);
{
/* We are not interested in getting media stop event now */
uninstall_media_player_observer(p_mlp);
- libvlc_media_player_stop(p_mlp->p_mi, p_e);
+ libvlc_media_player_stop(p_mlp->p_mi);
install_media_player_observer(p_mlp);
}
/**************************************************************************
* Stop (Public)
**************************************************************************/
-void libvlc_media_list_player_stop(libvlc_media_list_player_t * p_mlp,
- libvlc_exception_t * p_e)
+void libvlc_media_list_player_stop(libvlc_media_list_player_t * p_mlp)
{
lock(p_mlp);
- stop(p_mlp, p_e);
+ stop(p_mlp);
unlock(p_mlp);
}
**************************************************************************/
void libvlc_media_list_player_set_playback_mode(
libvlc_media_list_player_t * p_mlp,
- libvlc_playback_mode_t e_mode,
- libvlc_exception_t * p_e )
+ libvlc_playback_mode_t e_mode )
{
- VLC_UNUSED(p_e);
-
lock(p_mlp);
p_mlp->e_playback_mode = e_mode;
unlock(p_mlp);
**************************************************************************/
void libvlc_media_player_set_media(
libvlc_media_player_t *p_mi,
- libvlc_media_t *p_md,
- libvlc_exception_t *p_e )
+ libvlc_media_t *p_md )
{
- VLC_UNUSED(p_e);
-
lock(p_mi);
/* FIXME I am not sure if it is a user request or on die(eof/error)
* Get the Media descriptor associated with the instance.
**************************************************************************/
libvlc_media_t *
-libvlc_media_player_get_media(
- libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+libvlc_media_player_get_media( libvlc_media_player_t *p_mi )
{
libvlc_media_t *p_m;
- VLC_UNUSED(p_e);
lock(p_mi);
p_m = p_mi->p_md;
* Get the event Manager.
**************************************************************************/
libvlc_event_manager_t *
-libvlc_media_player_event_manager(
- libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+libvlc_media_player_event_manager( libvlc_media_player_t *p_mi )
{
- VLC_UNUSED(p_e);
-
return p_mi->p_event_manager;
}
if( !p_input_thread )
return;
- libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e );
+ libvlc_state_t state = libvlc_media_player_get_state( p_mi );
if( state == libvlc_Playing || state == libvlc_Buffering )
{
if( libvlc_media_player_can_pause( p_mi, p_e ) )
input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S );
else
- libvlc_media_player_stop( p_mi, p_e );
+ libvlc_media_player_stop( p_mi );
}
else
input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S );
*
* Enter with lock held.
**************************************************************************/
-int libvlc_media_player_is_playing( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+int libvlc_media_player_is_playing( libvlc_media_player_t *p_mi )
{
- libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e );
+ libvlc_state_t state = libvlc_media_player_get_state( p_mi );
return (libvlc_Playing == state) || (libvlc_Buffering == state);
}
/**************************************************************************
* Stop playing.
**************************************************************************/
-void libvlc_media_player_stop( libvlc_media_player_t *p_mi,
- libvlc_exception_t *p_e )
+void libvlc_media_player_stop( libvlc_media_player_t *p_mi )
{
- libvlc_state_t state = libvlc_media_player_get_state( p_mi, p_e );
+ libvlc_state_t state = libvlc_media_player_get_state( p_mi );
lock(p_mi);
release_input_thread( p_mi, true ); /* This will stop the input thread */
* set_nsobject
**************************************************************************/
void libvlc_media_player_set_nsobject( libvlc_media_player_t *p_mi,
- void * drawable,
- libvlc_exception_t *p_e )
+ void * drawable )
{
- (void) p_e;
p_mi->drawable.nsobject = drawable;
}
* set_agl
**************************************************************************/
void libvlc_media_player_set_agl( libvlc_media_player_t *p_mi,
- uint32_t drawable,
- libvlc_exception_t *p_e )
+ uint32_t drawable )
{
- (void) p_e;
p_mi->drawable.agl = drawable;
}
* set_xwindow
**************************************************************************/
void libvlc_media_player_set_xwindow( libvlc_media_player_t *p_mi,
- uint32_t drawable,
- libvlc_exception_t *p_e )
+ uint32_t drawable )
{
- (void) p_e;
p_mi->drawable.xid = drawable;
}
* set_hwnd
**************************************************************************/
void libvlc_media_player_set_hwnd( libvlc_media_player_t *p_mi,
- void *drawable,
- libvlc_exception_t *p_e )
+ void *drawable )
{
- (void) p_e;
p_mi->drawable.hwnd = drawable;
}
return f_rate;
}
-libvlc_state_t libvlc_media_player_get_state( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e )
+libvlc_state_t libvlc_media_player_get_state( libvlc_media_player_t *p_mi )
{
- VLC_UNUSED(p_e);
lock(p_mi);
libvlc_state_t state = p_mi->state;
unlock(p_mi);
WINDOWHANDLE visual_id,
mediacontrol_Exception *exception )
{
- libvlc_exception_t ex;
-
mediacontrol_exception_init( exception );
- libvlc_exception_init( &ex );
#ifdef WIN32
- libvlc_media_player_set_hwnd( self->p_media_player, visual_id, &ex );
+ libvlc_media_player_set_hwnd( self->p_media_player, visual_id );
#else
- libvlc_media_player_set_xwindow( self->p_media_player, visual_id, &ex );
+ libvlc_media_player_set_xwindow( self->p_media_player, visual_id );
#endif
- HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
return true;
}
mediacontrol_exception_init( exception );
libvlc_exception_init( &ex );
- p_media = libvlc_media_player_get_media( self->p_media_player, &ex );
- HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+ p_media = libvlc_media_player_get_media( self->p_media_player );
if ( ! p_media )
{
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
- libvlc_media_player_set_media( self->p_media_player, p_media, &ex );
- HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+ libvlc_media_player_set_media( self->p_media_player, p_media );
libvlc_media_player_play( self->p_media_player, &ex );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
mediacontrol_exception_init( exception );
libvlc_exception_init( &ex );
- libvlc_media_player_stop( self->p_media_player, &ex );
- HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+ libvlc_media_player_stop( self->p_media_player );
}
/**************************************************************************
p_media = libvlc_media_new( self->p_instance, psz_file, &ex );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
- libvlc_media_player_set_media( self->p_media_player, p_media, &ex );
- HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+ libvlc_media_player_set_media( self->p_media_player, p_media );
}
char *
mediacontrol_exception_init( exception );
libvlc_exception_init( &ex );
- p_media = libvlc_media_player_get_media( self->p_media_player, &ex );
- HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
+ p_media = libvlc_media_player_get_media( self->p_media_player );
if ( ! p_media )
{
return NULL;
}
- p_media = libvlc_media_player_get_media( self->p_media_player, &ex );
- if( libvlc_exception_raised( &ex ) )
- {
- free( retval );
- RAISE( mediacontrol_InternalException, libvlc_errmsg( ) );
- libvlc_exception_clear( &ex );
- return NULL;
- }
-
+ p_media = libvlc_media_player_get_media( self->p_media_player );
if( ! p_media )
{
/* No p_media defined */
{
libvlc_state_t state;
- state = libvlc_media_player_get_state( self->p_media_player, &ex );
- if( libvlc_exception_raised( &ex ) )
- {
- free( retval );
- RAISE( mediacontrol_InternalException, libvlc_errmsg() );
- libvlc_exception_clear( &ex );
- return NULL;
- }
-
+ state = libvlc_media_player_get_state( self->p_media_player );
switch( state )
{
case libvlc_NothingSpecial:
bool * callback_was_called = user_data;
libvlc_event_manager_t *em;
- em = libvlc_media_player_event_manager (event->p_obj, &ex);
- catch();
+ em = libvlc_media_player_event_manager (event->p_obj);
libvlc_event_detach (em, event->type, test_events_callback_and_detach, user_data, &ex);
*callback_was_called = true;
mi = libvlc_media_player_new (vlc, &ex);
catch ();
- em = libvlc_media_player_event_manager (mi, &ex);
+ em = libvlc_media_player_event_manager (mi);
log ("+ Testing attaching to Media Instance\n");
queue_expected_item(&check, media_list_add_file_path(vlc, subitems, file));
libvlc_media_list_release(subitems);
- libvlc_media_list_player_set_media_list (mlp, ml, &ex);
+ libvlc_media_list_player_set_media_list (mlp, ml);
libvlc_event_manager_t * em = libvlc_media_list_player_event_manager(mlp);
libvlc_event_attach(em, libvlc_MediaListPlayerNextItemSet, check_items_order_callback, &check, &ex);
// Wait until all item are read
wait_queued_items(&check);
- libvlc_media_list_player_stop (mlp, &ex);
- catch ();
-
- while (libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ libvlc_media_list_player_stop (mlp);
+ while (libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_list_player_release (mlp);
- catch ();
-
libvlc_release (vlc);
- catch ();
}
static void test_media_list_player_previous(const char** argv, int argc)
media_list_add_file_path (vlc, ml, file);
media_list_add_file_path (vlc, ml, file);
- libvlc_media_list_player_set_media_list (mlp, ml, &ex);
+ libvlc_media_list_player_set_media_list (mlp, ml);
libvlc_media_list_player_play_item (mlp, md, &ex);
catch ();
- while (!libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (!libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_release (md);
libvlc_media_list_player_previous (mlp, &ex);
catch ();
- while (!libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (!libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_list_player_pause (mlp, &ex);
catch();
libvlc_media_list_player_previous (mlp, &ex);
catch ();
- while (!libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (!libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
- libvlc_media_list_player_stop (mlp, &ex);
- catch ();
+ libvlc_media_list_player_stop (mlp);
- while (libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_list_player_previous (mlp, &ex);
catch ();
- while (!libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (!libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
- libvlc_media_list_player_stop (mlp, &ex);
- catch ();
+ libvlc_media_list_player_stop (mlp);
- while (libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_list_player_release (mlp);
- catch ();
-
libvlc_release (vlc);
- catch ();
}
static void test_media_list_player_next(const char** argv, int argc)
media_list_add_file_path (vlc, ml, file);
media_list_add_file_path (vlc, ml, file);
- libvlc_media_list_player_set_media_list (mlp, ml, &ex);
+ libvlc_media_list_player_set_media_list (mlp, ml);
libvlc_media_list_player_play_item (mlp, md, &ex);
catch ();
libvlc_media_release (md);
- while (!libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (!libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_list_player_next (mlp, &ex);
catch ();
- while (!libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (!libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_list_player_pause (mlp, &ex);
catch();
libvlc_media_list_player_next (mlp, &ex);
catch ();
- while (!libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (!libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
- libvlc_media_list_player_stop (mlp, &ex);
- catch ();
+ libvlc_media_list_player_stop (mlp);
- while (libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_list_player_next (mlp, &ex);
catch ();
- while (!libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (!libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
- libvlc_media_list_player_stop (mlp, &ex);
- catch ();
-
- while (libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ libvlc_media_list_player_stop (mlp);
+ while (libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_list_player_release (mlp);
- catch ();
-
libvlc_release (vlc);
- catch ();
}
static void test_media_list_player_pause_stop(const char** argv, int argc)
libvlc_media_list_add_media( ml, md, &ex );
catch ();
- libvlc_media_list_player_set_media_list( mlp, ml, &ex );
+ libvlc_media_list_player_set_media_list( mlp, ml );
libvlc_media_list_player_play_item( mlp, md, &ex );
catch ();
- while (!libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (!libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_list_player_pause (mlp, &ex);
catch();
- libvlc_media_list_player_stop (mlp, &ex);
- catch ();
+ libvlc_media_list_player_stop (mlp);
- while (libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_release (md);
-
libvlc_media_list_player_release (mlp);
- catch ();
-
libvlc_release (vlc);
- catch ();
}
static void test_media_list_player_play_item_at_index(const char** argv, int argc)
catch ();
}
- libvlc_media_list_player_set_media_list( mlp, ml, &ex );
+ libvlc_media_list_player_set_media_list( mlp, ml );
libvlc_media_list_player_play_item_at_index( mlp, 0, &ex );
catch ();
- while (!libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (!libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
- libvlc_media_list_player_stop (mlp, &ex);
- catch ();
+ libvlc_media_list_player_stop (mlp);
- while (libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_release (md);
- catch ();
-
libvlc_media_list_player_release (mlp);
- catch ();
-
libvlc_release (vlc);
- catch ();
}
static void test_media_list_player_playback_options (const char** argv, int argc)
mlp = libvlc_media_list_player_new (vlc, &ex);
catch ();
- libvlc_media_list_player_set_media_list (mlp, ml, &ex);
- catch ();
+ libvlc_media_list_player_set_media_list (mlp, ml);
// Test default playback mode
- libvlc_media_list_player_set_playback_mode(mlp, libvlc_playback_mode_default, &ex);
- catch ();
+ libvlc_media_list_player_set_playback_mode(mlp, libvlc_playback_mode_default);
libvlc_media_list_player_play_item (mlp, md, &ex);
catch ();
- while (!libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (!libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_release (md);
- catch ();
libvlc_media_release (md2);
- catch ();
libvlc_media_release (md3);
- catch ();
libvlc_media_release (md4);
- catch ();
libvlc_media_release (md5);
- catch ();
- libvlc_media_list_player_stop (mlp, &ex);
- catch ();
+ libvlc_media_list_player_stop (mlp);
- while (libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
// Test looping playback mode
log ("Testing media player playback option - Loop\n");
- libvlc_media_list_player_set_playback_mode(mlp, libvlc_playback_mode_loop, &ex);
- catch ();
+ libvlc_media_list_player_set_playback_mode(mlp, libvlc_playback_mode_loop);
libvlc_media_list_player_play_item (mlp, md, &ex);
catch ();
- while (!libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (!libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
- libvlc_media_list_player_stop (mlp, &ex);
- catch ();
+ libvlc_media_list_player_stop (mlp);
- while (libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
// Test repeat playback mode
log ("Testing media player playback option - Repeat\n");
- libvlc_media_list_player_set_playback_mode(mlp, libvlc_playback_mode_repeat, &ex);
- catch ();
+ libvlc_media_list_player_set_playback_mode(mlp, libvlc_playback_mode_repeat);
libvlc_media_list_player_play_item (mlp, md, &ex);
catch ();
- while (!libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (!libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
- libvlc_media_list_player_stop (mlp, &ex);
- catch ();
+ libvlc_media_list_player_stop (mlp);
- while (libvlc_media_list_player_is_playing (mlp, &ex))
- catch() ;
+ while (libvlc_media_list_player_is_playing (mlp))
+ sched_yield();
libvlc_media_list_player_release (mlp);
- catch ();
-
libvlc_release (vlc);
- catch ();
}
/* Wait a correct state */
libvlc_state_t state;
do {
- state = libvlc_media_player_get_state (mi, &ex);
- catch ();
+ state = libvlc_media_player_get_state (mi);
} while( state != libvlc_Playing &&
state != libvlc_Error &&
state != libvlc_Ended );
assert( state == libvlc_Playing || state == libvlc_Ended );
- libvlc_media_player_stop (mi, &ex);
- catch ();
-
+ libvlc_media_player_stop (mi);
libvlc_media_player_release (mi);
- catch ();
-
libvlc_release (vlc);
- catch ();
}
static void test_media_player_pause_stop(const char** argv, int argc)
/* Wait a correct state */
libvlc_state_t state;
do {
- state = libvlc_media_player_get_state (mi, &ex);
+ state = libvlc_media_player_get_state (mi);
catch ();
} while( state != libvlc_Playing &&
state != libvlc_Error &&
/* Wait a correct state */
do {
- state = libvlc_media_player_get_state (mi, &ex);
- catch ();
+ state = libvlc_media_player_get_state (mi);
} while( state != libvlc_Paused &&
state != libvlc_Error &&
state != libvlc_Ended );
assert( state == libvlc_Paused || state == libvlc_Ended );
- catch();
#endif
- libvlc_media_player_stop (mi, &ex);
- catch ();
-
+ libvlc_media_player_stop (mi);
libvlc_media_player_release (mi);
- catch ();
-
libvlc_release (vlc);
- catch ();
}
projects / vlc / commitdiff