# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_access.h>
#include <vlc_meta.h>
#include <vlc_codecs.h> /* For WAVEHEADER */
#include "vcd/cdrom.h"
+#warning playlist code must not be used here.
#include <vlc_playlist.h>
#ifdef HAVE_LIBCDDB
"value should be set in milliseconds." )
vlc_module_begin();
- set_shortname( _("Audio CD"));
- set_description( _("Audio CD input") );
+ set_shortname( N_("Audio CD"));
+ set_description( N_("Audio CD input") );
set_capability( "access", 10 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
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, false );
+ p_item = playlist_ItemGetByInput( p_playlist, p_current, pl_Unlocked );
if( p_item )
i_ret = GetTracks( p_access, p_playlist, p_item );
msg_Dbg( p_playlist, "unable to find item in playlist");
vlc_object_release( p_input );
}
- vlc_object_release( p_playlist );
+ pl_Release( p_access );
}
if( i_ret < 0 )
goto error;
return VLC_EGENERIC;
}
- p_item_in_category = playlist_ItemToNode( p_playlist, p_parent, false );
+ 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 );
int i_ret = playlist_BothAddInput( p_playlist, p_input_item,
p_item_in_category,
PLAYLIST_APPEND, PLAYLIST_END, NULL, NULL,
- false );
+ pl_Unlocked );
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) );