Skip to content

V
vlc
Commit c19b89e2 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Small simplification in cdda.

parent 91d7a800
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
modules/access/cdda.c
View file @ c19b89e2
...@@ -436,16 +436,15 @@ static int GetTracks( access_t *p_access, input_item_t *p_current ) ...@@ -436,16 +436,15 @@ static int GetTracks( access_t *p_access, input_item_t *p_current )
psz_name = NULL; psz_name = NULL;
/* Create playlist items */ /* 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 ), p_input_item = input_item_NewWithType( VLC_OBJECT( p_access ),
psz_uri, psz_name, 0, NULL, 0, -1, psz_uri, psz_name, 0, NULL, 0, i_duration,
ITEM_TYPE_DISC ); ITEM_TYPE_DISC );
input_item_CopyOptions( p_current, p_input_item ); 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_first, VLC_INPUT_OPTION_TRUSTED );
input_item_AddOption( p_input_item, psz_last, 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 ); input_item_AddOption( p_input_item, psz_opt, VLC_INPUT_OPTION_TRUSTED );
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;
input_item_SetDuration( p_input_item, i_duration );
#ifdef HAVE_LIBCDDB #ifdef HAVE_LIBCDDB
/* If we have CDDB info, change the name */ /* If we have CDDB info, change the name */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment