X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fcdda.c;h=1d6fe3cce4a096623d2972bac892026e599d62f8;hb=bc09c365ab435fda0185e60a423f69d6dfa348c8;hp=dec483594b3bd288c5be9bfd5108031af768feb0;hpb=673861da5ce8bfeb0a4adbd5be95aa5fd2da9e4b;p=vlc diff --git a/modules/access/cdda.c b/modules/access/cdda.c index dec483594b..1d6fe3cce4 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -1,7 +1,7 @@ /***************************************************************************** * 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 @@ -31,23 +31,25 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#define _GNU_SOURCE -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#include -#include "codecs.h" -#include "vcd/cdrom.h" +#include +#include +#include +#include +#include +#include /* ToLocaleDup */ -#include +#include /* For WAVEHEADER */ +#include "vcd/cdrom.h" /* For CDDA_DATA_SIZE */ #ifdef HAVE_LIBCDDB -#include -#endif - -#ifdef HAVE_ERRNO_H -#include + #include + #include #endif /***************************************************************************** @@ -61,34 +63,35 @@ static void Close( vlc_object_t * ); "Default caching value for Audio CDs. This " \ "value should be set in milliseconds." ) -vlc_module_begin(); - set_shortname( _("Audio CD")); - set_description( _("Audio CD input") ); - set_capability( "access2", 10 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - set_callbacks( Open, Close ); +vlc_module_begin () + set_shortname( N_("Audio CD") ) + set_description( N_("Audio CD input") ) + set_capability( "access", 10 ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) + set_callbacks( Open, Close ) - add_usage_hint( N_("[cdda:][device][@[track]]") ); + add_usage_hint( N_("[cdda:][device][@[track]]") ) add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, VLC_TRUE ); - - add_integer( "cdda-track", -1 , NULL, NULL, NULL, VLC_TRUE ); - change_internal(); - add_integer( "cdda-first-sector", -1, NULL, NULL, NULL, VLC_TRUE ); - change_internal(); - add_integer( "cdda-last-sector", -1, NULL, NULL, NULL, VLC_TRUE ); - change_internal(); - - add_string( "cddb-server", "freedb.freedb.org", NULL, - N_( "CDDB Server" ), N_( "Address of the CDDB server to use." ), - VLC_TRUE ); - add_integer( "cddb-port", 8880, NULL, - N_( "CDDB port" ), N_( "CDDB Server port to use." ), - VLC_TRUE ); - add_shortcut( "cdda" ); - add_shortcut( "cddasimple" ); -vlc_module_end(); + CACHING_LONGTEXT, true ) + change_safe() + + add_integer( "cdda-track", 0 , NULL, NULL, NULL, true ) + change_volatile () + add_integer( "cdda-first-sector", -1, NULL, NULL, NULL, true ) + change_volatile () + add_integer( "cdda-last-sector", -1, NULL, NULL, NULL, true ) + 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 () /* how many blocks VCDRead will read in each loop */ @@ -104,30 +107,25 @@ struct access_sys_t /* 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; - vlc_bool_t b_header; + bool b_header; int i_track; int i_first_sector; int i_last_sector; - -#ifdef HAVE_LIBCDDB - cddb_disc_t *p_disc; -#endif }; 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, playlist_t *p_playlist, - playlist_item_t *p_parent ); +static int GetTracks( access_t *p_access, input_item_t *p_current ); #ifdef HAVE_LIBCDDB -static void GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors ); +static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors ); #endif /***************************************************************************** @@ -137,28 +135,23 @@ static int Open( vlc_object_t *p_this ) { access_t *p_access = (access_t*)p_this; access_sys_t *p_sys; - vcddev_t *vcddev; - char *psz_name; - int i_mrl_tracknum = -1; - - input_thread_t *p_input; - playlist_item_t *p_item = NULL; - playlist_t *p_playlist = NULL; - 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 ) { - if( psz_name ) free( psz_name ); + free( psz_name ); return VLC_EGENERIC; } } - else psz_name = strdup( p_access->psz_path ); + else psz_name = ToLocaleDup( p_access->psz_filepath ); #ifdef WIN32 if( psz_name[0] && psz_name[1] == ':' && @@ -166,7 +159,7 @@ static int Open( vlc_object_t *p_this ) #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 ); @@ -178,36 +171,25 @@ static int Open( vlc_object_t *p_this ) STANDARD_BLOCK_ACCESS_INIT p_sys->vcddev = vcddev; - /* We only do separate items if the whole disc is requested - - * Dirty hack we access some private data ! */ - p_input = (input_thread_t *)( p_access->p_parent ); - /* Do we play a single track ? */ - p_sys->i_track = var_CreateGetInteger( p_access, "cdda-track" ); + p_sys->i_track = var_InheritInteger( p_access, "cdda-track" ) - 1; - if( p_sys->i_track < 0 && i_mrl_tracknum <= 0 ) + if( p_sys->i_track < 0 ) { - p_playlist = pl_Yield( p_access ); - if( p_playlist->status.p_item->p_input == - ((input_thread_t *)p_access->p_parent)->input.p_item ) - p_item = p_playlist->status.p_item; - else + /* We only do separate items if the whole disc is requested */ + input_thread_t *p_input = access_GetParentInput( p_access ); + + int i_ret = -1; + if( p_input ) { - input_item_t *p_current = ( (input_thread_t*)p_access->p_parent)-> - input.p_item; - p_item = playlist_LockItemGetByInput( p_playlist, p_current ); + input_item_t *p_current = input_GetItem( p_input ); + if( p_current ) + i_ret = GetTracks( p_access, p_current ); - if( !p_item ) - { - msg_Dbg( p_playlist, "unable to find item in playlist"); - return -1; - } + vlc_object_release( p_input ); } - - i_ret = GetTracks( p_access, p_playlist, p_item ); - - if( p_playlist ) vlc_object_release( p_playlist ); - if( i_ret < 0 ) goto error; + if( i_ret < 0 ) + goto error; } else { @@ -229,24 +211,24 @@ static int Open( vlc_object_t *p_this ) 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 ) { - int i_titles; - if( i_mrl_tracknum <= 0 ) + const int i_titles = ioctl_GetTracksMap( VLC_OBJECT(p_access), + p_sys->vcddev, &p_sys->p_sectors ); + if( p_sys->i_track >= i_titles ) { - msg_Err( p_access, "wrong sector information" ); + msg_Err( p_access, "invalid track number" ); goto error; } - i_titles = ioctl_GetTracksMap( VLC_OBJECT(p_access), - p_sys->vcddev, &p_sys->p_sectors ); + p_sys->i_first_sector = p_sys->p_sectors[p_sys->i_track]; + p_sys->i_last_sector = p_sys->p_sectors[p_sys->i_track+1]; } - p_sys->i_sector = p_sys->i_first_sector; p_access->info.i_size = (p_sys->i_last_sector - p_sys->i_first_sector) * (int64_t)CDDA_DATA_SIZE; @@ -258,9 +240,9 @@ static int Open( vlc_object_t *p_this ) return VLC_SUCCESS; error: + free( p_sys->p_sectors ); ioctl_Close( VLC_OBJECT(p_access), p_sys->vcddev ); free( p_sys ); - if( p_playlist ) vlc_object_release( p_playlist ); return VLC_EGENERIC; } @@ -271,6 +253,8 @@ static void Close( vlc_object_t *p_this ) { access_t *p_access = (access_t *)p_this; access_sys_t *p_sys = p_access->p_sys; + + free( p_sys->p_sectors ); ioctl_Close( p_this, p_sys->vcddev ); free( p_sys ); } @@ -284,7 +268,7 @@ static block_t *Block( access_t *p_access ) int i_blocks = CDDA_BLOCKS_ONCE; block_t *p_block; - if( p_sys->i_track < 0 ) p_access->info.b_eof = VLC_TRUE; + if( p_sys->i_track < 0 ) p_access->info.b_eof = true; /* Check end of file */ if( p_access->info.b_eof ) return NULL; @@ -294,13 +278,13 @@ static block_t *Block( access_t *p_access ) /* Return only the header */ p_block = block_New( p_access, sizeof( WAVEHEADER ) ); memcpy( p_block->p_buffer, &p_sys->waveheader, sizeof(WAVEHEADER) ); - p_sys->b_header = VLC_TRUE; + p_sys->b_header = true; return p_block; } if( p_sys->i_sector >= p_sys->i_last_sector ) { - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; return NULL; } @@ -338,12 +322,13 @@ static block_t *Block( access_t *p_access ) /**************************************************************************** * 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; @@ -354,231 +339,359 @@ static int Seek( access_t *p_access, int64_t i_pos ) *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { - vlc_bool_t *pb_bool; - int *pi_int; - 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 = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_TRUE; - break; - - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = CDDA_DATA_ONCE; + *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" ) * 1000; + *va_arg( args, int64_t * ) = + var_GetInteger( p_access, "cdda-caching" ) * INT64_C(1000); break; case ACCESS_SET_PAUSE_STATE: + break; + case ACCESS_GET_TITLE_INFO: case ACCESS_SET_TITLE: case ACCESS_GET_META: case ACCESS_SET_SEEKPOINT: case ACCESS_SET_PRIVATE_ID_STATE: + case ACCESS_GET_CONTENT_TYPE: return VLC_EGENERIC; default: msg_Warn( p_access, "unimplemented query in control" ); return VLC_EGENERIC; - } return VLC_SUCCESS; } -static int GetTracks( access_t *p_access, - playlist_t *p_playlist, playlist_item_t *p_parent ) +static int GetTracks( access_t *p_access, input_item_t *p_current ) { access_sys_t *p_sys = p_access->p_sys; - int i, i_titles; - input_item_t *p_input_item; - playlist_item_t *p_item_in_category; - char *psz_name; - i_titles = ioctl_GetTracksMap( VLC_OBJECT(p_access), - p_sys->vcddev, &p_sys->p_sectors ); - if( i_titles < 0 ) + + const int i_titles = ioctl_GetTracksMap( VLC_OBJECT(p_access), + p_sys->vcddev, &p_sys->p_sectors ); + if( i_titles <= 0 ) { - msg_Err( p_access, "unable to count tracks" ); + if( i_titles < 0 ) + msg_Err( p_access, "unable to count tracks" ); + else if( i_titles <= 0 ) + msg_Err( p_access, "no audio tracks found" ); return VLC_EGENERIC;; } - else if( i_titles <= 0 ) - { - msg_Err( p_access, "no audio tracks found" ); - return VLC_EGENERIC; - } - p_item_in_category = playlist_LockItemToNode( p_playlist, p_parent ); - psz_name = strdup( "Audio CD" ); - vlc_mutex_lock( &p_playlist->object_lock ); - playlist_ItemSetName( p_parent, psz_name ); - vlc_mutex_unlock( &p_playlist->object_lock ); - var_SetInteger( p_playlist, "item-change", p_parent->p_input->i_id ); - free( psz_name ); + /* */ + input_item_SetName( p_current, "Audio CD" ); + + const char *psz_album = NULL; + const char *psz_year = NULL; + const char *psz_genre = NULL; + const char *psz_artist = NULL; + const char *psz_description = NULL; + +/* 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 information */ #ifdef HAVE_LIBCDDB - GetCDDBInfo( p_access, i_titles, p_sys->p_sectors ); - if( p_sys->p_disc ) + 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 ) { - if( cddb_disc_get_title( p_sys->p_disc ) ) + psz_album = cddb_disc_get_title( p_disc ); + psz_genre = cddb_disc_get_genre( p_disc ); + + /* */ + const unsigned i_year = cddb_disc_get_year( p_disc ); + if( i_year > 0 ) { - asprintf( &psz_name, "%s", cddb_disc_get_title( p_sys->p_disc ) ); - vlc_mutex_lock( &p_playlist->object_lock ); - playlist_ItemSetName( p_parent, psz_name ); - vlc_mutex_unlock( &p_playlist->object_lock ); - var_SetInteger( p_playlist, "item-change", - p_parent->p_input->i_id ); - free( psz_name ); + psz_year = psz_year_buffer; + snprintf( psz_year_buffer, sizeof(psz_year_buffer), "%u", i_year ); + } + + /* Set artist only if unique */ + for( int i = 0; i < i_titles; i++ ) + { + cddb_track_t *t = cddb_disc_get_track( p_disc, i ); + if( !t ) + continue; + const char *psz_track_artist = cddb_track_get_artist( t ); + if( psz_artist && psz_track_artist && + strcmp( psz_artist, psz_track_artist ) ) + { + psz_artist = NULL; + break; + } + psz_artist = psz_track_artist; } } #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 ); + input_item_SetAlbum( p_current, psz_album ); + } + + if( NONEMPTY( psz_genre ) ) + input_item_SetGenre( p_current, psz_genre ); + + if( NONEMPTY( psz_artist ) ) + input_item_SetArtist( p_current, psz_artist ); + + if( NONEMPTY( psz_year ) ) + input_item_SetDate( p_current, psz_year ); + + if( NONEMPTY( psz_description ) ) + input_item_SetDescription( p_current, psz_description ); + + const mtime_t i_duration = (int64_t)( p_sys->p_sectors[i_titles] - p_sys->p_sectors[0] ) * + 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( i = 0; i < i_titles; i++ ) + for( int i = 0; i < i_titles; i++ ) { - msg_Dbg( p_access, "track[%d] start=%d", i, p_sys->p_sectors[i] ); - char *psz_uri, *psz_opt, *psz_first, *psz_last; - int i_path_len = p_access->psz_path ? strlen( p_access->psz_path ) : 0; + input_item_t *p_input_item; - psz_name = (char*)malloc( strlen( _("Audio CD - Track ") ) + 5 ); - psz_opt = (char*)malloc( strlen( "cdda-track=" ) + 3 ); - psz_first = (char*)malloc( strlen( "cdda-first-sector=" ) + 7 ); - psz_last = (char*)malloc( strlen( "cdda-last-sector=" ) + 7 ); - psz_uri = (char*)malloc( i_path_len + 13 ); + char *psz_uri, *psz_opt, *psz_first, *psz_last; + char *psz_name; - snprintf( psz_uri, i_path_len + 13, "cdda://%s", - p_access->psz_path ? p_access->psz_path : "" ); - sprintf( psz_opt, "cdda-track=%i", i+1 ); - sprintf( psz_first, "cdda-first-sector=%i",p_sys->p_sectors[i] ); + msg_Dbg( p_access, "track[%d] start=%d", i, p_sys->p_sectors[i] ); -// if( i != i_titles -1 ) - sprintf( psz_last, "cdda-last-sector=%i", p_sys->p_sectors[i+1] ); -// else -// sprintf( psz_last, "cdda-last-sector=%i", 1242 /* FIXME */); + /* */ + 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; + if( asprintf( &psz_first, "cdda-first-sector=%i",p_sys->p_sectors[i] ) == -1 ) + psz_first = NULL; + if( asprintf( &psz_last, "cdda-last-sector=%i", p_sys->p_sectors[i+1] ) == -1 ) + psz_last = NULL; /* Define a "default name" */ - sprintf( psz_name, _("Audio CD - Track %i"), (i+1) ); + if( asprintf( &psz_name, _("Audio CD - Track %02i"), (i+1) ) == -1 ) + psz_name = NULL; /* Create playlist items */ - p_input_item = input_ItemNewWithType( VLC_OBJECT( p_playlist ), - psz_uri, psz_name, 0, NULL, -1, + const mtime_t i_duration = (int64_t)( p_sys->p_sectors[i+1] - p_sys->p_sectors[i] ) * + CDDA_DATA_SIZE * 1000000 / 44100 / 2 / 2; + p_input_item = input_item_NewWithType( VLC_OBJECT( p_access ), + psz_uri, psz_name, 0, NULL, 0, i_duration, ITEM_TYPE_DISC ); - input_ItemAddOption( p_input_item, psz_first ); - input_ItemAddOption( p_input_item, psz_last ); - input_ItemAddOption( p_input_item, psz_opt ); + input_item_CopyOptions( p_current, p_input_item ); + input_item_AddOption( p_input_item, psz_first, VLC_INPUT_OPTION_TRUSTED ); + input_item_AddOption( p_input_item, psz_last, VLC_INPUT_OPTION_TRUSTED ); + input_item_AddOption( p_input_item, psz_opt, VLC_INPUT_OPTION_TRUSTED ); + + const char *psz_track_title = NULL; + const char *psz_track_artist = NULL; + const char *psz_track_genre = NULL; + const char *psz_track_description = NULL; #ifdef HAVE_LIBCDDB - /* If we have CDDB info, change the name */ - if( p_sys->p_disc ) + /* Retreive CDDB information */ + if( p_disc ) { - char *psz_result; - cddb_track_t *t = cddb_disc_get_track( p_sys->p_disc, i ); - if( t!= NULL ) + cddb_track_t *t = cddb_disc_get_track( p_disc, i ); + if( t != NULL ) { - if( cddb_track_get_title( t ) != NULL ) - { - input_ItemAddInfo( p_input_item, _(VLC_META_INFO_CAT), - _(VLC_META_TITLE), - cddb_track_get_title( t ) ); - if( p_input_item->psz_name ) - free( p_input_item->psz_name ); - asprintf( &p_input_item->psz_name, "%s", - cddb_track_get_title( t ) ); - } - psz_result = cddb_track_get_artist( t ); - if( psz_result ) - { - input_ItemAddInfo( p_input_item, _(VLC_META_INFO_CAT), - _(VLC_META_ARTIST), psz_result ); - } + psz_track_title = cddb_track_get_title( t ); + psz_track_artist = cddb_track_get_artist( t ); } } #endif - playlist_BothAddInput( p_playlist, p_input_item, p_item_in_category, - PLAYLIST_APPEND, PLAYLIST_END ); + + /* 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 ); + ON_EMPTY( psz_track_description, psz_description ); + + /* */ + if( NONEMPTY( psz_track_title ) ) + { + input_item_SetName( p_input_item, psz_track_title ); + input_item_SetTitle( p_input_item, psz_track_title ); + } + + if( NONEMPTY( psz_track_artist ) ) + input_item_SetArtist( p_input_item, psz_track_artist ); + + if( NONEMPTY( psz_track_genre ) ) + input_item_SetGenre( p_input_item, psz_track_genre ); + + if( NONEMPTY( psz_track_description ) ) + input_item_SetDescription( p_input_item, psz_track_description ); + + if( NONEMPTY( psz_album ) ) + input_item_SetAlbum( p_input_item, psz_album ); + + if( NONEMPTY( psz_year ) ) + input_item_SetDate( p_input_item, psz_year ); + + char psz_num[3+1]; + snprintf( psz_num, sizeof(psz_num), "%d", 1+i ); + input_item_SetTrackNum( p_input_item, psz_num ); + + 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 ) + cddb_disc_destroy( p_disc ); +#endif return VLC_SUCCESS; } #ifdef HAVE_LIBCDDB -static void GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors ) +static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors ) { - int i, i_matches; - int64_t i_length = 0, i_size = 0; - cddb_conn_t *p_cddb = cddb_new(); + if( var_InheritInteger( p_access, "album-art" ) == ALBUM_ART_WHEN_ASKED ) + return NULL; + /* */ + cddb_conn_t *p_cddb = cddb_new(); if( !p_cddb ) { msg_Warn( p_access, "unable to use CDDB" ); - goto cddb_destroy; + return NULL; } + /* */ + 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, var_InheritInteger( p_access, "cddb-port" ) ); + cddb_set_email_address( p_cddb, "vlc@videolan.org" ); - cddb_set_server_name( p_cddb, config_GetPsz( p_access, "cddb-server" ) ); - cddb_set_server_port( p_cddb, config_GetInt( p_access, "cddb-port" ) ); /// \todo 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); - - p_access->p_sys->p_disc = cddb_disc_new(); + cddb_http_disable( p_cddb ); - if(! p_access->p_sys->p_disc ) + /* */ + cddb_disc_t *p_disc = cddb_disc_new(); + if( !p_disc ) { msg_Err( p_access, "unable to create CDDB disc structure." ); - goto cddb_end; + goto error; } - for(i = 0; i < i_titles ; i++ ) + int64_t i_length = 0; + for( int i = 0; i < i_titles; i++ ) { cddb_track_t *t = cddb_track_new(); - cddb_track_set_frame_offset(t, p_sectors[i] ); - cddb_disc_add_track( p_access->p_sys->p_disc, t ); - i_size = ( p_sectors[i+1] - p_sectors[i] ) * - (int64_t)CDDA_DATA_SIZE; - i_length += I64C(1000000) * i_size / 44100 / 4 ; + cddb_track_set_frame_offset( t, p_sectors[i] ); + cddb_disc_add_track( p_disc, t ); + const int64_t i_size = ( p_sectors[i+1] - p_sectors[i] ) * + (int64_t)CDDA_DATA_SIZE; + i_length += INT64_C(1000000) * i_size / 44100 / 4 ; } - cddb_disc_set_length( p_access->p_sys->p_disc, (int)(i_length/1000000) ); + cddb_disc_set_length( p_disc, (int)(i_length/1000000) ); - if (!cddb_disc_calc_discid(p_access->p_sys->p_disc )) + if( !cddb_disc_calc_discid( p_disc ) ) { msg_Err( p_access, "CDDB disc ID calculation failed" ); - goto cddb_destroy; + goto error; } - i_matches = cddb_query( p_cddb, p_access->p_sys->p_disc); - - if (i_matches > 0) + const int i_matches = cddb_query( p_cddb, p_disc ); + if( i_matches < 0 ) { - if (i_matches > 1) - msg_Warn( p_access, "found %d matches in CDDB. Using first one.", - i_matches); - cddb_read( p_cddb, p_access->p_sys->p_disc ); + msg_Warn( p_access, "CDDB error: %s", cddb_error_str(errno) ); + goto error; } - else - msg_Warn( p_access, "CDDB error: %s", cddb_error_str(errno)); + 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: cddb_destroy( p_cddb); + return p_disc; -cddb_end: ; +error: + if( p_disc ) + cddb_disc_destroy( p_disc ); + cddb_destroy( p_cddb ); + return NULL; } #endif /*HAVE_LIBCDDB*/ +