X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fcdda.c;h=e798d2191e06b5eb808a279a11b0463fedf2d401;hb=943b5ccc082784273bc21baa216527a605fc8e04;hp=deaf5deacbed410c39c1e6759f4a9d1116e452fa;hpb=bc3c81e28118abbddd49e8cd407a9675af0729d8;p=vlc diff --git a/modules/access/cdda.c b/modules/access/cdda.c index deaf5deacb..e798d2191e 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -1,8 +1,8 @@ /***************************************************************************** * cdda.c : CD digital audio input module for vlc ***************************************************************************** - * Copyright (C) 2000 VideoLAN - * $Id: cdda.c,v 1.9 2003/11/29 16:29:24 gbazin Exp $ + * Copyright (C) 2000, 2003 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar * Gildas Bazin @@ -19,45 +19,82 @@ * * 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 /* 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 *****************************************************************************/ -static int AccessOpen ( vlc_object_t * ); -static void AccessClose( vlc_object_t * ); - -static int DemuxOpen ( vlc_object_t * ); -static void DemuxClose ( vlc_object_t * ); +static int Open ( vlc_object_t * ); +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 miliseconds units." ) + "Default caching value for Audio CDs. This " \ + "value should be set in milliseconds." ) vlc_module_begin(); - set_description( _("CD Audio input") ); - set_capability( "access", 70 ); - add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); - set_callbacks( AccessOpen, AccessClose ); + 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, 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_submodule(); - set_description( _("CD Audio demux") ); - set_capability( "demux", 0 ); - set_callbacks( DemuxOpen, DemuxClose ); - add_shortcut( "cdda" ); + add_shortcut( "cddasimple" ); vlc_module_end(); @@ -71,395 +108,475 @@ vlc_module_end(); struct access_sys_t { vcddev_t *vcddev; /* vcd device descriptor */ - int i_nb_tracks; /* Nb of tracks (titles) */ - int i_track; /* Current track */ + + /* Current position */ int i_sector; /* Current Sector */ int * p_sectors; /* Track sectors */ - vlc_bool_t b_end_of_track; /* If the end of track was reached */ - -}; -static int Read ( input_thread_t *, byte_t *, size_t ); -static void Seek ( input_thread_t *, off_t ); -static int SetArea ( input_thread_t *, input_area_t * ); -static int SetProgram( input_thread_t *, pgrm_descriptor_t * ); + /* Wave header for the output data */ + WAVEHEADER waveheader; + bool b_header; -/***************************************************************************** - * AccessOpen: open cdda - *****************************************************************************/ -static int AccessOpen( vlc_object_t *p_this ) -{ - input_thread_t * p_input = (input_thread_t *)p_this; - access_sys_t * p_sys; + int i_track; + int i_first_sector; + int i_last_sector; - char * psz_orig; - char * psz_parser; - char * psz_source; - int i; - input_area_t * p_area; - int i_title = 1; - vcddev_t *vcddev; +#ifdef HAVE_LIBCDDB + cddb_disc_t *p_disc; +#endif +}; - /* parse the options passed in command line : */ - psz_orig = psz_parser = psz_source = strdup( p_input->psz_name ); +static block_t *Block( access_t * ); +static int Seek( access_t *, int64_t ); +static int Control( access_t *, int, va_list ); - if( !psz_orig ) - { - return( -1 ); - } +static int GetTracks( access_t *p_access, playlist_t *p_playlist, + playlist_item_t *p_parent ); - while( *psz_parser && *psz_parser != '@' ) - { - psz_parser++; - } +#ifdef HAVE_LIBCDDB +static void GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors ); +#endif - if( *psz_parser == '@' ) +/***************************************************************************** + * Open: open cdda + *****************************************************************************/ +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; + int i_ret; + + if( !p_access->psz_path || !*p_access->psz_path ) { - /* Found options */ - *psz_parser = '\0'; - ++psz_parser; - - i_title = (int)strtol( psz_parser, NULL, 10 ); - i_title = i_title ? i_title : 1; - } + /* Only when selected */ + if( !p_this->b_force ) return VLC_EGENERIC; - if( !*psz_source ) - { - if( !p_input->psz_access ) + psz_name = var_CreateGetString( p_this, "cd-audio" ); + if( !psz_name || !*psz_name ) { - free( psz_orig ); + free( psz_name ); return VLC_EGENERIC; } - psz_source = config_GetPsz( p_input, "vcd" ); - if( !psz_source ) return -1; } + else psz_name = ToLocaleDup( p_access->psz_path ); - /* Open CDDA */ - if( !(vcddev = ioctl_Open( p_this, psz_source )) ) - { - msg_Warn( p_input, "could not open %s", psz_source ); - free( psz_source ); - return VLC_EGENERIC; - } - free( psz_source ); +#ifdef WIN32 + if( psz_name[0] && psz_name[1] == ':' && + psz_name[2] == '\\' && psz_name[3] == '\0' ) psz_name[2] = '\0'; +#endif - p_input->p_access_data = p_sys = malloc( sizeof(access_sys_t) ); - if( p_sys == NULL ) + /* Open CDDA */ + if( (vcddev = ioctl_Open( VLC_OBJECT(p_access), psz_name )) == NULL ) { - msg_Err( p_input, "out of memory" ); - free( psz_source ); + msg_Warn( p_access, "could not open %s", psz_name ); + free( psz_name ); return VLC_EGENERIC; } + free( psz_name ); + /* Set up p_access */ + STANDARD_BLOCK_ACCESS_INIT p_sys->vcddev = vcddev; - p_input->i_mtu = CDDA_DATA_ONCE; + /* Do we play a single track ? */ + p_sys->i_track = var_CreateGetInteger( p_access, "cdda-track" ); - /* We read the Table Of Content information */ - p_sys->i_nb_tracks = ioctl_GetTracksMap( VLC_OBJECT(p_input), - p_sys->vcddev, &p_sys->p_sectors ); - if( p_sys->i_nb_tracks < 0 ) - { - msg_Err( p_input, "unable to count tracks" ); - } - else if( p_sys->i_nb_tracks <= 0 ) - { - msg_Err( p_input, "no audio tracks found" ); - } + 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 ); - if( p_sys->i_nb_tracks <= 1) - { - ioctl_Close( p_this, p_sys->vcddev ); - free( p_sys ); - return VLC_EGENERIC; - } - - if( i_title >= p_sys->i_nb_tracks || i_title < 1 ) - { - i_title = 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; } - - /* Set stream and area data */ - vlc_mutex_lock( &p_input->stream.stream_lock ); - - /* Initialize ES structures */ - input_InitStream( p_input, 0 ); - - /* cdda input method */ - p_input->stream.i_method = INPUT_METHOD_CDDA; - - p_input->stream.b_pace_control = 1; - p_input->stream.b_seekable = 1; - p_input->stream.i_mux_rate = 44100 * 4 / 50; - -#define area p_input->stream.pp_areas - for( i = 1 ; i <= p_sys->i_nb_tracks ; i++ ) + else { - input_AddArea( p_input, i, 1 ); - - /* Absolute start offset and size */ - area[i]->i_start = - (off_t)p_sys->p_sectors[i-1] * (off_t)CDDA_DATA_SIZE; - area[i]->i_size = - (off_t)(p_sys->p_sectors[i] - p_sys->p_sectors[i-1]) - * (off_t)CDDA_DATA_SIZE; - } -#undef area - - p_area = p_input->stream.pp_areas[i_title]; - - SetArea( p_input, p_area ); + /* 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 ); + } - vlc_mutex_unlock( &p_input->stream.stream_lock ); - if( !p_input->psz_demux || !*p_input->psz_demux ) - { - p_input->psz_demux = "cdda"; + 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_input->pf_read = Read; - p_input->pf_seek = Seek; - p_input->pf_set_area = SetArea; - p_input->pf_set_program = SetProgram; - - /* Update default_pts to a suitable value for cdda access */ - p_input->i_pts_delay = config_GetInt( p_input, "cdda-caching" ) * 1000; + /* PTS delay */ + var_Create( p_access, "cdda-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); return VLC_SUCCESS; + +error: + ioctl_Close( VLC_OBJECT(p_access), p_sys->vcddev ); + free( p_sys ); + return VLC_EGENERIC; } /***************************************************************************** - * AccessClose: closes cdda + * Close: closes cdda *****************************************************************************/ -static void AccessClose( vlc_object_t *p_this ) +static void Close( vlc_object_t *p_this ) { - input_thread_t *p_input = (input_thread_t *)p_this; - access_sys_t *p_sys = p_input->p_access_data; - + access_t *p_access = (access_t *)p_this; + access_sys_t *p_sys = p_access->p_sys; ioctl_Close( p_this, p_sys->vcddev ); free( p_sys ); } /***************************************************************************** - * Read: reads from the CDDA into PES packets. - ***************************************************************************** - * Returns -1 in case of error, 0 in case of EOF, otherwise the number of - * bytes. + * Block: read data (CDDA_DATA_ONCE) *****************************************************************************/ -static int Read( input_thread_t * p_input, byte_t * p_buffer, - size_t i_len ) +static block_t *Block( access_t *p_access ) { - access_sys_t *p_sys = p_input->p_access_data; - int i_blocks = i_len / CDDA_DATA_SIZE; - int i_read = 0; - int i_index; + access_sys_t *p_sys = p_access->p_sys; + int i_blocks = CDDA_BLOCKS_ONCE; + block_t *p_block; + if( p_sys->i_track < 0 ) p_access->info.b_eof = true; - if( ioctl_ReadSectors( VLC_OBJECT(p_input), p_sys->vcddev, p_sys->i_sector, - p_buffer, i_blocks, CDDA_TYPE ) < 0 ) - { - msg_Err( p_input, "could not read sector %d", p_sys->i_sector ); - return -1; - } + /* Check end of file */ + if( p_access->info.b_eof ) return NULL; - for( i_index = 0; i_index < i_blocks; i_index++ ) + if( !p_sys->b_header ) { - p_sys->i_sector ++; - if( p_sys->i_sector == p_sys->p_sectors[p_sys->i_track + 1] ) - { - input_area_t *p_area; - - if ( p_sys->i_track >= p_sys->i_nb_tracks - 1 ) - { - return 0; /* EOF */ - } - - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_area = p_input->stream.pp_areas[ - p_input->stream.p_selected_area->i_id + 1 ]; - - msg_Dbg( p_input, "new title" ); - - p_area->i_part = 1; - SetArea( p_input, p_area ); - vlc_mutex_unlock( &p_input->stream.stream_lock ); - } - i_read += CDDA_DATA_SIZE; + /* 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 = true; + return p_block; } - if ( i_len % CDDA_DATA_SIZE ) /* this should not happen */ + if( p_sys->i_sector >= p_sys->i_last_sector ) { - msg_Err( p_input, "must read full sectors" ); + p_access->info.b_eof = true; + return NULL; } - return i_read; -} - - -/***************************************************************************** - * SetProgram: Does nothing since a CDDA is mono_program - *****************************************************************************/ -static int SetProgram( input_thread_t * p_input, - pgrm_descriptor_t * p_program) -{ - return VLC_EGENERIC; -} - + /* 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; -/***************************************************************************** - * SetArea: initialize input data for title x. - * It should be called for each user navigation request. - ****************************************************************************/ -static int SetArea( input_thread_t * p_input, input_area_t * p_area ) -{ - access_sys_t *p_sys = p_input->p_access_data; - vlc_value_t val; - - /* we can't use the interface slider until initilization is complete */ - p_input->stream.b_seekable = 0; - - if( p_area != p_input->stream.p_selected_area ) + /* Do the actual reading */ + if( !( p_block = block_New( p_access, i_blocks * CDDA_DATA_SIZE ) ) ) { - /* Change the default area */ - p_input->stream.p_selected_area = p_area; - - /* Change the current track */ - p_sys->i_track = p_area->i_id - 1; - p_sys->i_sector = p_sys->p_sectors[p_sys->i_track]; - - /* Update the navigation variables without triggering a callback */ - val.i_int = p_area->i_id; - var_Change( p_input, "title", VLC_VAR_SETVALUE, &val, NULL ); + msg_Err( p_access, "cannot get a new block of size: %i", + i_blocks * CDDA_DATA_SIZE ); + return NULL; } - p_sys->i_sector = p_sys->p_sectors[p_sys->i_track]; + if( ioctl_ReadSectors( VLC_OBJECT(p_access), p_sys->vcddev, + p_sys->i_sector, p_block->p_buffer, i_blocks, CDDA_TYPE ) < 0 ) + { + msg_Err( p_access, "cannot read sector %i", p_sys->i_sector ); + block_Release( p_block ); - p_input->stream.p_selected_area->i_tell = - (off_t)p_sys->i_sector * (off_t)CDDA_DATA_SIZE - - p_input->stream.p_selected_area->i_start; + /* Try to skip one sector (in case of bad sectors) */ + p_sys->i_sector++; + p_access->info.i_pos += CDDA_DATA_SIZE; + return NULL; + } - /* warn interface that something has changed */ - p_input->stream.b_seekable = 1; - p_input->stream.b_changed = 1; + /* Update a few values */ + p_sys->i_sector += i_blocks; + p_access->info.i_pos += p_block->i_buffer; - return 0; + return p_block; } - /**************************************************************************** * Seek ****************************************************************************/ -static void Seek( input_thread_t * p_input, off_t i_off ) +static int Seek( access_t *p_access, int64_t i_pos ) { - access_sys_t * p_sys = p_input->p_access_data; + access_sys_t *p_sys = p_access->p_sys; - p_sys->i_sector = p_sys->p_sectors[p_sys->i_track] - + i_off / (off_t)CDDA_DATA_SIZE; + /* Next sector to read */ + p_sys->i_sector = p_sys->i_first_sector + i_pos / CDDA_DATA_SIZE; + p_access->info.i_pos = i_pos; - vlc_mutex_lock( &p_input->stream.stream_lock ); - p_input->stream.p_selected_area->i_tell = - (off_t)p_sys->i_sector * (off_t)CDDA_DATA_SIZE - - p_input->stream.p_selected_area->i_start; - vlc_mutex_unlock( &p_input->stream.stream_lock ); + return VLC_SUCCESS; } - - - /***************************************************************************** - * Demux: local prototypes + * Control: *****************************************************************************/ -struct demux_sys_t +static int Control( access_t *p_access, int i_query, va_list args ) { - es_out_id_t *p_es; - mtime_t i_pts; -}; + bool *pb_bool; + int *pi_int; + int64_t *pi_64; -static int Demux ( input_thread_t * p_input ); + 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; + break; + + case ACCESS_GET_MTU: + pi_int = (int*)va_arg( args, int * ); + *pi_int = CDDA_DATA_ONCE; + break; + + case ACCESS_GET_PTS_DELAY: + pi_64 = (int64_t*)va_arg( args, int64_t * ); + *pi_64 = var_GetInteger( p_access, "cdda-caching" ) * 1000; + break; + + case ACCESS_SET_PAUSE_STATE: + 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; -/**************************************************************************** - * DemuxOpen: - ****************************************************************************/ -static int DemuxOpen ( vlc_object_t * p_this) -{ - input_thread_t *p_input = (input_thread_t *)p_this; - demux_sys_t *p_sys; + default: + msg_Warn( p_access, "unimplemented query in control" ); + return VLC_EGENERIC; - es_format_t fmt; + } + return VLC_SUCCESS; +} - if( p_input->stream.i_method != INPUT_METHOD_CDDA ) +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 ) { - return VLC_EGENERIC; + msg_Err( p_access, "unable to count tracks" ); + return VLC_EGENERIC;; } - - p_input->pf_demux = Demux; - p_input->pf_rewind = NULL; - p_input->pf_demux_control = demux_vaControlDefault; - p_input->p_demux_data = p_sys = malloc( sizeof( es_descriptor_t ) ); - p_sys->i_pts = 0; - - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( input_InitStream( p_input, 0 ) == -1) + else if( i_titles <= 0 ) { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Err( p_input, "cannot init stream" ); - free( p_sys ); + msg_Err( p_access, "no audio tracks found" ); return VLC_EGENERIC; } - p_input->stream.i_mux_rate = 4 * 44100 / 50; - vlc_mutex_unlock( &p_input->stream.stream_lock ); - es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'a', 'r', 'a', 'w' ) ); - fmt.audio.i_channels = 2; - fmt.audio.i_rate = 44100; - fmt.audio.i_bitspersample = 16; - fmt.audio.i_blockalign = 4; - fmt.i_bitrate = 4 * 44100 * 8; + 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 ); - p_sys->p_es = es_out_Add( p_input->p_es_out, &fmt ); +#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; } -/**************************************************************************** - * DemuxClose: - ****************************************************************************/ -static void DemuxClose( vlc_object_t * p_this) +#ifdef HAVE_LIBCDDB +static void GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors ) { - input_thread_t *p_input = (input_thread_t*)p_this; - demux_sys_t *p_sys = (demux_sys_t*)p_input->p_demux_data; + int i, i_matches; + int64_t i_length = 0, i_size = 0; + cddb_conn_t *p_cddb = cddb_new(); - free( p_sys ); - return; -} + if( !p_cddb ) + { + msg_Warn( p_access, "unable to use CDDB" ); + goto cddb_destroy; + } -/**************************************************************************** - * Demux: - ****************************************************************************/ -static int Demux( input_thread_t * p_input ) -{ - demux_sys_t *p_sys = (demux_sys_t*)p_input->p_demux_data; - block_t *p_block; + char* psz_tmp = config_GetPsz( p_access, "cddb-server" ); + cddb_set_email_address( p_cddb, "vlc@videolan.org" ); + cddb_set_server_name( p_cddb, psz_tmp ); + cddb_set_server_port( p_cddb, config_GetInt( p_access, "cddb-port" ) ); + free( psz_tmp ); + + /// \todo + cddb_cache_disable( p_cddb ); +// cddb_cache_set_dir( p_cddb, +// config_GetPsz( p_access, +// MODULE_STRING "-cddb-cachedir") ); - input_ClockManageRef( p_input, - p_input->stream.p_selected_program, - p_sys->i_pts ); + cddb_set_timeout( p_cddb, 10 ); - if( ( p_block = stream_Block( p_input->s, CDDA_DATA_SIZE ) ) == NULL ) + /// \todo + cddb_http_disable( p_cddb); + + p_access->p_sys->p_disc = cddb_disc_new(); + + if(! p_access->p_sys->p_disc ) { - /* eof */ - return 0; + msg_Err( p_access, "unable to create CDDB disc structure." ); + goto cddb_end; } - p_block->i_dts = - p_block->i_pts = input_ClockGetTS( p_input, - p_input->stream.p_selected_program, - p_sys->i_pts ); - p_block->i_length = (mtime_t)90000 * (mtime_t)p_block->i_buffer/44100/4; - p_sys->i_pts += p_block->i_length; + 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)); - es_out_Send( p_input->p_es_out, p_sys->p_es, p_block ); +cddb_destroy: + cddb_destroy( p_cddb); - return 1; +cddb_end: ; } +#endif /*HAVE_LIBCDDB*/