#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include <assert.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
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 ()
+ change_volatile ()
#ifdef HAVE_LIBCDDB
add_string( "cddb-server", "freedb.freedb.org", NULL, N_( "CDDB Server" ),
};
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 );
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" );
if( !psz_name || !*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] == ':' &&
/****************************************************************************
* 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;
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++ )
{
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 );
#undef ON_EMPTY
#undef NONEMPTY
+ input_item_node_PostAndDelete( p_root );
+
/* */
for( int i = 0; i < i_cd_text; i++ )
{
}
/* */
- 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" );
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 );