X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fcdda.c;h=1d6fe3cce4a096623d2972bac892026e599d62f8;hb=314d91aaf1fcd5807caf3be7ab2c7da78751f837;hp=5bddc08a2b292190c600d7b5c9c627393bd0880d;hpb=4fb633f74495deba6b5fe78fc7a3c5b74c583bb1;p=vlc diff --git a/modules/access/cdda.c b/modules/access/cdda.c index 5bddc08a2b..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 @@ -35,23 +35,23 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include #include #include #include #include #include -#include +#include /* ToLocaleDup */ #include /* For WAVEHEADER */ -#include "vcd/cdrom.h" +#include "vcd/cdrom.h" /* For CDDA_DATA_SIZE */ #ifdef HAVE_LIBCDDB -#include + #include + #include #endif -#include - /***************************************************************************** * Module descriptior *****************************************************************************/ @@ -64,7 +64,7 @@ static void Close( vlc_object_t * ); "value should be set in milliseconds." ) vlc_module_begin () - set_shortname( N_("Audio CD")) + set_shortname( N_("Audio CD") ) set_description( N_("Audio CD input") ) set_capability( "access", 10 ) set_category( CAT_INPUT ) @@ -74,22 +74,23 @@ vlc_module_begin () 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_internal () + change_volatile () add_integer( "cdda-first-sector", -1, NULL, NULL, NULL, true ) - change_internal () + change_volatile () 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" ) + 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 () @@ -106,11 +107,11 @@ 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; - bool b_header; + bool b_header; int i_track; int i_first_sector; @@ -118,7 +119,7 @@ struct access_sys_t }; 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, input_item_t *p_current ); @@ -134,23 +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_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 ) { free( psz_name ); return VLC_EGENERIC; } } - else psz_name = ToLocaleDup( p_access->psz_path ); + else psz_name = ToLocaleDup( p_access->psz_filepath ); #ifdef WIN32 if( psz_name[0] && psz_name[1] == ':' && @@ -158,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 ); @@ -171,14 +172,14 @@ 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" ) - 1; + p_sys->i_track = var_InheritInteger( p_access, "cdda-track" ) - 1; 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; + int i_ret = -1; if( p_input ) { input_item_t *p_current = input_GetItem( p_input ); @@ -210,10 +211,10 @@ 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 ) { @@ -321,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; @@ -337,22 +339,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" ) * INT64_C(1000); + *va_arg( args, int64_t * ) = + var_GetInteger( p_access, "cdda-caching" ) * INT64_C(1000); break; case ACCESS_SET_PAUSE_STATE: @@ -402,9 +400,10 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) /* 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 */ + /* Retreive CDDB information */ #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 ) { @@ -437,7 +436,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) } #endif - /* */ + /* CD-Text */ vlc_meta_t **pp_cd_text; int i_cd_text; @@ -448,7 +447,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) pp_cd_text = NULL; } - /* Retreive CD-TEXT informations but prefer CDDB */ + /* 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]; @@ -480,6 +479,8 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) 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( int i = 0; i < i_titles; i++ ) { @@ -491,7 +492,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) 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 ) + 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; @@ -521,7 +522,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) const char *psz_track_description = NULL; #ifdef HAVE_LIBCDDB - /* Retreive CDDB informations */ + /* Retreive CDDB information */ if( p_disc ) { cddb_track_t *t = cddb_disc_get_track( p_disc, i ); @@ -533,7 +534,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) } #endif - /* Retreive CD-TEXT informations but prefer CDDB */ + /* 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]; @@ -575,7 +576,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) 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 ); + 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 ); @@ -583,6 +584,8 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) #undef ON_EMPTY #undef NONEMPTY + input_item_node_PostAndDelete( p_root ); + /* */ for( int i = 0; i < i_cd_text; i++ ) { @@ -603,6 +606,9 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) #ifdef HAVE_LIBCDDB static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sectors ) { + if( var_InheritInteger( p_access, "album-art" ) == ALBUM_ART_WHEN_ASKED ) + return NULL; + /* */ cddb_conn_t *p_cddb = cddb_new(); if( !p_cddb ) @@ -612,11 +618,14 @@ static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sector } /* */ - char *psz_tmp = config_GetPsz( p_access, "cddb-server" ); - cddb_set_server_name( p_cddb, psz_tmp ); - free( psz_tmp ); + 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, config_GetInt( p_access, "cddb-port" ) ); + cddb_set_server_port( p_cddb, var_InheritInteger( p_access, "cddb-port" ) ); cddb_set_email_address( p_cddb, "vlc@videolan.org" ); @@ -624,13 +633,13 @@ static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sector 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); + cddb_http_disable( p_cddb ); /* */ cddb_disc_t *p_disc = cddb_disc_new(); @@ -660,14 +669,19 @@ static cddb_disc_t *GetCDDBInfo( access_t *p_access, int i_titles, int *p_sector } const int i_matches = cddb_query( p_cddb, p_disc ); - if( i_matches <= 0 ) + if( i_matches < 0 ) { - msg_Warn( p_access, "CDDB error: %s", cddb_error_str(errno)); + msg_Warn( p_access, "CDDB error: %s", cddb_error_str(errno) ); goto error; } - - if( i_matches > 1 ) + 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( p_cddb);