/*****************************************************************************
* cdda.c : CD digital audio input module for vlc
*****************************************************************************
- * Copyright (C) 2000 VideoLAN
- * $Id: cdda.c,v 1.7 2003/11/24 00:39:01 fenrir Exp $
+ * Copyright (C) 2000, 2003-2006, 2008-2009 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
*
* 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 <stdio.h>
-#include <stdlib.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <sys/types.h>
+#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> /* ToLocaleDup */
-#include "codecs.h"
+#include <vlc_codecs.h> /* For WAVEHEADER */
+#include "vcd/cdrom.h" /* For CDDA_DATA_SIZE */
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
+#ifdef HAVE_LIBCDDB
+ #include <cddb/cddb.h>
+ #include <errno.h>
#endif
-#include <string.h>
+/*****************************************************************************
+ * Module descriptior
+ *****************************************************************************/
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
+
+#define CACHING_TEXT N_("Caching value in ms")
+#define CACHING_LONGTEXT N_( \
+ "Default caching value for Audio CDs. This " \
+ "value should be set in milliseconds." )
+
+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_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_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" )
+ add_shortcut( "cddasimple" )
+vlc_module_end ()
-#include "vcd/cdrom.h"
/* how many blocks VCDRead will read in each loop */
#define CDDA_BLOCKS_ONCE 20
#define CDDA_DATA_ONCE (CDDA_BLOCKS_ONCE * CDDA_DATA_SIZE)
/*****************************************************************************
- * cdda_data_t: CD audio information
+ * Access: local prototypes
*****************************************************************************/
-typedef struct cdda_data_s
+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 */
+ int *p_sectors; /* Track sectors */
-} cdda_data_t;
+ /* Wave header for the output data */
+ WAVEHEADER waveheader;
+ bool b_header;
-struct demux_sys_t
-{
- es_descriptor_t *p_es;
- mtime_t i_pts;
+ int i_track;
+ int i_first_sector;
+ int i_last_sector;
};
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int CDDAOpen ( vlc_object_t * );
-static void CDDAClose ( vlc_object_t * );
-static int CDDARead ( input_thread_t *, byte_t *, size_t );
-static void CDDASeek ( input_thread_t *, off_t );
-static int CDDASetArea ( input_thread_t *, input_area_t * );
-static int CDDASetProgram ( input_thread_t *, pgrm_descriptor_t * );
+static block_t *Block( access_t * );
+static int Seek( access_t *, uint64_t );
+static int Control( access_t *, int, va_list );
-static int CDDAOpenDemux ( vlc_object_t * );
-static void CDDACloseDemux ( vlc_object_t * );
-static int CDDADemux ( input_thread_t * p_input );
+static int GetTracks( access_t *p_access, input_item_t *p_current );
-/*****************************************************************************
- * Module descriptior
- *****************************************************************************/
-#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." )
-
-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( CDDAOpen, CDDAClose );
- add_shortcut( "cdda" );
-
- add_submodule();
- set_description( _("CD Audio demux") );
- set_capability( "demux", 0 );
- set_callbacks( CDDAOpenDemux, CDDACloseDemux );
- add_shortcut( "cdda" );
-vlc_module_end();
+#ifdef HAVE_LIBCDDB
+static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors );
+#endif
/*****************************************************************************
- * CDDAOpen: open cdda
+ * Open: open cdda
*****************************************************************************/
-static int CDDAOpen( vlc_object_t *p_this )
+static int Open( vlc_object_t *p_this )
{
- input_thread_t * p_input = (input_thread_t *)p_this;
- char * psz_orig;
- char * psz_parser;
- char * psz_source;
- cdda_data_t * p_cdda;
- int i;
- input_area_t * p_area;
- int i_title = 1;
- vcddev_t *vcddev;
-
- /* parse the options passed in command line : */
- psz_orig = psz_parser = psz_source = strdup( p_input->psz_name );
-
- if( !psz_orig )
- {
- return( -1 );
- }
-
- while( *psz_parser && *psz_parser != '@' )
- {
- psz_parser++;
- }
+ access_t *p_access = (access_t*)p_this;
+ access_sys_t *p_sys;
+ vcddev_t *vcddev;
+ char *psz_name;
- if( *psz_parser == '@' )
+ 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_access->psz_access || !*p_access->psz_access )
+ 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 );
- return -1;
+ 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 );
+
+#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( p_this, psz_source )) )
+ if( (vcddev = ioctl_Open( VLC_OBJECT(p_access), psz_name ) ) == NULL )
{
- msg_Warn( p_input, "could not open %s", psz_source );
- free( psz_source );
- return -1;
+ msg_Warn( p_access, "could not open %s", psz_name );
+ free( psz_name );
+ return VLC_EGENERIC;
}
- free( psz_source );
+ free( psz_name );
- p_cdda = malloc( sizeof(cdda_data_t) );
- if( p_cdda == NULL )
- {
- msg_Err( p_input, "out of memory" );
- free( psz_source );
- return -1;
- }
+ /* Set up p_access */
+ STANDARD_BLOCK_ACCESS_INIT
+ p_sys->vcddev = vcddev;
- p_cdda->vcddev = vcddev;
- p_input->p_access_data = (void *)p_cdda;
+ /* Do we play a single track ? */
+ p_sys->i_track = var_CreateGetInteger( p_access, "cdda-track" ) - 1;
- p_input->i_mtu = CDDA_DATA_ONCE;
+ if( p_sys->i_track < 0 )
+ {
+ /* We only do separate items if the whole disc is requested */
+ input_thread_t *p_input = access_GetParentInput( p_access );
- /* We read the Table Of Content information */
- p_cdda->i_nb_tracks = ioctl_GetTracksMap( VLC_OBJECT(p_input),
- p_cdda->vcddev, &p_cdda->p_sectors );
- if( p_cdda->i_nb_tracks < 0 )
- msg_Err( p_input, "unable to count tracks" );
- else if( p_cdda->i_nb_tracks <= 0 )
- msg_Err( p_input, "no audio tracks found" );
+ int i_ret = -1;
+ if( p_input )
+ {
+ input_item_t *p_current = input_GetItem( p_input );
+ if( p_current )
+ i_ret = GetTracks( p_access, p_current );
- if( p_cdda->i_nb_tracks <= 1)
+ vlc_object_release( p_input );
+ }
+ if( i_ret < 0 )
+ goto error;
+ }
+ else
{
- ioctl_Close( p_this, p_cdda->vcddev );
- free( p_cdda );
- return -1;
+ /* 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 )
+ {
+ 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, "invalid track number" );
+ goto error;
+ }
+ 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;
}
- if( i_title >= p_cdda->i_nb_tracks || i_title < 1 )
- i_title = 1;
+ /* PTS delay */
+ var_Create( p_access, "cdda-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
+
+ return VLC_SUCCESS;
+
+error:
+ free( p_sys->p_sectors );
+ ioctl_Close( VLC_OBJECT(p_access), p_sys->vcddev );
+ free( p_sys );
+ return VLC_EGENERIC;
+}
+
+/*****************************************************************************
+ * Close: closes cdda
+ *****************************************************************************/
+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;
- /* Set stream and area data */
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ free( p_sys->p_sectors );
+ ioctl_Close( p_this, p_sys->vcddev );
+ free( p_sys );
+}
- /* Initialize ES structures */
- input_InitStream( p_input, 0 );
+/*****************************************************************************
+ * Block: read data (CDDA_DATA_ONCE)
+ *****************************************************************************/
+static block_t *Block( access_t *p_access )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ int i_blocks = CDDA_BLOCKS_ONCE;
+ block_t *p_block;
- /* cdda input method */
- p_input->stream.i_method = INPUT_METHOD_CDDA;
+ if( p_sys->i_track < 0 ) p_access->info.b_eof = true;
- p_input->stream.b_pace_control = 1;
- p_input->stream.b_seekable = 1;
- p_input->stream.i_mux_rate = 44100 * 4 / 50;
+ /* Check end of file */
+ if( p_access->info.b_eof ) return NULL;
-#define area p_input->stream.pp_areas
- for( i = 1 ; i <= p_cdda->i_nb_tracks ; i++ )
+ if( !p_sys->b_header )
{
- input_AddArea( p_input, i, 1 );
-
- /* Absolute start offset and size */
- area[i]->i_start =
- (off_t)p_cdda->p_sectors[i-1] * (off_t)CDDA_DATA_SIZE;
- area[i]->i_size =
- (off_t)(p_cdda->p_sectors[i] - p_cdda->p_sectors[i-1])
- * (off_t)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;
}
-#undef area
- p_area = p_input->stream.pp_areas[i_title];
-
- CDDASetArea( p_input, p_area );
+ if( p_sys->i_sector >= p_sys->i_last_sector )
+ {
+ p_access->info.b_eof = true;
+ return NULL;
+ }
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ /* 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;
- if( !p_input->psz_demux || !*p_input->psz_demux )
+ /* Do the actual reading */
+ if( !( p_block = block_New( p_access, i_blocks * CDDA_DATA_SIZE ) ) )
{
- p_input->psz_demux = "cdda";
+ msg_Err( p_access, "cannot get a new block of size: %i",
+ i_blocks * CDDA_DATA_SIZE );
+ return NULL;
}
- p_input->pf_read = CDDARead;
- p_input->pf_seek = CDDASeek;
- p_input->pf_set_area = CDDASetArea;
- p_input->pf_set_program = CDDASetProgram;
+ 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 );
+
+ /* Try to skip one sector (in case of bad sectors) */
+ p_sys->i_sector++;
+ p_access->info.i_pos += CDDA_DATA_SIZE;
+ return NULL;
+ }
- /* Update default_pts to a suitable value for cdda access */
- p_input->i_pts_delay = config_GetInt( p_input, "cdda-caching" ) * 1000;
+ /* Update a few values */
+ p_sys->i_sector += i_blocks;
+ p_access->info.i_pos += p_block->i_buffer;
- return 0;
+ return p_block;
}
-/*****************************************************************************
- * CDDAClose: closes cdda
- *****************************************************************************/
-static void CDDAClose( vlc_object_t *p_this )
+/****************************************************************************
+ * Seek
+ ****************************************************************************/
+static int Seek( access_t *p_access, uint64_t i_pos )
{
- input_thread_t * p_input = (input_thread_t *)p_this;
- cdda_data_t *p_cdda = (cdda_data_t *)p_input->p_access_data;
+ access_sys_t *p_sys = p_access->p_sys;
- ioctl_Close( p_this, p_cdda->vcddev );
- free( p_cdda );
+ /* 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;
}
/*****************************************************************************
- * CDDARead: reads from the CDDA into PES packets.
- *****************************************************************************
- * Returns -1 in case of error, 0 in case of EOF, otherwise the number of
- * bytes.
+ * Control:
*****************************************************************************/
-static int CDDARead( input_thread_t * p_input, byte_t * p_buffer,
- size_t i_len )
+static int Control( access_t *p_access, int i_query, va_list args )
{
- cdda_data_t * p_cdda;
- int i_blocks;
- int i_index;
- int i_read;
-
- p_cdda = (cdda_data_t *)p_input->p_access_data;
-
- i_read = 0;
-
- /* Compute the number of blocks we have to read */
+ switch( i_query )
+ {
+ case ACCESS_CAN_SEEK:
+ case ACCESS_CAN_FASTSEEK:
+ case ACCESS_CAN_PAUSE:
+ case ACCESS_CAN_CONTROL_PACE:
+ *va_arg( args, bool* ) = true;
+ break;
+
+ case ACCESS_GET_PTS_DELAY:
+ *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;
+}
- i_blocks = i_len / CDDA_DATA_SIZE;
+static int GetTracks( access_t *p_access, input_item_t *p_current )
+{
+ access_sys_t *p_sys = p_access->p_sys;
- if ( ioctl_ReadSectors( VLC_OBJECT(p_input), p_cdda->vcddev,
- p_cdda->i_sector, p_buffer, i_blocks, CDDA_TYPE ) < 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_input, "could not read sector %d", p_cdda->i_sector );
- return -1;
+ 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;;
}
- for ( i_index = 0; i_index < i_blocks; i_index++ )
+ /* */
+ 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
+ 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 )
{
- p_cdda->i_sector ++;
- if ( p_cdda->i_sector == p_cdda->p_sectors[p_cdda->i_track + 1] )
+ 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 )
{
- input_area_t *p_area;
+ psz_year = psz_year_buffer;
+ snprintf( psz_year_buffer, sizeof(psz_year_buffer), "%u", i_year );
+ }
- if ( p_cdda->i_track >= p_cdda->i_nb_tracks - 1 )
- return 0; /* EOF */
+ /* 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_mutex_lock( &p_input->stream.stream_lock );
- p_area = p_input->stream.pp_areas[
- p_input->stream.p_selected_area->i_id + 1 ];
+ /* CD-Text */
+ vlc_meta_t **pp_cd_text;
+ int i_cd_text;
- msg_Dbg( p_input, "new title" );
+ 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;
+ }
- p_area->i_part = 1;
- CDDASetArea( p_input, p_area );
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- }
- i_read += CDDA_DATA_SIZE;
+ /* Retrieve 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 ( i_len % CDDA_DATA_SIZE ) /* this should not happen */
+ if( NONEMPTY( psz_album ) )
{
- msg_Err( p_input, "must read full sectors" );
+ input_item_SetName( p_current, psz_album );
+ input_item_SetAlbum( p_current, psz_album );
}
- return i_read;
-}
+ if( NONEMPTY( psz_genre ) )
+ input_item_SetGenre( p_current, psz_genre );
+ if( NONEMPTY( psz_artist ) )
+ input_item_SetArtist( p_current, psz_artist );
-/*****************************************************************************
- * CDDASetProgram: Does nothing since a CDDA is mono_program
- *****************************************************************************/
-static int CDDASetProgram( input_thread_t * p_input,
- pgrm_descriptor_t * p_program)
-{
- return 0;
-}
+ if( NONEMPTY( psz_year ) )
+ input_item_SetDate( p_current, psz_year );
+ if( NONEMPTY( psz_description ) )
+ input_item_SetDescription( p_current, psz_description );
-/*****************************************************************************
- * CDDASetArea: initialize input data for title x.
- * It should be called for each user navigation request.
- ****************************************************************************/
-static int CDDASetArea( input_thread_t * p_input, input_area_t * p_area )
-{
- cdda_data_t *p_cdda = (cdda_data_t*)p_input->p_access_data;
- vlc_value_t val;
+ 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 );
- /* we can't use the interface slider until initilization is complete */
- p_input->stream.b_seekable = 0;
+ input_item_node_t *p_root = input_item_node_Create( p_current );
- if( p_area != p_input->stream.p_selected_area )
+ /* Build title table */
+ for( int i = 0; i < i_titles; i++ )
{
- /* Change the default area */
- p_input->stream.p_selected_area = p_area;
+ input_item_t *p_input_item;
+
+ char *psz_uri, *psz_opt, *psz_first, *psz_last;
+ char *psz_name;
+
+ 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 )
+ 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" */
+ if( asprintf( &psz_name, _("Audio CD - Track %02i"), (i+1) ) == -1 )
+ psz_name = NULL;
+
+ /* Create playlist items */
+ 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_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
+ /* Retreive CDDB informations */
+ if( p_disc )
+ {
+ cddb_track_t *t = cddb_disc_get_track( p_disc, i );
+ if( t != NULL )
+ {
+ psz_track_title = cddb_track_get_title( t );
+ psz_track_artist = cddb_track_get_artist( t );
+ }
+ }
+#endif
- /* Change the current track */
- p_cdda->i_track = p_area->i_id - 1;
- p_cdda->i_sector = p_cdda->p_sectors[p_cdda->i_track];
+ /* 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];
- /* 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 );
- }
+ 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 ) );
+ }
- p_cdda->i_sector = p_cdda->p_sectors[p_cdda->i_track];
+ /* */
+ ON_EMPTY( psz_track_artist, psz_artist );
+ ON_EMPTY( psz_track_genre, psz_genre );
+ ON_EMPTY( psz_track_description, psz_description );
- p_input->stream.p_selected_area->i_tell =
- (off_t)p_cdda->i_sector * (off_t)CDDA_DATA_SIZE
- - p_input->stream.p_selected_area->i_start;
+ /* */
+ if( NONEMPTY( psz_track_title ) )
+ {
+ input_item_SetName( p_input_item, psz_track_title );
+ input_item_SetTitle( p_input_item, psz_track_title );
+ }
- /* warn interface that something has changed */
- p_input->stream.b_seekable = 1;
- p_input->stream.b_changed = 1;
+ if( NONEMPTY( psz_track_artist ) )
+ input_item_SetArtist( p_input_item, psz_track_artist );
- return 0;
-}
+ 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 );
-/****************************************************************************
- * CDDASeek
- ****************************************************************************/
-static void CDDASeek( input_thread_t * p_input, off_t i_off )
-{
- cdda_data_t * p_cdda;
+ if( NONEMPTY( psz_album ) )
+ input_item_SetAlbum( p_input_item, psz_album );
- p_cdda = (cdda_data_t *) p_input->p_access_data;
+ if( NONEMPTY( psz_year ) )
+ input_item_SetDate( p_input_item, psz_year );
- p_cdda->i_sector = p_cdda->p_sectors[p_cdda->i_track]
- + i_off / (off_t)CDDA_DATA_SIZE;
+ char psz_num[3+1];
+ snprintf( psz_num, sizeof(psz_num), "%d", 1+i );
+ input_item_SetTrackNum( p_input_item, psz_num );
- vlc_mutex_lock( &p_input->stream.stream_lock );
- p_input->stream.p_selected_area->i_tell =
- (off_t)p_cdda->i_sector * (off_t)CDDA_DATA_SIZE
- - p_input->stream.p_selected_area->i_start;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-}
+ 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
-/****************************************************************************
- * Demux Part
- ****************************************************************************/
-static int CDDAOpenDemux ( vlc_object_t * p_this)
-{
- input_thread_t *p_input = (input_thread_t *)p_this;
- demux_sys_t *p_demux;
- WAVEFORMATEX *p_wf;
+ input_item_node_PostAndDelete( p_root );
- if( p_input->stream.i_method != INPUT_METHOD_CDDA )
+ /* */
+ for( int i = 0; i < i_cd_text; i++ )
{
- return VLC_EGENERIC;
+ vlc_meta_t *p_meta = pp_cd_text[i];
+ if( !p_meta )
+ continue;
+ vlc_meta_Delete( p_meta );
}
+ free( pp_cd_text );
- p_demux = malloc( sizeof( es_descriptor_t ) );
- p_demux->i_pts = 0;
- p_demux->p_es = NULL;
+#ifdef HAVE_LIBCDDB
+ if( p_disc )
+ cddb_disc_destroy( p_disc );
+#endif
+ return VLC_SUCCESS;
+}
- p_input->pf_demux = CDDADemux;
- p_input->pf_demux_control = demux_vaControlDefault;
- p_input->pf_rewind = NULL;
- p_input->p_demux_data = p_demux;
+#ifdef HAVE_LIBCDDB
+static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors )
+{
+ if( var_CreateGetInteger( p_access, "album-art" ) == ALBUM_ART_WHEN_ASKED )
+ return NULL;
- vlc_mutex_lock( &p_input->stream.stream_lock );
- if( input_AddProgram( p_input, 0, 0) == NULL )
+ /* */
+ cddb_conn_t *p_cddb = cddb_new();
+ if( !p_cddb )
{
- msg_Err( p_input, "cannot add program" );
- free( p_input->p_demux_data );
- return( -1 );
+ msg_Warn( p_access, "unable to use CDDB" );
+ return NULL;
}
- p_input->stream.pp_programs[0]->b_is_ok = 0;
- p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
-
- /* create our ES */
- p_demux->p_es = input_AddES( p_input,
- p_input->stream.p_selected_program,
- 1 /* id */, AUDIO_ES, NULL, 0 );
- if( !p_demux->p_es )
+
+ /* */
+ char *psz_tmp = var_InheritString( p_access, "cddb-server" );
+ if( psz_tmp )
{
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- msg_Err( p_input, "out of memory" );
- free( p_input->p_demux_data );
- return( -1 );
+ cddb_set_server_name( p_cddb, psz_tmp );
+ free( psz_tmp );
}
- p_demux->p_es->i_stream_id = 1;
- p_demux->p_es->i_fourcc = VLC_FOURCC('a','r','a','w');
-
- p_demux->p_es->p_waveformatex = p_wf = malloc( sizeof( WAVEFORMATEX ) );
- p_wf->wFormatTag = WAVE_FORMAT_PCM;
- p_wf->nChannels = 2;
- p_wf->nSamplesPerSec = 44100;
- p_wf->nAvgBytesPerSec = 2 * 44100 * 2;
- p_wf->nBlockAlign = 4;
- p_wf->wBitsPerSample = 16;
- p_wf->cbSize = 0;
-
- input_SelectES( p_input, p_demux->p_es );
- p_input->stream.p_selected_program->b_is_ok = 1;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ cddb_set_server_port( p_cddb, var_InheritInteger( p_access, "cddb-port" ) );
- return VLC_SUCCESS;
-}
+ cddb_set_email_address( p_cddb, "vlc@videolan.org" );
-static void CDDACloseDemux( vlc_object_t * p_this)
-{
- input_thread_t *p_input = (input_thread_t*)p_this;
- demux_sys_t *p_demux = (demux_sys_t*)p_input->p_demux_data;
+ /// \todo
+ cddb_cache_disable( p_cddb );
- free( p_demux );
- p_input->p_demux_data = NULL;
- return;
-}
+// cddb_cache_set_dir( p_cddb,
+// var_InheritString( p_access,
+// MODULE_STRING "-cddb-cachedir") );
-static int CDDADemux( input_thread_t * p_input )
-{
- demux_sys_t *p_demux = (demux_sys_t*)p_input->p_demux_data;
- ssize_t i_read;
- data_packet_t * p_data;
- pes_packet_t * p_pes;
+ cddb_set_timeout( p_cddb, 10 );
- input_ClockManageRef( p_input,
- p_input->stream.p_selected_program,
- p_demux->i_pts );
+ /// \todo
+ cddb_http_disable( p_cddb );
- if( ( i_read = input_SplitBuffer( p_input, &p_data, CDDA_DATA_SIZE ) )
- <= 0 )
+ /* */
+ cddb_disc_t *p_disc = cddb_disc_new();
+ if( !p_disc )
{
- return 0; // EOF
+ msg_Err( p_access, "unable to create CDDB disc structure." );
+ goto error;
}
- p_pes = input_NewPES( p_input->p_method_data );
-
- if( p_pes == NULL )
+ int64_t i_length = 0;
+ for( int i = 0; i < i_titles; i++ )
{
- msg_Err( p_input, "out of memory" );
- input_DeletePacket( p_input->p_method_data, p_data );
- return -1;
+ cddb_track_t *t = cddb_track_new();
+ 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 ;
}
- p_pes->i_rate = p_input->stream.control.i_rate;
- p_pes->p_first = p_pes->p_last = p_data;
- p_pes->i_nb_data = 1;
- p_pes->i_pes_size = i_read;
+ cddb_disc_set_length( p_disc, (int)(i_length/1000000) );
- p_pes->i_dts =
- p_pes->i_pts = input_ClockGetTS( p_input,
- p_input->stream.p_selected_program,
- p_demux->i_pts );
+ if( !cddb_disc_calc_discid( p_disc ) )
+ {
+ msg_Err( p_access, "CDDB disc ID calculation failed" );
+ goto error;
+ }
- if( p_demux->p_es->p_dec )
+ const int i_matches = cddb_query( p_cddb, p_disc );
+ if( i_matches < 0 )
{
- input_DecodePES( p_demux->p_es->p_dec, p_pes );
+ msg_Warn( p_access, "CDDB error: %s", cddb_error_str(errno) );
+ goto error;
}
- else
+ else if( i_matches == 0 )
{
- input_DeletePES( p_input->p_method_data, p_pes );
+ 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 );
- p_demux->i_pts += ((mtime_t)90000) * i_read
- / (mtime_t)44100 / 4 /* stereo 16 bits */;
- return 1;
+ cddb_destroy( p_cddb);
+ return p_disc;
+
+error:
+ if( p_disc )
+ cddb_disc_destroy( p_disc );
+ cddb_destroy( p_cddb );
+ return NULL;
}
+#endif /*HAVE_LIBCDDB*/
+