Skip to content
Snippets Groups Projects
Commit 589e95a4 authored by Thomas Guillem's avatar Thomas Guillem
Browse files

modules: remove mediadirs service discovery 

It is replaced by the medialib.
parent 1cd778c1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
modules/services_discovery/Makefile.am
+ 0
− 3
View file @ 589e95a4
sddir = $(pluginsdir)/services_discovery
sd_LTLIBRARIES =
libmediadirs_plugin_la_SOURCES = services_discovery/mediadirs.c
sd_LTLIBRARIES += libmediadirs_plugin.la
libpodcast_plugin_la_SOURCES = services_discovery/podcast.c
sd_LTLIBRARIES += libpodcast_plugin.la
......
modules/services_discovery/mediadirs.c deleted 100644 → 0
+ 0
− 368
View file @ 1cd778c1
/*****************************************************************************
* mediadirs.c: Picture/Music/Video user directories as service discoveries
*****************************************************************************
* Copyright (C) 2009 the VideoLAN team
*
* Authors: Erwan Tulou <erwan10 aT videolan DoT 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.
*****************************************************************************/
/*****************************************************************************
* Includes
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <sys/stat.h>
#define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_url.h>
#include <vlc_fs.h>
#include <vlc_services_discovery.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
enum type_e { Video = 0, Audio = 1, Picture = 2, Unknown = 3 };
static int Open( vlc_object_t *, enum type_e );
static void Close( vlc_object_t * );
/* Main functions */
#define OPEN_MODULE( type ) \
static int Open##type( vlc_object_t *p_this ) \
{ \
msg_Dbg( p_this, "Starting " #type ); \
return Open( p_this, type ); \
}
OPEN_MODULE( Video )
OPEN_MODULE( Audio )
OPEN_MODULE( Picture )
#undef OPEN_MODULE
static int vlc_sd_probe_Open( vlc_object_t * );
vlc_module_begin ()
set_category( CAT_PLAYLIST )
set_subcategory( SUBCAT_PLAYLIST_SD )
set_shortname( N_("Video") )
set_description( N_("My Videos") )
set_capability( "services_discovery", 0 )
set_callbacks( OpenVideo, Close )
add_shortcut( "video_dir" )
add_submodule ()
set_shortname( N_("Audio") )
set_description( N_("My Music") )
set_capability( "services_discovery", 0 )
set_callbacks( OpenAudio, Close )
add_shortcut( "audio_dir" )
add_submodule ()
set_shortname( N_("Picture") )
set_description( N_("My Pictures") )
set_capability( "services_discovery", 0 )
set_callbacks( OpenPicture, Close )
add_shortcut( "picture_dir" )
VLC_SD_PROBE_SUBMODULE
vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static void* Run( void* );
static void on_input_thread_event(input_thread_t *input,
const struct vlc_input_event *event, void *userdata);
static int onNewFileAdded( vlc_object_t*, char const *,
vlc_value_t, vlc_value_t, void *);
static enum type_e fileType( services_discovery_t *p_sd, const char* psz_file );
static void formatSnapshotItem( input_item_t* );
typedef struct
{
vlc_thread_t thread;
enum type_e i_type;
char* psz_dir[2];
const char* psz_var;
} services_discovery_sys_t;
/*****************************************************************************
* Open: initialize module
*****************************************************************************/
static int Open( vlc_object_t *p_this, enum type_e i_type )
{
services_discovery_t *p_sd = ( services_discovery_t* )p_this;
services_discovery_sys_t *p_sys;
const char *desc;
p_sd->p_sys = p_sys = calloc( 1, sizeof( *p_sys) );
if( !p_sys )
return VLC_ENOMEM;
p_sys->i_type = i_type;
if( p_sys->i_type == Video )
{
desc = N_("My Videos");
p_sys->psz_dir[0] = config_GetUserDir( VLC_VIDEOS_DIR );
p_sys->psz_dir[1] = var_CreateGetString( p_sd, "input-record-path" );
p_sys->psz_var = "record-file";
}
else if( p_sys->i_type == Audio )
{
desc = N_("My Music");
p_sys->psz_dir[0] = config_GetUserDir( VLC_MUSIC_DIR );
p_sys->psz_dir[1] = var_CreateGetString( p_sd, "input-record-path" );
p_sys->psz_var = "record-file";
}
else if( p_sys->i_type == Picture )
{
desc = N_("My Pictures");
p_sys->psz_dir[0] = config_GetUserDir( VLC_PICTURES_DIR );
p_sys->psz_dir[1] = var_CreateGetString( p_sd, "snapshot-path" );
p_sys->psz_var = "snapshot-file";
}
else
{
free( p_sys );
return VLC_EGENERIC;
}
p_sd->description = vlc_gettext(desc);
vlc_object_t *vlc = VLC_OBJECT(vlc_object_instance(p_sd));
var_AddCallback( vlc, p_sys->psz_var, onNewFileAdded, p_sd );
if( vlc_clone( &p_sys->thread, Run, p_sd, VLC_THREAD_PRIORITY_LOW ) )
{
var_DelCallback( vlc, p_sys->psz_var, onNewFileAdded, p_sd );
free( p_sys->psz_dir[1] );
free( p_sys->psz_dir[0] );
free( p_sys );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
/*****************************************************************************
* Run:
*****************************************************************************/
static void *Run( void *data )
{
services_discovery_t *p_sd = data;
services_discovery_sys_t *p_sys = p_sd->p_sys;
int num_dir = sizeof( p_sys->psz_dir ) / sizeof( p_sys->psz_dir[0] );
for( int i = 0; i < num_dir; i++ )
{
char* psz_dir = p_sys->psz_dir[i];
/* make sure the directory exists */
struct stat st;
if( psz_dir == NULL ||
vlc_stat( psz_dir, &st ) ||
!S_ISDIR( st.st_mode ) )
continue;
char* psz_uri = vlc_path2uri( psz_dir, "file" );
input_item_t* p_root = input_item_New( psz_uri, NULL );
if( p_sys->i_type == Picture )
input_item_AddOption( p_root, "ignore-filetypes=ini,db,lnk,txt",
VLC_INPUT_OPTION_TRUSTED|VLC_INPUT_OPTION_UNIQUE );
input_item_AddOption( p_root, "recursive=collapse",
VLC_INPUT_OPTION_TRUSTED|VLC_INPUT_OPTION_UNIQUE );
input_Read( p_sd, p_root, on_input_thread_event, p_sd );
input_item_Release( p_root );
free( psz_uri );
}
return NULL;
}
/*****************************************************************************
* Close:
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
services_discovery_t *p_sd = (services_discovery_t *)p_this;
services_discovery_sys_t *p_sys = p_sd->p_sys;
vlc_object_t *vlc = VLC_OBJECT(vlc_object_instance(p_sd));
vlc_join( p_sys->thread, NULL );
var_DelCallback( vlc, p_sys->psz_var, onNewFileAdded, p_sd );
free( p_sys->psz_dir[1] );
free( p_sys->psz_dir[0] );
free( p_sys );
}
/*****************************************************************************
* Callbacks and helper functions
*****************************************************************************/
static void input_item_subtree_added(input_item_t *input_item,
input_item_node_t *root,
void *user_data)
{
VLC_UNUSED(input_item);
services_discovery_t *p_sd = user_data;
services_discovery_sys_t *p_sys = p_sd->p_sys;
for( int i = 0; i < root->i_children; i++ )
{
input_item_node_t *child = root->pp_children[i];
input_item_t *item = child->p_item;
if( p_sys->i_type == Picture )
formatSnapshotItem( item );
services_discovery_AddItem( p_sd, item );
}
}
static void on_input_thread_event(input_thread_t *input,
const struct vlc_input_event *event,
void *userdata)
{
if (event->type == INPUT_EVENT_SUBITEMS)
input_item_subtree_added(input_GetItem(input), event->subitems, userdata);
}
static int onNewFileAdded( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
(void)p_this;
services_discovery_t *p_sd = p_data;
services_discovery_sys_t *p_sys = p_sd->p_sys;
(void)psz_var; (void)oldval;
char* psz_file = newval.psz_string;
if( !psz_file || !*psz_file )
return VLC_EGENERIC;
char* psz_uri = vlc_path2uri( psz_file, "file" );
input_item_t* p_item = input_item_New( psz_uri, NULL );
if( p_sys->i_type == Picture )
{
if( fileType( p_sd, psz_file ) == Picture )
{
formatSnapshotItem( p_item );
services_discovery_AddItem( p_sd, p_item );
msg_Dbg( p_sd, "New snapshot added : %s", psz_file );
}
}
else if( p_sys->i_type == Audio )
{
if( fileType( p_sd, psz_file ) == Audio )
{
services_discovery_AddItem( p_sd, p_item );
msg_Dbg( p_sd, "New recorded audio added : %s", psz_file );
}
}
else if( p_sys->i_type == Video )
{
if( fileType( p_sd, psz_file ) == Video ||
fileType( p_sd, psz_file ) == Unknown )
{
services_discovery_AddItem( p_sd, p_item );
msg_Dbg( p_sd, "New recorded video added : %s", psz_file );
}
}
input_item_Release( p_item );
free( psz_uri );
return VLC_SUCCESS;
}
void formatSnapshotItem( input_item_t *p_item )
{
if( !p_item )
return;
char* psz_uri = input_item_GetURI( p_item );
/* copy the snapshot mrl as a ArtURL */
if( psz_uri )
input_item_SetArtURL( p_item, psz_uri );
free( psz_uri );
}
enum type_e fileType( services_discovery_t *p_sd, const char* psz_file )
{
services_discovery_sys_t *p_sys = p_sd->p_sys;
enum type_e i_ret = Unknown;
char* psz_dir = strdup( psz_file );
char* psz_tmp = strrchr( psz_dir, DIR_SEP_CHAR );
if( psz_tmp )
*psz_tmp = '\0';
int num_dir = sizeof( p_sys->psz_dir ) / sizeof( p_sys->psz_dir[0] );
for( int i = 0; i < num_dir; i++ )
{
char* psz_known_dir = p_sys->psz_dir[i];
if( psz_known_dir && !strcmp( psz_dir, psz_known_dir ) )
i_ret = p_sys->i_type;
}
free( psz_dir );
return i_ret;
}
static int vlc_sd_probe_Open( vlc_object_t *obj )
{
vlc_probe_t *probe = (vlc_probe_t *)obj;
vlc_sd_probe_Add( probe, "video_dir", N_("My Videos"), SD_CAT_MYCOMPUTER );
vlc_sd_probe_Add( probe, "audio_dir", N_("My Music"), SD_CAT_MYCOMPUTER );
vlc_sd_probe_Add( probe, "picture_dir", N_("My Pictures"),
SD_CAT_MYCOMPUTER );
return VLC_PROBE_CONTINUE;
}
po/POTFILES.in
+ 0
− 1
View file @ 589e95a4
......@@ -1078,7 +1078,6 @@ modules/packetizer/mpegvideo.c
modules/packetizer/vc1.c
modules/services_discovery/avahi.c
modules/services_discovery/bonjour.m
modules/services_discovery/mediadirs.c
modules/services_discovery/microdns.c
modules/services_discovery/mtp.c
modules/services_discovery/os2drive.c
......
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

VideoLAN code repository instance