/*****************************************************************************
* cdda.c : CD digital audio input module for vlc
*****************************************************************************
- * Copyright (C) 2000, 2003 the VideoLAN team
+ * Copyright (C) 2000, 2003-2006, 2008-2009 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include <assert.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_access.h>
#include <vlc_meta.h>
-#include <vlc_charset.h>
+#include <vlc_charset.h> /* ToLocaleDup */
#include <vlc_codecs.h> /* For WAVEHEADER */
-#include "vcd/cdrom.h"
+#include "vcd/cdrom.h" /* For CDDA_DATA_SIZE */
#ifdef HAVE_LIBCDDB
-#include <cddb/cddb.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
+ #include <cddb/cddb.h>
+ #include <errno.h>
#endif
/*****************************************************************************
"value should be set in milliseconds." )
vlc_module_begin ()
- set_shortname( N_("Audio CD"))
+ set_shortname( N_("Audio CD") )
set_description( N_("Audio CD input") )
set_capability( "access", 10 )
set_category( CAT_INPUT )
add_usage_hint( N_("[cdda:][device][@[track]]") )
add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
CACHING_LONGTEXT, true )
+ change_safe()
add_integer( "cdda-track", 0 , NULL, NULL, NULL, true )
- change_internal ()
+ change_volatile ()
add_integer( "cdda-first-sector", -1, NULL, NULL, NULL, true )
- change_internal ()
+ change_volatile ()
add_integer( "cdda-last-sector", -1, NULL, NULL, NULL, true )
- change_internal ()
-
- add_string( "cddb-server", "freedb.freedb.org", NULL,
- N_( "CDDB Server" ), N_( "Address of the CDDB server to use." ),
- true )
- add_integer( "cddb-port", 8880, NULL,
- N_( "CDDB port" ), N_( "CDDB Server port to use." ),
- true )
- add_shortcut( "cdda" )
- add_shortcut( "cddasimple" )
+ change_volatile ()
+
+#ifdef HAVE_LIBCDDB
+ add_string( "cddb-server", "freedb.freedb.org", NULL, N_( "CDDB Server" ),
+ N_( "Address of the CDDB server to use." ), true )
+ add_integer( "cddb-port", 8880, NULL, N_( "CDDB port" ),
+ N_( "CDDB Server port to use." ), true )
+#endif
+
+ add_shortcut( "cdda", "cddasimple" )
vlc_module_end ()
/* Current position */
int i_sector; /* Current Sector */
- int * p_sectors; /* Track sectors */
+ int *p_sectors; /* Track sectors */
/* Wave header for the output data */
WAVEHEADER waveheader;
- bool b_header;
+ bool b_header;
int i_track;
int i_first_sector;
};
static block_t *Block( access_t * );
-static int Seek( access_t *, int64_t );
+static int Seek( access_t *, uint64_t );
static int Control( access_t *, int, va_list );
static int GetTracks( access_t *p_access, input_item_t *p_current );
{
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys;
- vcddev_t *vcddev;
- char *psz_name;
- int i_ret;
+ vcddev_t *vcddev;
+ char *psz_name;
- if( !p_access->psz_path || !*p_access->psz_path )
+ if( !p_access->psz_filepath || !*p_access->psz_filepath )
{
/* Only when selected */
- if( !p_this->b_force ) return VLC_EGENERIC;
+ if( !p_access->psz_access || !*p_access->psz_access )
+ return VLC_EGENERIC;
- psz_name = var_CreateGetString( p_this, "cd-audio" );
+ psz_name = var_InheritString( p_this, "cd-audio" );
if( !psz_name || !*psz_name )
{
free( psz_name );
return VLC_EGENERIC;
}
}
- else psz_name = ToLocaleDup( p_access->psz_path );
+ else psz_name = ToLocaleDup( p_access->psz_filepath );
#ifdef WIN32
if( psz_name[0] && psz_name[1] == ':' &&
#endif
/* Open CDDA */
- if( (vcddev = ioctl_Open( VLC_OBJECT(p_access), psz_name )) == NULL )
+ if( (vcddev = ioctl_Open( VLC_OBJECT(p_access), psz_name ) ) == NULL )
{
msg_Warn( p_access, "could not open %s", psz_name );
free( psz_name );
p_sys->vcddev = vcddev;
/* Do we play a single track ? */
- p_sys->i_track = var_CreateGetInteger( p_access, "cdda-track" ) - 1;
+ p_sys->i_track = var_InheritInteger( p_access, "cdda-track" ) - 1;
if( p_sys->i_track < 0 )
{
/* We only do separate items if the whole disc is requested */
- input_thread_t *p_input = (input_thread_t*)vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT );
+ input_thread_t *p_input = access_GetParentInput( p_access );
- i_ret = -1;
+ int i_ret = -1;
if( p_input )
{
input_item_t *p_current = input_GetItem( p_input );
p_sys->waveheader.DataChunkID = VLC_FOURCC('d', 'a', 't', 'a');
p_sys->waveheader.DataLength = 0; /* we just don't know */
- p_sys->i_first_sector = var_CreateGetInteger( p_access,
- "cdda-first-sector" );
- p_sys->i_last_sector = var_CreateGetInteger( p_access,
- "cdda-last-sector" );
+ p_sys->i_first_sector = var_InheritInteger( p_access,
+ "cdda-first-sector" );
+ p_sys->i_last_sector = var_InheritInteger( p_access,
+ "cdda-last-sector" );
/* Tracknumber in MRL */
if( p_sys->i_first_sector < 0 || p_sys->i_last_sector < 0 )
{
/****************************************************************************
* Seek
****************************************************************************/
-static int Seek( access_t *p_access, int64_t i_pos )
+static int Seek( access_t *p_access, uint64_t i_pos )
{
access_sys_t *p_sys = p_access->p_sys;
/* Next sector to read */
p_sys->i_sector = p_sys->i_first_sector + i_pos / CDDA_DATA_SIZE;
+ assert( p_sys->i_sector >= 0 );
p_access->info.i_pos = i_pos;
return VLC_SUCCESS;
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
{
- bool *pb_bool;
- int64_t *pi_64;
-
switch( i_query )
{
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
case ACCESS_CAN_CONTROL_PACE:
- pb_bool = (bool*)va_arg( args, bool* );
- *pb_bool = true;
+ *va_arg( args, bool* ) = true;
break;
case ACCESS_GET_PTS_DELAY:
- pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = var_GetInteger( p_access, "cdda-caching" ) * INT64_C(1000);
+ *va_arg( args, int64_t * ) =
+ var_GetInteger( p_access, "cdda-caching" ) * INT64_C(1000);
break;
case ACCESS_SET_PAUSE_STATE:
return VLC_EGENERIC;;
}
+ /* */
input_item_SetName( p_current, "Audio CD" );
const char *psz_album = NULL;
const char *psz_genre = NULL;
const char *psz_artist = NULL;
const char *psz_description = NULL;
- char psz_year_buffer[4+1];
/* Return true if the given string is not NULL and not empty */
#define NONEMPTY( psz ) ( (psz) && *(psz) )
/* If the given string is NULL or empty, fill it by the return value of 'code' */
#define ON_EMPTY( psz, code ) do { if( !NONEMPTY( psz) ) { (psz) = code; } } while(0)
- /* Retreive CDDB informations */
+ /* Retreive CDDB information */
#ifdef HAVE_LIBCDDB
+ char psz_year_buffer[4+1];
+ msg_Dbg( p_access, "fetching infos with CDDB" );
cddb_disc_t *p_disc = GetCDDBInfo( p_access, i_titles, p_sys->p_sectors );
if( p_disc )
{
}
#endif
+ /* CD-Text */
+ vlc_meta_t **pp_cd_text;
+ int i_cd_text;
+
+ if( ioctl_GetCdText( VLC_OBJECT(p_access), p_sys->vcddev, &pp_cd_text, &i_cd_text ) )
+ {
+ msg_Dbg( p_access, "CD-TEXT information missing" );
+ i_cd_text = 0;
+ pp_cd_text = NULL;
+ }
+
+ /* Retrieve CD-TEXT information but prefer CDDB */
+ if( i_cd_text > 0 && pp_cd_text[0] )
+ {
+ const vlc_meta_t *p_disc = pp_cd_text[0];
+ ON_EMPTY( psz_album, vlc_meta_Get( p_disc, vlc_meta_Album ) );
+ ON_EMPTY( psz_genre, vlc_meta_Get( p_disc, vlc_meta_Genre ) );
+ ON_EMPTY( psz_artist, vlc_meta_Get( p_disc, vlc_meta_Artist ) );
+ ON_EMPTY( psz_description, vlc_meta_Get( p_disc, vlc_meta_Description ) );
+ }
+
if( NONEMPTY( psz_album ) )
{
input_item_SetName( p_current, psz_album );
CDDA_DATA_SIZE * 1000000 / 44100 / 2 / 2;
input_item_SetDuration( p_current, i_duration );
+ input_item_node_t *p_root = input_item_node_Create( p_current );
+
/* Build title table */
for( int i = 0; i < i_titles; i++ )
{
msg_Dbg( p_access, "track[%d] start=%d", i, p_sys->p_sectors[i] );
/* */
- if( asprintf( &psz_uri, "cdda://%s", p_access->psz_path ) == -1 )
+ if( asprintf( &psz_uri, "cdda://%s", p_access->psz_location ) == -1 )
psz_uri = NULL;
if( asprintf( &psz_opt, "cdda-track=%i", i+1 ) == -1 )
psz_opt = NULL;
const char *psz_track_description = NULL;
#ifdef HAVE_LIBCDDB
- /* Retreive CDDB informations */
+ /* Retreive CDDB information */
if( p_disc )
{
cddb_track_t *t = cddb_disc_get_track( p_disc, i );
}
#endif
+ /* Retreive CD-TEXT information but prefer CDDB */
+ if( i+1 < i_cd_text && pp_cd_text[i+1] )
+ {
+ const vlc_meta_t *t = pp_cd_text[i+1];
+
+ ON_EMPTY( psz_track_title, vlc_meta_Get( t, vlc_meta_Title ) );
+ ON_EMPTY( psz_track_artist, vlc_meta_Get( t, vlc_meta_Artist ) );
+ ON_EMPTY( psz_track_genre, vlc_meta_Get( t, vlc_meta_Genre ) );
+ ON_EMPTY( psz_track_description, vlc_meta_Get( t, vlc_meta_Description ) );
+ }
+
/* */
ON_EMPTY( psz_track_artist, psz_artist );
ON_EMPTY( psz_track_genre, psz_genre );
snprintf( psz_num, sizeof(psz_num), "%d", 1+i );
input_item_SetTrackNum( p_input_item, psz_num );
- input_item_AddSubItem( p_current, p_input_item );
+ input_item_node_AppendItem( p_root, p_input_item );
vlc_gc_decref( p_input_item );
free( psz_uri ); free( psz_opt ); free( psz_name );
free( psz_first ); free( psz_last );
#undef ON_EMPTY
#undef NONEMPTY
+ input_item_node_PostAndDelete( p_root );
+
+ /* */
+ for( int i = 0; i < i_cd_text; i++ )
+ {
+ vlc_meta_t *p_meta = pp_cd_text[i];
+ if( !p_meta )
+ continue;
+ vlc_meta_Delete( p_meta );
+ }
+ free( pp_cd_text );
#ifdef HAVE_LIBCDDB
if( p_disc )
#ifdef HAVE_LIBCDDB
static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors )
{
+ if( var_InheritInteger( p_access, "album-art" ) == ALBUM_ART_WHEN_ASKED )
+ return NULL;
+
/* */
cddb_conn_t *p_cddb = cddb_new();
if( !p_cddb )
}
/* */
- char *psz_tmp = config_GetPsz( p_access, "cddb-server" );
- cddb_set_server_name( p_cddb, psz_tmp );
- free( psz_tmp );
+ char *psz_tmp = var_InheritString( p_access, "cddb-server" );
+ if( psz_tmp )
+ {
+ cddb_set_server_name( p_cddb, psz_tmp );
+ free( psz_tmp );
+ }
- cddb_set_server_port( p_cddb, config_GetInt( p_access, "cddb-port" ) );
+ cddb_set_server_port( p_cddb, var_InheritInteger( p_access, "cddb-port" ) );
cddb_set_email_address( p_cddb, "vlc@videolan.org" );
cddb_cache_disable( p_cddb );
// cddb_cache_set_dir( p_cddb,
-// config_GetPsz( p_access,
+// var_InheritString( p_access,
// MODULE_STRING "-cddb-cachedir") );
cddb_set_timeout( p_cddb, 10 );
/// \todo
- cddb_http_disable( p_cddb);
+ cddb_http_disable( p_cddb );
/* */
cddb_disc_t *p_disc = cddb_disc_new();
}
const int i_matches = cddb_query( p_cddb, p_disc );
- if( i_matches <= 0 )
+ if( i_matches < 0 )
{
- msg_Warn( p_access, "CDDB error: %s", cddb_error_str(errno));
+ msg_Warn( p_access, "CDDB error: %s", cddb_error_str(errno) );
goto error;
}
-
- if( i_matches > 1 )
+ else if( i_matches == 0 )
+ {
+ msg_Dbg( p_access, "Couldn't find any matches in CDDB." );
+ goto error;
+ }
+ else if( i_matches > 1 )
msg_Warn( p_access, "found %d matches in CDDB. Using first one.", i_matches );
+
cddb_read( p_cddb, p_disc );
cddb_destroy( p_cddb);
projects / vlc / blobdiff