X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fcdda.c;h=ba3fdcddba61dc76f8a9ccd2a114f4e786569cb8;hb=3e0ef87588c1e0b5b906887578da8cb3c8eee5a4;hp=72ac171c2fbb1ab33b111439240eb104faac2f90;hpb=25d2a663a98c0adc49d95e3ad5612f76da954953;p=vlc diff --git a/modules/access/cdda.c b/modules/access/cdda.c index 72ac171c2f..ba3fdcddba 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 VideoLAN + * Copyright (C) 2000, 2003 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -19,20 +19,44 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +/** + * Todo: + * - Improve CDDB support (non-blocking, cache, ...) + * - Fix tracknumber in MRL + */ + /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include +#include -#include "codecs.h" +#include /* For WAVEHEADER */ #include "vcd/cdrom.h" +#warning playlist code must not be used here. +#include + +#ifdef HAVE_LIBCDDB +#include +#endif + +#ifdef HAVE_ERRNO_H +#include +#endif + /***************************************************************************** * Module descriptior *****************************************************************************/ @@ -41,17 +65,34 @@ static void Close( vlc_object_t * ); #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for cdda streams. This " \ - "value should be set in milliseconds units." ) + "Default caching value for Audio CDs. This " \ + "value should be set in milliseconds." ) vlc_module_begin(); - set_description( _("Audio CD input") ); - set_capability( "access2", 10 ); + 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_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, - CACHING_LONGTEXT, VLC_TRUE ); + CACHING_LONGTEXT, true ); + + add_integer( "cdda-track", -1 , NULL, NULL, NULL, true ); + change_internal(); + add_integer( "cdda-first-sector", -1, NULL, NULL, NULL, true ); + change_internal(); + 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" ); vlc_module_end(); @@ -68,23 +109,34 @@ struct access_sys_t { vcddev_t *vcddev; /* vcd device descriptor */ - /* Title infos */ - int i_titles; - input_title_t *title[99]; /* No more that 99 track in a cd-audio */ - /* Current position */ int i_sector; /* Current Sector */ 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 Control( access_t *, int, va_list ); +static int GetTracks( access_t *p_access, playlist_t *p_playlist, + playlist_item_t *p_parent ); + +#ifdef HAVE_LIBCDDB +static void GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors ); +#endif + /***************************************************************************** * Open: open cdda *****************************************************************************/ @@ -92,10 +144,10 @@ 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; + int i_mrl_tracknum = -1; + int i_ret; if( !p_access->psz_path || !*p_access->psz_path ) { @@ -105,11 +157,16 @@ static int Open( vlc_object_t *p_this ) psz_name = var_CreateGetString( 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_path ); + +#ifdef WIN32 + if( psz_name[0] && psz_name[1] == ':' && + psz_name[2] == '\\' && psz_name[3] == '\0' ) psz_name[2] = '\0'; +#endif /* Open CDDA */ if( (vcddev = ioctl_Open( VLC_OBJECT(p_access), psz_name )) == NULL ) @@ -121,73 +178,88 @@ static int Open( vlc_object_t *p_this ) free( psz_name ); /* Set up p_access */ - p_access->pf_read = NULL; - p_access->pf_block = Block; - p_access->pf_control = Control; - p_access->pf_seek = Seek; - p_access->info.i_update = 0; - p_access->info.i_size = 0; - p_access->info.i_pos = 0; - p_access->info.b_eof = VLC_FALSE; - p_access->info.i_title = 0; - p_access->info.i_seekpoint = 0; - p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) ); - memset( p_sys, 0, sizeof( access_sys_t ) ); + STANDARD_BLOCK_ACCESS_INIT p_sys->vcddev = vcddev; - p_sys->b_header = VLC_FALSE; - /* We read the Table Of Content information */ - p_sys->i_titles = ioctl_GetTracksMap( VLC_OBJECT(p_access), - p_sys->vcddev, &p_sys->p_sectors ); - if( p_sys->i_titles < 0 ) - { - msg_Err( p_access, "unable to count tracks" ); - goto error; - } - else if( p_sys->i_titles <= 0 ) - { - msg_Err( p_access, "no audio tracks found" ); - goto error; - } + /* Do we play a single track ? */ + p_sys->i_track = var_CreateGetInteger( p_access, "cdda-track" ); - /* Build title table */ - for( i = 0; i < p_sys->i_titles; i++ ) - { - input_title_t *t = p_sys->title[i] = vlc_input_title_New(); + if( p_sys->i_track < 0 && i_mrl_tracknum <= 0 ) + { + /* We only do separate items if the whole disc is requested */ + playlist_t *p_playlist = pl_Yield( p_access ); - msg_Dbg( p_access, "title[%d] start=%d", i, p_sys->p_sectors[i] ); - msg_Dbg( p_access, "title[%d] end=%d", i, p_sys->p_sectors[i+1] ); + i_ret = -1; + if( p_playlist ) + { + input_thread_t *p_input = (input_thread_t*)vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT ); + if( p_input ) + { + input_item_t *p_current = input_GetItem( p_input ); + playlist_item_t *p_item; + + if( p_playlist->status.p_item->p_input == p_current ) + p_item = p_playlist->status.p_item; + else + p_item = playlist_ItemGetByInput( p_playlist, p_current, pl_Unlocked ); + + if( p_item ) + i_ret = GetTracks( p_access, p_playlist, p_item ); + else + msg_Dbg( p_playlist, "unable to find item in playlist"); + vlc_object_release( p_input ); + } + pl_Release( p_access ); + } + if( i_ret < 0 ) + goto error; + } + else + { + /* Build a WAV header for the output data */ + memset( &p_sys->waveheader, 0, sizeof(WAVEHEADER) ); + SetWLE( &p_sys->waveheader.Format, 1 ); /*WAVE_FORMAT_PCM*/ + SetWLE( &p_sys->waveheader.BitsPerSample, 16); + p_sys->waveheader.MainChunkID = VLC_FOURCC('R', 'I', 'F', 'F'); + p_sys->waveheader.Length = 0; /* we just don't know */ + p_sys->waveheader.ChunkTypeID = VLC_FOURCC('W', 'A', 'V', 'E'); + p_sys->waveheader.SubChunkID = VLC_FOURCC('f', 'm', 't', ' '); + SetDWLE( &p_sys->waveheader.SubChunkLength, 16); + SetWLE( &p_sys->waveheader.Modus, 2); + SetDWLE( &p_sys->waveheader.SampleFreq, 44100); + SetWLE( &p_sys->waveheader.BytesPerSample, + 2 /*Modus*/ * 16 /*BitsPerSample*/ / 8 ); + SetDWLE( &p_sys->waveheader.BytesPerSec, + 2*16/8 /*BytesPerSample*/ * 44100 /*SampleFreq*/ ); + 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" ); + /* Tracknumber in MRL */ + if( p_sys->i_first_sector < 0 || p_sys->i_last_sector < 0 ) + { + int i_titles; + if( i_mrl_tracknum <= 0 ) + { + msg_Err( p_access, "wrong sector information" ); + goto error; + } + i_titles = ioctl_GetTracksMap( VLC_OBJECT(p_access), + p_sys->vcddev, &p_sys->p_sectors ); + } - asprintf( &t->psz_name, _("Track %i"), i + 1 ); - t->i_size = ( p_sys->p_sectors[i+1] - p_sys->p_sectors[i] ) * - (int64_t)CDDA_DATA_SIZE; - t->i_length = I64C(1000000) * t->i_size / 44100 / 4; + 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; } - p_sys->i_sector = p_sys->p_sectors[0]; - p_access->info.i_size = p_sys->title[0]->i_size; - - /* Build a WAV header for the output data */ - memset( &p_sys->waveheader, 0, sizeof(WAVEHEADER) ); - SetWLE( &p_sys->waveheader.Format, 1 ); /*WAVE_FORMAT_PCM*/ - SetWLE( &p_sys->waveheader.BitsPerSample, 16); - p_sys->waveheader.MainChunkID = VLC_FOURCC('R', 'I', 'F', 'F'); - p_sys->waveheader.Length = 0; /* we just don't know */ - p_sys->waveheader.ChunkTypeID = VLC_FOURCC('W', 'A', 'V', 'E'); - p_sys->waveheader.SubChunkID = VLC_FOURCC('f', 'm', 't', ' '); - SetDWLE( &p_sys->waveheader.SubChunkLength, 16); - SetWLE( &p_sys->waveheader.Modus, 2); - SetDWLE( &p_sys->waveheader.SampleFreq, 44100); - SetWLE( &p_sys->waveheader.BytesPerSample, - 2 /*Modus*/ * 16 /*BitsPerSample*/ / 8 ); - SetDWLE( &p_sys->waveheader.BytesPerSec, - 2*16/8 /*BytesPerSample*/ * 44100 /*SampleFreq*/ ); - p_sys->waveheader.DataChunkID = VLC_FOURCC('d', 'a', 't', 'a'); - p_sys->waveheader.DataLength = 0; /* we just don't know */ - /* PTS delay */ var_Create( p_access, "cdda-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + return VLC_SUCCESS; error: @@ -203,13 +275,6 @@ 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; - int i; - - for( i = 0; i < p_sys->i_titles; i++ ) - { - vlc_input_title_Delete( p_sys->title[i] ); - } - ioctl_Close( p_this, p_sys->vcddev ); free( p_sys ); } @@ -223,6 +288,8 @@ 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 = true; + /* Check end of file */ if( p_access->info.b_eof ) return NULL; @@ -231,32 +298,19 @@ 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; } - /* Check end of title */ - while( p_sys->i_sector >= p_sys->p_sectors[p_access->info.i_title + 1] ) + if( p_sys->i_sector >= p_sys->i_last_sector ) { - if( p_access->info.i_title + 1 >= p_sys->i_titles ) - { - p_access->info.b_eof = VLC_TRUE; - return NULL; - } - - p_access->info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_SIZE; - p_access->info.i_title++; - p_access->info.i_size = p_sys->title[p_access->info.i_title]->i_size; - p_access->info.i_pos = 0; + p_access->info.b_eof = true; + return NULL; } - /* Don't read after the end of a title */ - if( p_sys->i_sector + i_blocks >= - p_sys->p_sectors[p_access->info.i_title + 1] ) - { - i_blocks = p_sys->p_sectors[p_access->info.i_title + 1 ] - - p_sys->i_sector; - } + /* Don't read too far */ + if( p_sys->i_sector + i_blocks >= p_sys->i_last_sector ) + i_blocks = p_sys->i_last_sector - p_sys->i_sector; /* Do the actual reading */ if( !( p_block = block_New( p_access, i_blocks * CDDA_DATA_SIZE ) ) ) @@ -293,8 +347,7 @@ static int Seek( access_t *p_access, int64_t i_pos ) access_sys_t *p_sys = p_access->p_sys; /* Next sector to read */ - p_sys->i_sector = p_sys->p_sectors[p_access->info.i_title] + - i_pos / CDDA_DATA_SIZE; + p_sys->i_sector = p_sys->i_first_sector + i_pos / CDDA_DATA_SIZE; p_access->info.i_pos = i_pos; return VLC_SUCCESS; @@ -305,25 +358,20 @@ static int Seek( access_t *p_access, int64_t i_pos ) *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { - access_sys_t *p_sys = p_access->p_sys; - vlc_bool_t *pb_bool; + bool *pb_bool; int *pi_int; int64_t *pi_64; - input_title_t ***ppp_title; - int i; 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; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; break; - /* */ case ACCESS_GET_MTU: pi_int = (int*)va_arg( args, int * ); *pi_int = CDDA_DATA_ONCE; @@ -334,47 +382,199 @@ static int Control( access_t *p_access, int i_query, va_list args ) *pi_64 = var_GetInteger( p_access, "cdda-caching" ) * 1000; break; - /* */ case ACCESS_SET_PAUSE_STATE: - break; - case ACCESS_GET_TITLE_INFO: - ppp_title = (input_title_t***)va_arg( args, input_title_t*** ); - pi_int = (int*)va_arg( args, int* ); - *((int*)va_arg( args, int* )) = 1; /* Title offset */ - - /* Duplicate title infos */ - *pi_int = p_sys->i_titles; - *ppp_title = malloc(sizeof( input_title_t **) * p_sys->i_titles ); - for( i = 0; i < p_sys->i_titles; i++ ) - { - (*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->title[i] ); - } - break; - case ACCESS_SET_TITLE: - i = (int)va_arg( args, int ); - if( i != p_access->info.i_title ) - { - /* Update info */ - p_access->info.i_update |= - INPUT_UPDATE_TITLE|INPUT_UPDATE_SIZE; - p_access->info.i_title = i; - p_access->info.i_size = p_sys->title[i]->i_size; - p_access->info.i_pos = 0; - - /* Next sector to read */ - p_sys->i_sector = p_sys->p_sectors[i]; - } - break; - + case ACCESS_GET_META: case ACCESS_SET_SEEKPOINT: + case ACCESS_SET_PRIVATE_ID_STATE: + case ACCESS_GET_CONTENT_TYPE: return VLC_EGENERIC; default: - msg_Err( p_access, "unimplemented query in control" ); + 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 ) +{ + 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 ) + { + msg_Err( p_access, "unable to count tracks" ); + return VLC_EGENERIC;; + } + else if( i_titles <= 0 ) + { + msg_Err( p_access, "no audio tracks found" ); + return VLC_EGENERIC; + } + + p_item_in_category = playlist_ItemToNode( p_playlist, p_parent, pl_Unlocked ); + playlist_ItemSetName( p_parent, "Audio CD" ); + var_SetInteger( p_playlist, "item-change", p_parent->p_input->i_id ); + +#ifdef HAVE_LIBCDDB + GetCDDBInfo( p_access, i_titles, p_sys->p_sectors ); + if( p_sys->p_disc ) + { + if( cddb_disc_get_title( p_sys->p_disc ) ) + { + const char *psz_name = cddb_disc_get_title( p_sys->p_disc ); + playlist_ItemSetName( p_parent, psz_name ); + var_SetInteger( p_playlist, "item-change", + p_parent->p_input->i_id ); + } + } +#endif + + /* Build title table */ + for( 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; + + 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 ); + + 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] ); + +// 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 */); + + /* Define a "default name" */ + sprintf( psz_name, _("Audio CD - Track %i"), (i+1) ); + + /* Create playlist items */ + p_input_item = input_ItemNewWithType( VLC_OBJECT( p_playlist ), + psz_uri, psz_name, 0, NULL, -1, + ITEM_TYPE_DISC ); + input_ItemAddOption( p_input_item, psz_first ); + input_ItemAddOption( p_input_item, psz_last ); + input_ItemAddOption( p_input_item, psz_opt ); + +#ifdef HAVE_LIBCDDB + /* If we have CDDB info, change the name */ + if( p_sys->p_disc ) + { + cddb_track_t *t = cddb_disc_get_track( p_sys->p_disc, i ); + if( t!= NULL ) + { + if( cddb_track_get_title( t ) != NULL ) + { + free( p_input_item->psz_name ); + p_input_item->psz_name = strdup( cddb_track_get_title( t ) ); + input_item_SetTitle( p_input_item, cddb_track_get_title( t ) ); + } + if( cddb_track_get_artist( t ) != NULL ) + { + input_item_SetArtist( p_input_item, cddb_track_get_artist( t ) ); + } + } + } +#endif + int i_ret = playlist_BothAddInput( p_playlist, p_input_item, + p_item_in_category, + PLAYLIST_APPEND, PLAYLIST_END, NULL, NULL, + pl_Unlocked ); + vlc_gc_decref( p_input_item ); + free( psz_uri ); free( psz_opt ); free( psz_name ); + free( psz_first ); free( psz_last ); + if( i_ret != VLC_SUCCESS ) + return VLC_EGENERIC; + } + return VLC_SUCCESS; +} + +#ifdef HAVE_LIBCDDB +static void 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( !p_cddb ) + { + msg_Warn( p_access, "unable to use CDDB" ); + goto cddb_destroy; + } + + 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, +// 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(); + + if(! p_access->p_sys->p_disc ) + { + msg_Err( p_access, "unable to create CDDB disc structure." ); + goto cddb_end; + } + + for(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 += INT64_C(1000000) * i_size / 44100 / 4 ; + } + + cddb_disc_set_length( p_access->p_sys->p_disc, (int)(i_length/1000000) ); + + if (!cddb_disc_calc_discid(p_access->p_sys->p_disc )) + { + msg_Err( p_access, "CDDB disc ID calculation failed" ); + goto cddb_destroy; + } + + i_matches = cddb_query( p_cddb, p_access->p_sys->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)); + +cddb_destroy: + cddb_destroy( p_cddb); + +cddb_end: ; +} +#endif /*HAVE_LIBCDDB*/