X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fcdda.c;h=7527b5684acd5eb660f79cae489f393443cc2f30;hb=912977b1e2655c33802cde53e7ceb5527732de97;hp=67c62ea7ca245e916a21d12e1880920a96a0ac00;hpb=be19f7facceb129ef8977ed0ad2b41c593954629;p=vlc diff --git a/modules/access/cdda.c b/modules/access/cdda.c index 67c62ea7ca..7527b5684a 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -50,9 +50,7 @@ #include #endif -#ifdef HAVE_ERRNO_H #include -#endif /***************************************************************************** * Module descriptior @@ -75,9 +73,10 @@ vlc_module_begin () add_usage_hint( N_("[cdda:][device][@[track]]") ) add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, true ); + CACHING_LONGTEXT, true ) + change_safe() - add_integer( "cdda-track", -1 , NULL, NULL, NULL, true ) + add_integer( "cdda-track", 0 , NULL, NULL, NULL, true ) change_internal () add_integer( "cdda-first-sector", -1, NULL, NULL, NULL, true ) change_internal () @@ -86,10 +85,10 @@ vlc_module_begin () add_string( "cddb-server", "freedb.freedb.org", NULL, N_( "CDDB Server" ), N_( "Address of the CDDB server to use." ), - true ); + true ) add_integer( "cddb-port", 8880, NULL, N_( "CDDB port" ), N_( "CDDB Server port to use." ), - true ); + true ) add_shortcut( "cdda" ) add_shortcut( "cddasimple" ) vlc_module_end () @@ -117,10 +116,6 @@ struct access_sys_t 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 * ); @@ -130,7 +125,7 @@ static int Control( access_t *, int, va_list ); 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 /***************************************************************************** @@ -142,7 +137,6 @@ static int Open( vlc_object_t *p_this ) access_sys_t *p_sys; vcddev_t *vcddev; char *psz_name; - int i_mrl_tracknum = -1; int i_ret; if( !p_access->psz_path || !*p_access->psz_path ) @@ -178,12 +172,12 @@ static int Open( vlc_object_t *p_this ) p_sys->vcddev = vcddev; /* Do we play a single track ? */ - p_sys->i_track = var_CreateGetInteger( p_access, "cdda-track" ); + p_sys->i_track = var_CreateGetInteger( p_access, "cdda-track" ) - 1; - if( p_sys->i_track < 0 && i_mrl_tracknum <= 0 ) + 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; if( p_input ) @@ -224,17 +218,17 @@ static int Open( vlc_object_t *p_this ) /* 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; @@ -246,6 +240,7 @@ 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 ); return VLC_EGENERIC; @@ -258,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 ); } @@ -341,22 +338,18 @@ static int Seek( access_t *p_access, int64_t i_pos ) *****************************************************************************/ 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" ) * 1000; + *va_arg( args, int64_t * ) = + var_GetInteger( p_access, "cdda-caching" ) * INT64_C(1000); break; case ACCESS_SET_PAUSE_STATE: @@ -373,7 +366,6 @@ static int Control( access_t *p_access, int i_query, va_list args ) default: msg_Warn( p_access, "unimplemented query in control" ); return VLC_EGENERIC; - } return VLC_SUCCESS; } @@ -393,18 +385,98 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) return VLC_EGENERIC;; } + /* */ 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 informations */ #ifdef HAVE_LIBCDDB - GetCDDBInfo( p_access, i_titles, p_sys->p_sectors ); - if( p_sys->p_disc ) + char psz_year_buffer[4+1]; + cddb_disc_t *p_disc = GetCDDBInfo( p_access, i_titles, p_sys->p_sectors ); + if( p_disc ) { - const char *psz_name = cddb_disc_get_title( p_sys->p_disc ); - if( psz_name && *psz_name ) - input_item_SetName( p_current, psz_name ); + 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 ) + { + 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 + /* */ + 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; + } + + /* Retreive CD-TEXT informations 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 ); + /* Build title table */ for( int i = 0; i < i_titles; i++ ) { @@ -440,53 +512,114 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) 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 informations */ + if( p_disc ) { - cddb_track_t *t = cddb_disc_get_track( p_sys->p_disc, i ); + cddb_track_t *t = cddb_disc_get_track( p_disc, i ); if( t != NULL ) { - const char *psz_title = cddb_track_get_title( t ); - const char *psz_artist = cddb_track_get_artist( t ); - - if( psz_title ) - { - input_item_SetName( p_input_item, psz_title ); - input_item_SetTitle( p_input_item, psz_title ); - } - if( psz_artist ) - input_item_SetArtist( p_input_item, psz_artist ); + psz_track_title = cddb_track_get_title( t ); + psz_track_artist = cddb_track_get_artist( t ); } } #endif + + /* Retreive CD-TEXT informations 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_AddSubItem( p_current, 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 + + /* */ + 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_CreateGetInteger( 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 = config_GetPsz( p_access, "cddb-server" ); - cddb_set_email_address( p_cddb, "vlc@videolan.org" ); + /* */ + char *psz_tmp = config_GetPsz( p_access, "cddb-server" ); cddb_set_server_name( p_cddb, psz_tmp ); - cddb_set_server_port( p_cddb, config_GetInt( p_access, "cddb-port" ) ); free( psz_tmp ); + cddb_set_server_port( p_cddb, config_GetInt( p_access, "cddb-port" ) ); + + cddb_set_email_address( p_cddb, "vlc@videolan.org" ); + /// \todo cddb_cache_disable( p_cddb ); @@ -499,47 +632,52 @@ static void GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors ) /// \todo cddb_http_disable( p_cddb); - p_access->p_sys->p_disc = cddb_disc_new(); - - 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; + 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 ); - } - else msg_Warn( p_access, "CDDB error: %s", cddb_error_str(errno)); + goto error; + } + + 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*/ +