Commit 97021ec3 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

Fix build.

parent 38e7aa15
...@@ -66,7 +66,7 @@ static inline libvlc_media_list_path_t libvlc_media_list_path_with_root_index( i ...@@ -66,7 +66,7 @@ static inline libvlc_media_list_path_t libvlc_media_list_path_with_root_index( i
} }
/************************************************************************** /**************************************************************************
* path_deepness (Media List Player Internal) * path_deepth (Media List Player Internal)
**************************************************************************/ **************************************************************************/
static inline int libvlc_media_list_path_depth( const libvlc_media_list_path_t path ) static inline int libvlc_media_list_path_depth( const libvlc_media_list_path_t path )
{ {
...@@ -80,10 +80,10 @@ static inline int libvlc_media_list_path_depth( const libvlc_media_list_path_t p ...@@ -80,10 +80,10 @@ static inline int libvlc_media_list_path_depth( const libvlc_media_list_path_t p
**************************************************************************/ **************************************************************************/
static inline void libvlc_media_list_path_append( libvlc_media_list_path_t * p_path, int index ) static inline void libvlc_media_list_path_append( libvlc_media_list_path_t * p_path, int index )
{ {
int old_deepness = libvlc_media_list_path_deepness( *p_path ); int old_deepth = libvlc_media_list_path_depth( *p_path );
*p_path = realloc( *p_path, sizeof(int)*(old_deepness+2)); *p_path = realloc( *p_path, sizeof(int)*(old_deepth+2));
*p_path[old_deepness] = index; *p_path[old_deepth] = index;
*p_path[old_deepness+1] = -1; *p_path[old_deepth+1] = -1;
} }
/************************************************************************** /**************************************************************************
...@@ -106,9 +106,9 @@ static inline libvlc_media_list_path_t libvlc_media_list_path_copy_by_appending( ...@@ -106,9 +106,9 @@ static inline libvlc_media_list_path_t libvlc_media_list_path_copy_by_appending(
static inline libvlc_media_list_path_t libvlc_media_list_path_copy( const libvlc_media_list_path_t path ) static inline libvlc_media_list_path_t libvlc_media_list_path_copy( const libvlc_media_list_path_t path )
{ {
libvlc_media_list_path_t ret; libvlc_media_list_path_t ret;
int deepness = libvlc_media_list_path_deepness( path ); int depth = libvlc_media_list_path_depth( path );
ret = malloc( sizeof(int)*(deepness+1) ); ret = malloc( sizeof(int)*(depth+1) );
memcpy( ret, path, sizeof(int)*(deepness+1) ); memcpy( ret, path, sizeof(int)*(depth+1) );
return ret; return ret;
} }
......
...@@ -86,7 +86,7 @@ get_next_path( libvlc_media_list_player_t * p_mlp ) ...@@ -86,7 +86,7 @@ get_next_path( libvlc_media_list_player_t * p_mlp )
p_mlp->p_mlist, p_mlp->p_mlist,
p_mlp->current_playing_item_path ); p_mlp->current_playing_item_path );
int deepness = libvlc_media_list_path_deepness( p_mlp->current_playing_item_path ); int deepness = libvlc_media_list_path_depth( p_mlp->current_playing_item_path );
if( deepness < 1 || !p_parent_of_playing_item ) if( deepness < 1 || !p_parent_of_playing_item )
return NULL; return NULL;
......
...@@ -71,6 +71,8 @@ static inline libvlc_state_t vlc_to_libvlc_state( int vlc_state ) ...@@ -71,6 +71,8 @@ static inline libvlc_state_t vlc_to_libvlc_state( int vlc_state )
return vlc_to_libvlc_state_array[vlc_state]; return vlc_to_libvlc_state_array[vlc_state];
} }
static void libvlc_media_player_destroy( libvlc_media_player_t *p_mi );
/* /*
* Release the associated input thread. * Release the associated input thread.
* *
...@@ -410,7 +412,7 @@ libvlc_media_player_t * libvlc_media_player_new_from_input_thread( ...@@ -410,7 +412,7 @@ libvlc_media_player_t * libvlc_media_player_new_from_input_thread(
* *
* Warning: No lock held here, but hey, this is internal. Caller must lock. * Warning: No lock held here, but hey, this is internal. Caller must lock.
**************************************************************************/ **************************************************************************/
void libvlc_media_player_destroy( libvlc_media_player_t *p_mi ) static void libvlc_media_player_destroy( libvlc_media_player_t *p_mi )
{ {
input_thread_t *p_input_thread; input_thread_t *p_input_thread;
libvlc_exception_t p_e; libvlc_exception_t p_e;
......
...@@ -48,11 +48,16 @@ struct libvlc_media_player_t ...@@ -48,11 +48,16 @@ struct libvlc_media_player_t
uint32_t xid; uint32_t xid;
uint32_t agl; uint32_t agl;
} drawable; } drawable;
bool b_own_its_input_thread;
}; };
/* Media player - audio, video */ /* Media player - audio, video */
input_thread_t *libvlc_get_input_thread(libvlc_media_player_t *, libvlc_exception_t * ); input_thread_t *libvlc_get_input_thread(libvlc_media_player_t *, libvlc_exception_t * );
libvlc_media_player_t * libvlc_media_player_new_from_input_thread(
struct libvlc_instance_t *p_libvlc_instance,
input_thread_t *p_input,
libvlc_exception_t *p_e );
libvlc_track_description_t * libvlc_get_track_description( libvlc_track_description_t * libvlc_get_track_description(
libvlc_media_player_t *p_mi, libvlc_media_player_t *p_mi,
......
...@@ -22,9 +22,10 @@ ...@@ -22,9 +22,10 @@
*****************************************************************************/ *****************************************************************************/
#include "libvlc_internal.h" #include "libvlc_internal.h"
#include "media_player_internal.h"
#include "libvlc.h" #include "libvlc.h"
#include <vlc/libvlc.h> #include <vlc/vlc.h>
#include <vlc_playlist.h> #include <vlc_playlist.h>
#include <assert.h> #include <assert.h>
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <vlc_vout.h> #include <vlc_vout.h>
#include "media_player_internal.h" #include "media_player_internal.h"
#include "libvlc_internal.h"
/* /*
* Remember to release the returned vout_thread_t. * Remember to release the returned vout_thread_t.
......
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