/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include "codecs.h"
-#include "vcd/cdrom.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>
-#include <vlc_playlist.h>
+#include <vlc_codecs.h> /* For WAVEHEADER */
+#include "vcd/cdrom.h"
#ifdef HAVE_LIBCDDB
#include <cddb/cddb.h>
"Default caching value for Audio CDs. This " \
"value should be set in milliseconds." )
-vlc_module_begin();
- set_shortname( _("Audio CD"));
- set_description( _("Audio CD input") );
- set_capability( "access2", 10 );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACCESS );
- set_callbacks( Open, Close );
+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_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, VLC_TRUE );
- change_internal();
- add_integer( "cdda-first-sector", -1, NULL, NULL, NULL, VLC_TRUE );
- change_internal();
- add_integer( "cdda-last-sector", -1, NULL, NULL, NULL, VLC_TRUE );
- change_internal();
+ 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." ),
- VLC_TRUE );
+ true )
add_integer( "cddb-port", 8880, NULL,
N_( "CDDB port" ), N_( "CDDB Server port to use." ),
- VLC_TRUE );
- add_shortcut( "cdda" );
- add_shortcut( "cddasimple" );
-vlc_module_end();
+ true )
+ add_shortcut( "cdda" )
+ add_shortcut( "cddasimple" )
+vlc_module_end ()
/* how many blocks VCDRead will read in each loop */
/* Wave header for the output data */
WAVEHEADER waveheader;
- vlc_bool_t b_header;
+ bool b_header;
int i_track;
int i_first_sector;
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 );
+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 );
vcddev_t *vcddev;
char *psz_name;
int i_mrl_tracknum = -1;
-
- input_thread_t *p_input;
- playlist_item_t *p_item = NULL;
- playlist_t *p_playlist = NULL;
int i_ret;
if( !p_access->psz_path || !*p_access->psz_path )
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] == ':' &&
STANDARD_BLOCK_ACCESS_INIT
p_sys->vcddev = vcddev;
- /* We only do separate items if the whole disc is requested -
- * Dirty hack we access some private data ! */
- p_input = (input_thread_t *)( p_access->p_parent );
-
/* Do we play a single track ? */
p_sys->i_track = var_CreateGetInteger( p_access, "cdda-track" );
if( p_sys->i_track < 0 && i_mrl_tracknum <= 0 )
{
- p_playlist = (playlist_t *) vlc_object_find( p_access,
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- if( !p_playlist ) return VLC_EGENERIC;
-
- if( p_playlist->status.p_item->p_input ==
- ((input_thread_t *)p_access->p_parent)->input.p_item )
- p_item = p_playlist->status.p_item;
- else
+ /* 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 );
+
+ i_ret = -1;
+ if( p_input )
{
- input_item_t *p_current = ( (input_thread_t*)p_access->p_parent)->
- input.p_item;
- p_item = playlist_LockItemGetByInput( p_playlist, p_current );
+ input_item_t *p_current = input_GetItem( p_input );
+ if( p_current )
+ i_ret = GetTracks( p_access, p_current );
- if( !p_item )
- {
- msg_Dbg( p_playlist, "unable to find item in playlist");
- return -1;
- }
+ vlc_object_release( p_input );
}
-
- i_ret = GetTracks( p_access, p_playlist, p_item );
-
- if( p_playlist ) vlc_object_release( p_playlist );
- if( i_ret < 0 ) goto error;
+ if( i_ret < 0 )
+ goto error;
}
else
{
error:
ioctl_Close( VLC_OBJECT(p_access), p_sys->vcddev );
free( p_sys );
- if( p_playlist ) vlc_object_release( p_playlist );
return VLC_EGENERIC;
}
int i_blocks = CDDA_BLOCKS_ONCE;
block_t *p_block;
- if( p_sys->i_track < 0 ) p_access->info.b_eof = VLC_TRUE;
+ if( p_sys->i_track < 0 ) p_access->info.b_eof = true;
/* Check end of file */
if( p_access->info.b_eof ) return NULL;
/* 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;
}
if( p_sys->i_sector >= p_sys->i_last_sector )
{
- p_access->info.b_eof = VLC_TRUE;
+ p_access->info.b_eof = true;
return NULL;
}
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
{
- vlc_bool_t *pb_bool;
- int *pi_int;
- int64_t *pi_64;
+ bool *pb_bool;
+ int64_t *pi_64;
switch( i_query )
{
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;
- break;
-
- case ACCESS_GET_MTU:
- pi_int = (int*)va_arg( args, int * );
- *pi_int = CDDA_DATA_ONCE;
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_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;
+ *pi_64 = 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;
}
-static int GetTracks( access_t *p_access,
- playlist_t *p_playlist, playlist_item_t *p_parent )
+static int GetTracks( access_t *p_access, input_item_t *p_current )
{
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 )
+
+ const int 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" );
+ 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;;
}
- else if( i_titles <= 0 )
- {
- msg_Err( p_access, "no audio tracks found" );
- return VLC_EGENERIC;
- }
- p_item_in_category = playlist_LockItemToNode( p_playlist, p_parent );
- psz_name = strdup( "Audio CD" );
- vlc_mutex_lock( &p_playlist->object_lock );
- playlist_ItemSetName( p_parent, psz_name );
- vlc_mutex_unlock( &p_playlist->object_lock );
- var_SetInteger( p_playlist, "item-change", p_parent->p_input->i_id );
- free( psz_name );
+ input_item_SetName( p_current, "Audio CD" );
#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 ) )
- {
- asprintf( &psz_name, "%s", cddb_disc_get_title( p_sys->p_disc ) );
- vlc_mutex_lock( &p_playlist->object_lock );
- playlist_ItemSetName( p_parent, psz_name );
- vlc_mutex_unlock( &p_playlist->object_lock );
- var_SetInteger( p_playlist, "item-change",
- p_parent->p_input->i_id );
- free( psz_name );
- }
+ const char *psz_name = cddb_disc_get_title( p_sys->p_disc );
+ if( psz_name && *psz_name )
+ input_item_SetName( p_current, psz_name );
}
#endif
/* Build title table */
- for( i = 0; i < i_titles; i++ )
+ for( int 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;
+ input_item_t *p_input_item;
- 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 );
+ char *psz_uri, *psz_opt, *psz_first, *psz_last;
+ char *psz_name;
- 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] );
+ msg_Dbg( p_access, "track[%d] start=%d", 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 */);
+ /* */
+ 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" */
- sprintf( psz_name, _("Audio CD - Track %i"), (i+1) );
+ if( asprintf( &psz_name, _("Audio CD - Track %02i"), (i+1) ) == -1 )
+ psz_name = NULL;
/* Create playlist items */
- p_input_item = input_ItemNewWithType( VLC_OBJECT( p_playlist ),
- psz_uri, psz_name, 0, NULL, -1,
+ 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 );
- vlc_input_item_AddOption( p_input_item, psz_first );
- vlc_input_item_AddOption( p_input_item, psz_last );
- vlc_input_item_AddOption( p_input_item, psz_opt );
+ 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 );
#ifdef HAVE_LIBCDDB
/* If we have CDDB info, change the name */
if( p_sys->p_disc )
{
- char *psz_result;
cddb_track_t *t = cddb_disc_get_track( p_sys->p_disc, i );
- if( t!= NULL )
+ if( t != NULL )
{
- if( cddb_track_get_title( t ) != NULL )
- {
- vlc_input_item_AddInfo( p_input_item, _(VLC_META_INFO_CAT),
- _(VLC_META_TITLE),
- cddb_track_get_title( t ) );
- if( p_input_item->psz_name )
- free( p_input_item->psz_name );
- asprintf( &p_input_item->psz_name, "%s",
- cddb_track_get_title( t ) );
- }
- psz_result = cddb_track_get_artist( t );
- if( psz_result )
+ const char *psz_title = cddb_track_get_title( t );
+ const char *psz_artist = cddb_track_get_artist( t );
+
+ if( psz_title )
{
- vlc_input_item_AddInfo( p_input_item, _(VLC_META_INFO_CAT),
- _(VLC_META_ARTIST), psz_result );
+ 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 );
}
}
#endif
- playlist_AddWhereverNeeded( p_playlist, p_input_item, p_parent,
- p_item_in_category, VLC_FALSE, PLAYLIST_APPEND );
+ 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 );
}
goto cddb_destroy;
}
+ char* psz_tmp = config_GetPsz( p_access, "cddb-server" );
cddb_set_email_address( p_cddb, "vlc@videolan.org" );
- cddb_set_server_name( p_cddb, 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 );
/// \todo
cddb_cache_disable( p_cddb );
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 += I64C(1000000) * i_size / 44100 / 4 ;
+ i_length += INT64_C(1000000) * i_size / 44100 / 4 ;
}
cddb_disc_set_length( p_access->p_sys->p_disc, (int)(i_length/1000000) );
projects / vlc / blobdiff