Skip to content

V
vlc-1.1
Commit a83d27a6 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

control/flat_media_list_view.c: Use the new media_list_view object. (Plus minor header cleanup).

parent 73664101
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 386 deletions
src/control/flat_media_list.c deleted 100644 → 0
View file @ 73664101
/*****************************************************************************
* flat_media_list.c: libvlc flat media list functions. (extension to
* media_list.c).
*****************************************************************************
* Copyright (C) 2007 the VideoLAN team
* $Id: flat_media_list.c 21287 2007-08-20 01:28:12Z pdherbemont $
*
* Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "libvlc_internal.h"
#include <vlc/libvlc.h>
#include <assert.h>
#include "vlc_arrays.h"
//#define DEBUG_FLAT_LIST
#ifdef DEBUG_FLAT_LIST
# define trace( fmt, ... ) printf( "%s(): " fmt, __FUNCTION__, ##__VA_ARGS__ )
#else
# define trace( ... )
#endif
/*
* Private functions
*/
static void add_media_list( libvlc_media_list_t * p_mlist, libvlc_media_list_t * p_submlist );
static void remove_media_list( libvlc_media_list_t * p_fmlist, libvlc_media_list_t * p_mlist );
static void add_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md );
static void remove_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md );
static void subitems_created( const libvlc_event_t * p_event , void * p_user_data);
static void sublist_item_added( const libvlc_event_t * p_event, void * p_user_data );
static void sublist_item_removed( const libvlc_event_t * p_event, void * p_user_data );
static void install_flat_mlist_observer( libvlc_media_list_t * p_mlist );
static void uninstall_flat_mlist_observer( libvlc_media_list_t * p_mlist );
/**************************************************************************
* uninstall_media_list_observer (Private)
**************************************************************************/
static void
uninstall_media_list_observer( libvlc_media_list_t * p_mlist,
libvlc_media_list_t * p_submlist )
{
trace("\n");
libvlc_event_detach( p_submlist->p_event_manager,
libvlc_MediaListItemAdded,
sublist_item_added, p_mlist, NULL );
libvlc_event_detach( p_submlist->p_event_manager,
libvlc_MediaListItemDeleted,
sublist_item_removed, p_mlist, NULL );
}
/**************************************************************************
* install_media_list_observer (Private)
**************************************************************************/
static void
install_media_list_observer( libvlc_media_list_t * p_mlist,
libvlc_media_list_t * p_submlist )
{
trace("\n");
libvlc_event_attach( p_submlist->p_event_manager,
libvlc_MediaListItemAdded,
sublist_item_added, p_mlist, NULL );
libvlc_event_attach( p_submlist->p_event_manager,
libvlc_MediaListItemDeleted,
sublist_item_removed, p_mlist, NULL );
}
/**************************************************************************
* add_media_list (Private)
**************************************************************************/
static void
add_media_list( libvlc_media_list_t * p_mlist,
libvlc_media_list_t * p_submlist )
{
int count = libvlc_media_list_count( p_submlist, NULL );
int i;
trace("\n");
for( i = 0; i < count; i++ )
{
libvlc_media_descriptor_t * p_md;
p_md = libvlc_media_list_item_at_index( p_submlist, i, NULL );
add_item( p_mlist, p_md );
}
install_media_list_observer( p_mlist, p_submlist );
}
/**************************************************************************
* remove_media_list (Private)
**************************************************************************/
static void
remove_media_list( libvlc_media_list_t * p_mlist,
libvlc_media_list_t * p_submlist )
{
trace("\n");
int count = libvlc_media_list_count( p_submlist, NULL );
int i;
uninstall_media_list_observer( p_mlist, p_submlist );
for( i = 0; i < count; i++ )
{
libvlc_media_descriptor_t * p_md;
p_md = libvlc_media_list_item_at_index( p_submlist, i, NULL );
remove_item( p_mlist, p_md );
}
}
/**************************************************************************
* add_item (private)
**************************************************************************/
static void
add_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md )
{
trace( "p_md '%s'\n", p_md->p_input_item->psz_name );
/* Only add the media descriptor once to our flat list */
if( libvlc_media_list_index_of_item( p_mlist->p_flat_mlist, p_md, NULL ) < 0 )
{
if( p_md->p_subitems )
{
add_media_list( p_mlist, p_md->p_subitems );
}
else
{
libvlc_media_list_lock( p_mlist->p_flat_mlist );
libvlc_event_attach( p_md->p_event_manager,
libvlc_MediaDescriptorSubItemAdded,
subitems_created, p_mlist, NULL );
uninstall_flat_mlist_observer( p_mlist );
libvlc_media_list_add_media_descriptor( p_mlist->p_flat_mlist,
p_md, NULL );
install_flat_mlist_observer( p_mlist );
libvlc_media_list_unlock( p_mlist->p_flat_mlist );
}
}
}
/**************************************************************************
* remove_item (private)
**************************************************************************/
static void
remove_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md )
{
trace( "p_md '%s'\n", p_md->p_input_item->psz_name );
if( p_md->p_subitems ) /* XXX: Don't access that directly */
remove_media_list( p_mlist, p_md->p_subitems );
libvlc_event_detach( p_md->p_event_manager,
libvlc_MediaDescriptorSubItemAdded,
subitems_created, p_mlist, NULL );
libvlc_media_list_lock( p_mlist->p_flat_mlist );
int i = libvlc_media_list_index_of_item( p_mlist->p_flat_mlist, p_md, NULL );
if( i >= 0 )
{
uninstall_flat_mlist_observer( p_mlist );
libvlc_media_list_remove_index( p_mlist->p_flat_mlist, i, NULL );
install_flat_mlist_observer( p_mlist );
}
libvlc_media_list_unlock( p_mlist->p_flat_mlist );
}
/**************************************************************************
* subitems_created (private) (Event Callback)
**************************************************************************/
static void
subitems_created( const libvlc_event_t * p_event , void * p_user_data)
{
libvlc_media_list_t * p_mlist = p_user_data;
libvlc_media_descriptor_t * p_md = p_event->p_obj;
trace( "parent p_md '%s'\n", p_md->p_input_item->psz_name );
/* Remove the item and add the playlist */
libvlc_media_list_lock( p_mlist->p_flat_mlist );
int i = libvlc_media_list_index_of_item( p_mlist->p_flat_mlist, p_md, NULL );
if( i >= 0 )
{
libvlc_event_detach_lock_state( p_md->p_event_manager,
libvlc_MediaDescriptorSubItemAdded,
subitems_created, p_mlist, libvlc_Locked, NULL );
uninstall_flat_mlist_observer( p_mlist );
libvlc_media_list_remove_index( p_mlist->p_flat_mlist, i, NULL );
install_flat_mlist_observer( p_mlist );
}
libvlc_media_list_unlock( p_mlist->p_flat_mlist );
trace( "Adding p_md '%s''s media list\n", p_md->p_input_item->psz_name );
add_media_list( p_mlist, p_md->p_subitems );
trace( "done\n" );
}
/**************************************************************************
* sublist_item_added (private) (Event Callback)
*
* This is called if the dynamic sublist's data provider adds a new item.
**************************************************************************/
static void
sublist_item_added( const libvlc_event_t * p_event, void * p_user_data )
{
libvlc_media_list_t * p_mlist = p_user_data;
libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_added.item;
trace( "p_md '%s'\n", p_md->p_input_item->psz_name );
add_item( p_mlist, p_md );
}
/**************************************************************************
* sublist_remove_item (private) (Event Callback)
**************************************************************************/
static void
sublist_item_removed( const libvlc_event_t * p_event, void * p_user_data )
{
libvlc_media_list_t * p_mlist = p_user_data;
libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_deleted.item;
trace( "p_md '%s'\n", p_md->p_input_item->psz_name );
remove_item( p_mlist, p_md );
}
/**************************************************************************
* remove_item_in_submlist_rec (private)
**************************************************************************/
static void
remove_item_in_submlist_rec( libvlc_media_list_t * p_mlist,
libvlc_media_list_t * p_submlist,
libvlc_media_descriptor_t * p_md )
{
libvlc_media_descriptor_t * p_md_insub;
int count = libvlc_media_list_count( p_submlist, NULL );
int i;
trace("p_md '%s'\n", p_md->p_input_item->psz_name);
for( i = 0; i < count; i++ )
{
p_md_insub = libvlc_media_list_item_at_index( p_submlist,
i, NULL );
if( p_md == p_md_insub )
{
libvlc_media_list_lock( p_submlist );
uninstall_media_list_observer( p_mlist, p_submlist );
libvlc_media_list_remove_index( p_submlist, i, NULL );
install_media_list_observer( p_mlist, p_submlist );
libvlc_media_list_unlock( p_submlist );
} else if( p_md_insub->p_subitems )
remove_item_in_submlist_rec( p_mlist, p_md_insub->p_subitems, p_md );
}
}
/**************************************************************************
* flat_mlist_item_removed (private) (Event Callback)
**************************************************************************/
static void
flat_mlist_item_removed( const libvlc_event_t * p_event, void * p_user_data )
{
trace("\n");
/* Remove all occurences of that one in sublist */
libvlc_media_list_t * p_mlist = p_user_data;
libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_deleted.item;
remove_item( p_mlist, p_md ); /* Just to detach the event */
remove_item_in_submlist_rec( p_mlist, p_mlist, p_md );
}
/**************************************************************************
* flat_mlist_item_added (private) (Event Callback)
**************************************************************************/
static void
flat_mlist_item_added( const libvlc_event_t * p_event, void * p_user_data )
{
trace("\n");
libvlc_media_list_t * p_mlist = p_user_data;
libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_added.item;
libvlc_event_attach( p_md->p_event_manager,
libvlc_MediaDescriptorSubItemAdded,
subitems_created, p_mlist, NULL );
/* Add in our root */
uninstall_media_list_observer( p_mlist, p_mlist );
libvlc_media_list_add_media_descriptor( p_mlist, p_md, NULL );
install_media_list_observer( p_mlist, p_mlist );
}
/**************************************************************************
* install_flat_mlist_observer (Private)
**************************************************************************/
static void
install_flat_mlist_observer( libvlc_media_list_t * p_mlist )
{
trace("\n");
libvlc_event_attach( p_mlist->p_flat_mlist->p_event_manager,
libvlc_MediaListItemAdded,
flat_mlist_item_added, p_mlist, NULL );
libvlc_event_attach( p_mlist->p_flat_mlist->p_event_manager,
libvlc_MediaListItemDeleted,
flat_mlist_item_removed, p_mlist, NULL );
}
/**************************************************************************
* uninstall_flat_mlist_observer (Private)
**************************************************************************/
static void
uninstall_flat_mlist_observer( libvlc_media_list_t * p_mlist )
{
trace("\n");
libvlc_event_detach( p_mlist->p_flat_mlist->p_event_manager,
libvlc_MediaListItemAdded,
flat_mlist_item_added, p_mlist, NULL );
libvlc_event_detach( p_mlist->p_flat_mlist->p_event_manager,
libvlc_MediaListItemDeleted,
flat_mlist_item_removed, p_mlist, NULL );
}
/*
* libvlc Internal functions
*/
/**************************************************************************
* flat_media_list_release (Internal)
**************************************************************************/
void
libvlc_media_list_flat_media_list_release( libvlc_media_list_t * p_mlist )
{
if( !p_mlist->p_flat_mlist )
return;
uninstall_flat_mlist_observer( p_mlist );
libvlc_media_list_release( p_mlist->p_flat_mlist );
}
/*
* Public libvlc functions
*/
/**************************************************************************
* media_list (Public)
**************************************************************************/
libvlc_media_list_t *
libvlc_media_list_flat_media_list( libvlc_media_list_t * p_mlist,
libvlc_exception_t * p_e )
{
trace("\n");
libvlc_media_list_lock( p_mlist );
if( !p_mlist->p_flat_mlist )
{
p_mlist->p_flat_mlist = libvlc_media_list_new(
p_mlist->p_libvlc_instance,
p_e );
add_media_list( p_mlist, p_mlist );
}
libvlc_media_list_unlock( p_mlist );
libvlc_media_list_retain( p_mlist->p_flat_mlist );
return p_mlist->p_flat_mlist;
}
src/control/flat_media_list_view.c 0 → 100644
View file @ a83d27a6
/*****************************************************************************
* flat_media_list_view.c: libvlc flat media list view functions.
*****************************************************************************
* Copyright (C) 2007 the VideoLAN team
* $Id: flat_media_list.c 21287 2007-08-20 01:28:12Z pdherbemont $
*
* Authors: Pierre d'Herbemont <pdherbemont # videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "libvlc_internal.h"
#include <vlc/libvlc.h>
#include <assert.h>
#include "vlc_arrays.h"
//#define DEBUG_FLAT_VIEW
#ifdef DEBUG_FLAT_VIEW
# define trace( fmt, ... ) printf( "%s(): " fmt, __FUNCTION__, ##__VA_ARGS__ )
#else
# define trace( ... )
#endif
struct libvlc_media_list_view_private_t
{
vlc_array_t array;
};
/*
* Private functions
*/
static void add_item( libvlc_media_list_view_t * p_mlv, libvlc_media_descriptor_t * p_md );
static void remove_item( libvlc_media_list_view_t * p_mlv, libvlc_media_descriptor_t * p_md );
static void flat_media_list_view_release( libvlc_media_list_view_t * p_mlv );
/**************************************************************************
* add_item (private)
**************************************************************************/
static void
add_item( libvlc_media_list_view_t * p_mlv, libvlc_media_descriptor_t * p_md )
{
trace( "p_md '%s'\n", p_md->p_input_item->psz_name );
libvlc_media_descriptor_retain( p_md );
vlc_array_append( &p_mlv->p_this_view_data->array, p_md );
}
/**************************************************************************
* remove_item (private)
**************************************************************************/
static void
remove_item( libvlc_media_list_view_t * p_mlv, libvlc_media_descriptor_t * p_md )
{
trace( "p_md '%s'\n", p_md->p_input_item->psz_name );
int index = libvlc_media_list_index_of_item( p_mlv, p_md, NULL );
if( index < 0 )
return;
libvlc_media_descriptor_release( p_md );
vlc_array_remove( &p_mlv->p_this_view_data->array, index );
}
/**************************************************************************
* flat_media_list_view_count (private)
* (called by media_list_view_count)
**************************************************************************/
static int
flat_media_list_view_count( libvlc_media_list_view_t * p_mlv,
libvlc_exception_t * p_e )
{
(void)p_e;
return vlc_array_count( &p_mlv->p_this_view_data->array );
}
/**************************************************************************
* flat_media_list_view_item_at_index (private)
* (called by flat_media_list_view_item_at_index)
**************************************************************************/
static libvlc_media_descriptor_t *
flat_media_list_view_item_at_index( libvlc_media_list_view_t * p_mlv,
int index,
libvlc_exception_t * p_e )
{
libvlc_media_descriptor_t * p_md;
(void)p_e;
p_md = vlc_array_item_at_index( &p_mlv->p_this_view_data->array, index );
libvlc_media_descriptor_retain( p_md );
return p_md;
}
/**************************************************************************
* flat_media_list_view_release (private)
* (called by media_list_view_release)
**************************************************************************/
static void
flat_media_list_view_release( libvlc_media_list_view_t * p_mlv )
{
vlc_array_clear( &p_mlv->p_this_view_data->array );
free( p_mlv->p_this_view_data );
}
/*
* Public libvlc functions
*/
/**************************************************************************
* libvlc_media_list_flat_view (Public)
**************************************************************************/
libvlc_media_list_view_t *
libvlc_media_list_flat_view( libvlc_media_list_t * p_mlist,
libvlc_exception_t * p_e )
{
trace("\n");
libvlc_media_list_view_t * p_mlv;
libvlc_media_list_lock( p_mlist );
struct libvlc_media_list_view_private_t * p_this_view_data;
p_this_view_data = malloc(sizeof(struct libvlc_media_list_view_private_t));
vlc_array_init( &p_this_view_data->array );
p_mlv = libvlc_media_list_view_new( p_mlist,
flat_media_list_view_count,
flat_media_list_view_item_at_index,
flat_media_list_view_release,
p_this_view_data,
p_e );
return p_mlv;
}
src/control/libvlc_internal.h
View file @ a83d27a6
......@@ -283,9 +283,6 @@ VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_new_from_input_
VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_duplicate,
( libvlc_media_descriptor_t * ) );
/* Media List */
VLC_EXPORT ( void, libvlc_media_list_flat_media_list_release, ( libvlc_media_list_t * ) );
/* Media List View */
VLC_EXPORT ( libvlc_media_list_view_t *, libvlc_media_list_view_new,
( libvlc_media_list_t * p_mlist,
......
src/control/media_discoverer.c
View file @ a83d27a6
......@@ -24,7 +24,7 @@
#include "libvlc_internal.h"
#include <vlc/libvlc.h>
#include <assert.h>
#include "vlc_playlist.h"
#include "vlc_services_discovery.h"
/*
* Private functions
......
src/control/media_list.c
View file @ a83d27a6
......@@ -142,9 +142,6 @@ void libvlc_media_list_release( libvlc_media_list_t * p_mlist )
/* Refcount null, time to free */
/* Handled in flat_media_list.c */
libvlc_media_list_flat_media_list_release( p_mlist );
libvlc_event_manager_release( p_mlist->p_event_manager );
if( p_mlist->p_md )
......@@ -152,7 +149,7 @@ void libvlc_media_list_release( libvlc_media_list_t * p_mlist )
for ( i = 0; i < vlc_array_count( &p_mlist->items ); i++ )
{
p_md = vlc_array_object_at_index( &p_mlist->items, i );
p_md = vlc_array_item_at_index( &p_mlist->items, i );
libvlc_media_descriptor_release( p_md );
}
......@@ -313,7 +310,7 @@ void libvlc_media_list_remove_index( libvlc_media_list_t * p_mlist,
{
libvlc_media_descriptor_t * p_md;
p_md = vlc_array_object_at_index( &p_mlist->items, index );
p_md = vlc_array_item_at_index( &p_mlist->items, index );
vlc_array_remove( &p_mlist->items, index );
notify_item_deletion( p_mlist, p_md, index );
......@@ -332,7 +329,7 @@ libvlc_media_list_item_at_index( libvlc_media_list_t * p_mlist,
libvlc_exception_t * p_e )
{
libvlc_media_descriptor_t * p_md;
p_md = vlc_array_object_at_index( &p_mlist->items, index );
p_md = vlc_array_item_at_index( &p_mlist->items, index );
libvlc_media_descriptor_retain( p_md );
return p_md;
}
......@@ -351,7 +348,7 @@ int libvlc_media_list_index_of_item( libvlc_media_list_t * p_mlist,
int i;
for ( i = 0; i < vlc_array_count( &p_mlist->items ); i++ )
{
p_md = vlc_array_object_at_index( &p_mlist->items, i );
p_md = vlc_array_item_at_index( &p_mlist->items, i );
if( p_searched_md == p_md )
return i;
}
......
src/control/playlist.c
View file @ a83d27a6
......@@ -21,12 +21,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "libvlc_internal.h"
#include <vlc/libvlc.h>
#include <vlc_playlist.h>
#include <assert.h>
#include "libvlc_internal.h"
#include "../playlist/playlist_internal.h"
#define PL p_instance->p_libvlc_int->p_playlist
......
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