Skip to content

V
vlc
Commit cd077daf authored by Rocky Bernstein's avatar Rocky Bernstein
Browse files
Options

Fix some bugs when playlist not in disc but track mode: 

  play_item initialization accidently lost.
  Probably need a vlc_object release of the playlist.

Adjust comments which were wrong because of cut and paste artifacts.

Some changes that may help debugging. 

First attempt at playing via audio controls - mostly not working.
parent 17aa2b4e
Show whitespace changes
Inline Side-by-side
Showing with 229 additions and 30 deletions
modules/access/cdda/access.c
View file @ cd077daf
...@@ -61,6 +61,7 @@ access_t *p_cdda_input = NULL; ...@@ -61,6 +61,7 @@ access_t *p_cdda_input = NULL;
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
static int CDDARead( access_t *, uint8_t *, int );
static block_t *CDDAReadBlocks( access_t * p_access ); static block_t *CDDAReadBlocks( access_t * p_access );
static int CDDASeek( access_t * p_access, int64_t i_pos ); static int CDDASeek( access_t * p_access, int64_t i_pos );
static int CDDAControl( access_t *p_access, int i_query, static int CDDAControl( access_t *p_access, int i_query,
...@@ -73,7 +74,9 @@ static int CDDAInit( access_t *p_access, cdda_data_t *p_cdda ) ; ...@@ -73,7 +74,9 @@ static int CDDAInit( access_t *p_access, cdda_data_t *p_cdda ) ;
* Private functions * Private functions
****************************************************************************/ ****************************************************************************/
/* process messages that originate from libcdio. */ /* process messages that originate from libcdio.
called by CDDAOpen
*/
static void static void
cdio_log_handler (cdio_log_level_t level, const char message[]) cdio_log_handler (cdio_log_level_t level, const char message[])
{ {
...@@ -106,7 +109,7 @@ cdio_log_handler (cdio_log_level_t level, const char message[]) ...@@ -106,7 +109,7 @@ cdio_log_handler (cdio_log_level_t level, const char message[])
#ifdef HAVE_LIBCDDB #ifdef HAVE_LIBCDDB
/*! This routine is called by libcddb routines on error. /*! This routine is called by libcddb routines on error.
Setup is done by init_input_plugin. called by CDDAOpen
*/ */
static void static void
cddb_log_handler (cddb_log_level_t level, const char message[]) cddb_log_handler (cddb_log_level_t level, const char message[])
...@@ -126,7 +129,7 @@ cddb_log_handler (cddb_log_level_t level, const char message[]) ...@@ -126,7 +129,7 @@ cddb_log_handler (cddb_log_level_t level, const char message[])
#endif /*HAVE_LIBCDDB*/ #endif /*HAVE_LIBCDDB*/
/*! This routine is when xine is not fully set up (before full initialization) /*! This routine is when vlc is not fully set up (before full initialization)
or is not around (before finalization). or is not around (before finalization).
*/ */
static void static void
...@@ -163,6 +166,48 @@ uninit_log_handler (cdio_log_level_t level, const char message[]) ...@@ -163,6 +166,48 @@ uninit_log_handler (cdio_log_level_t level, const char message[])
/* gl_default_cdio_log_handler (level, message); */ /* gl_default_cdio_log_handler (level, message); */
} }
static int64_t
get_current_pos ( access_t *p_access )
{
cdda_data_t *p_cdda = (cdda_data_t *) p_access->p_sys;
lsn_t i_offset;
#if LIBCDIO_VERSION_NUM >= 73
if (p_cdda->b_audio_ctl)
{
cdio_subchannel_t sub;
CdIo_t *p_cdio = p_cdda->p_cdio;
if (DRIVER_OP_SUCCESS == cdio_audio_read_subchannel(p_cdio, &sub)) {
if (sub.audio_status == CDIO_MMC_READ_SUB_ST_PAUSED ||
sub.audio_status == CDIO_MMC_READ_SUB_ST_PLAY)
return CDIO_INVALID_LSN;
if ( ! p_cdda->b_nav_mode ) {
char *psz = cdio_msf_to_str(&sub.abs_addr);
// fprintf(stderr, "+++disk mode abs msf %s", psz);
free(psz);
i_offset = cdio_msf_to_lsn((&sub.abs_addr));
// fprintf(stderr, " frame offset %d\n", i_offset);
} else {
char *psz = cdio_msf_to_str(&sub.rel_addr);
// fprintf(stderr, "+++track abs msf %s", psz);
free(psz);
i_offset = cdio_msf_to_lsn((&sub.rel_addr));
// fprintf(stderr, " frame offset %d\n", i_offset);
}
} else {
// fprintf(stderr, "+++Error reading current pos\n");
i_offset = p_cdda->i_lsn;
}
} else
i_offset = p_cdda->i_lsn;
#else
i_offset = p_cdda->i_lsn;
;
#endif
return i_offset;
}
/***************************************************************************** /*****************************************************************************
* CDDAReadBlocks: reads a group of blocks from the CD-DA and returns * CDDAReadBlocks: reads a group of blocks from the CD-DA and returns
* an allocated pointer to the data. NULL is returned if no data * an allocated pointer to the data. NULL is returned if no data
...@@ -176,7 +221,7 @@ static block_t * CDDAReadBlocks( access_t * p_access ) ...@@ -176,7 +221,7 @@ static block_t * CDDAReadBlocks( access_t * p_access )
int i_blocks = p_cdda->i_blocks_per_read; int i_blocks = p_cdda->i_blocks_per_read;
dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_LSN), dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_LSN),
"called %d pos: %lld, size: %lld", "called i_lsn: %d i_pos: %lld, size: %lld",
p_cdda->i_lsn, p_access->info.i_pos, p_access->info.i_size); p_cdda->i_lsn, p_access->info.i_pos, p_access->info.i_size);
/* Check end of file */ /* Check end of file */
...@@ -197,11 +242,12 @@ static block_t * CDDAReadBlocks( access_t * p_access ) ...@@ -197,11 +242,12 @@ static block_t * CDDAReadBlocks( access_t * p_access )
{ {
if( p_cdda->i_track >= p_cdda->i_first_track + p_cdda->i_titles - 1 ) if( p_cdda->i_track >= p_cdda->i_first_track + p_cdda->i_titles - 1 )
{ {
dbg_print( (INPUT_DBG_LSN), "EOF");
p_access->info.b_eof = VLC_TRUE; p_access->info.b_eof = VLC_TRUE;
return NULL; return NULL;
} }
p_access->info.i_update |= INPUT_UPDATE_TITLE; p_access->info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_META;
p_access->info.i_title++; p_access->info.i_title++;
p_cdda->i_track++; p_cdda->i_track++;
...@@ -292,14 +338,107 @@ static block_t * CDDAReadBlocks( access_t * p_access ) ...@@ -292,14 +338,107 @@ static block_t * CDDAReadBlocks( access_t * p_access )
return p_block; return p_block;
} }
/*****************************************************************************
* CDDARead: Handler for audio control reads the CD-DA.
*****************************************************************************/
static int
CDDARead( access_t * p_access, uint8_t *p_buffer, int i_len )
{
cdda_data_t *p_cdda = (cdda_data_t *) p_access->p_sys;
dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_LSN),
"called lsn: %d pos: %lld, size: %lld",
p_cdda->i_lsn, p_access->info.i_pos, p_access->info.i_size);
/* Check end of file */
if( p_access->info.b_eof ) return 0;
{
lsn_t i_lsn = get_current_pos(p_access);
if (CDIO_INVALID_LSN == i_lsn) {
memset( p_buffer, 0, i_len );
return i_len;
}
p_cdda->i_lsn = i_lsn;
p_access->info.i_pos = p_cdda->i_lsn * CDIO_CD_FRAMESIZE_RAW;
}
dbg_print((INPUT_DBG_LSN), "updated lsn: %d", p_cdda->i_lsn);
/* Check end of track */
while( p_cdda->i_lsn > cdio_get_track_last_lsn(p_cdda->p_cdio,
p_cdda->i_track) )
{
if( p_cdda->i_track >= p_cdda->i_first_track + p_cdda->i_titles - 1 )
{
dbg_print( (INPUT_DBG_LSN), "EOF");
p_access->info.b_eof = VLC_TRUE;
return 0;
}
p_access->info.i_update |= INPUT_UPDATE_TITLE;
p_access->info.i_title++;
p_cdda->i_track++;
if ( p_cdda-> b_nav_mode ) {
char *psz_title = CDDAFormatTitle( p_access, p_cdda->i_track );
input_Control( p_cdda->p_input, INPUT_SET_NAME, psz_title );
free(psz_title);
} else {
p_access->info.i_size =
p_cdda->p_title[p_access->info.i_title]->i_size;
p_access->info.i_pos = 0;
p_access->info.i_update |= INPUT_UPDATE_SIZE;
}
}
memset( p_buffer, 0, i_len );
return i_len;
}
#if LIBCDIO_VERSION_NUM >= 73
/*! Pause CD playing via audio control */
static bool
cdda_audio_pause(CdIo_t *p_cdio)
{
bool b_ok = true;
cdio_subchannel_t sub;
if (DRIVER_OP_SUCCESS == cdio_audio_read_subchannel(p_cdio, &sub)) {
if (sub.audio_status == CDIO_MMC_READ_SUB_ST_PLAY) {
b_ok = DRIVER_OP_SUCCESS == cdio_audio_pause(p_cdio);
}
} else
b_ok = false;
return b_ok;
}
/*! play CD using audio controls */
static driver_return_code_t
cdda_audio_play(CdIo_t *p_cdio, lsn_t start_lsn, lsn_t end_lsn)
{
msf_t start_msf;
msf_t last_msf;
cdio_lsn_to_msf(start_lsn, &start_msf);
cdio_lsn_to_msf(end_lsn, &last_msf);
cdda_audio_pause(p_cdio);
return cdio_audio_play_msf (p_cdio, &start_msf, &last_msf);
}
#endif
/**************************************************************************** /****************************************************************************
* CDDASeek - change position for subsequent reads. For example, this * CDDASeek - change position for subsequent reads. For example, this
* can happen if the user moves a position slider bar in a GUI. * can happen if the user moves a position slider bar in a GUI.
****************************************************************************/ ****************************************************************************/
static int CDDASeek( access_t * p_access, int64_t i_pos ) static int
CDDASeek( access_t * p_access, int64_t i_pos )
{ {
cdda_data_t *p_cdda = (cdda_data_t *) p_access->p_sys; cdda_data_t *p_cdda = (cdda_data_t *) p_access->p_sys;
dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_SEEK),
"lsn %lu, offset: %lld",
(long unsigned int) p_cdda->i_lsn, i_pos );
p_cdda->i_lsn = (i_pos / CDIO_CD_FRAMESIZE_RAW); p_cdda->i_lsn = (i_pos / CDIO_CD_FRAMESIZE_RAW);
#if LIBCDIO_VERSION_NUM >= 72 #if LIBCDIO_VERSION_NUM >= 72
...@@ -307,6 +446,22 @@ static int CDDASeek( access_t * p_access, int64_t i_pos ) ...@@ -307,6 +446,22 @@ static int CDDASeek( access_t * p_access, int64_t i_pos )
cdio_paranoia_seek(p_cdda->paranoia, p_cdda->i_lsn, SEEK_SET); cdio_paranoia_seek(p_cdda->paranoia, p_cdda->i_lsn, SEEK_SET);
#endif #endif
#if LIBCDIO_VERSION_NUM >= 73
if ( p_cdda->b_audio_ctl ) {
track_t i_track = cdio_get_track(p_cdda->p_cdio, p_cdda->i_lsn);
lsn_t last_lsn;
if ( p_cdda->b_nav_mode )
last_lsn = p_cdda->i_lsn + cdio_get_track_sec_count(p_cdda->p_cdio,
i_track);
else
last_lsn = p_cdda->i_lsn +
cdio_get_track_lsn(p_cdda->p_cdio, CDIO_CDROM_LEADOUT_TRACK);
cdda_audio_play(p_cdda->p_cdio, p_cdda->i_lsn, last_lsn);
}
#endif
if ( ! p_cdda->b_nav_mode ) if ( ! p_cdda->b_nav_mode )
p_cdda->i_lsn += cdio_get_track_lsn(p_cdda->p_cdio, p_cdda->i_track); p_cdda->i_lsn += cdio_get_track_lsn(p_cdda->p_cdio, p_cdda->i_track);
...@@ -331,9 +486,6 @@ static int CDDASeek( access_t * p_access, int64_t i_pos ) ...@@ -331,9 +486,6 @@ static int CDDASeek( access_t * p_access, int64_t i_pos )
p_access->info.i_pos = i_pos; p_access->info.i_pos = i_pos;
dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_SEEK),
"lsn %lu, offset: %lld",
(long unsigned int) p_cdda->i_lsn, i_pos );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -398,19 +550,19 @@ CDDAOpen( vlc_object_t *p_this ) ...@@ -398,19 +550,19 @@ CDDAOpen( vlc_object_t *p_this )
if( !psz_source || !*psz_source ) if( !psz_source || !*psz_source )
{ {
/* Scan for a CD-ROM drive with a CD-DA in it. */ /* Scan for a CD-ROM drive with a CD-DA in it. */
char **cd_drives = char **ppsz_drives =
cdio_get_devices_with_cap(NULL, CDIO_FS_AUDIO, false); cdio_get_devices_with_cap(NULL, CDIO_FS_AUDIO, false);
if (NULL == cd_drives || NULL == cd_drives[0] ) if (NULL == ppsz_drives || NULL == ppsz_drives[0] )
{ {
msg_Err( p_access, msg_Err( p_access,
"libcdio couldn't find something with a CD-DA in it" ); "libcdio couldn't find something with a CD-DA in it" );
if (cd_drives) cdio_free_device_list(cd_drives); if (ppsz_drives) cdio_free_device_list(ppsz_drives);
return VLC_EGENERIC; return VLC_EGENERIC;
} }
psz_source = strdup(cd_drives[0]); psz_source = strdup(ppsz_drives[0]);
cdio_free_device_list(cd_drives); cdio_free_device_list(ppsz_drives);
} }
} }
...@@ -445,10 +597,16 @@ CDDAOpen( vlc_object_t *p_this ) ...@@ -445,10 +597,16 @@ CDDAOpen( vlc_object_t *p_this )
p_cdda->b_cdtext_prefer = p_cdda->b_cdtext_prefer =
config_GetInt( p_access, MODULE_STRING "-cdtext-prefer" ); config_GetInt( p_access, MODULE_STRING "-cdtext-prefer" );
#if LIBCDIO_VERSION_NUM >= 73
p_cdda->b_audio_ctl =
config_GetInt( p_access, MODULE_STRING "-analog-output" );
#endif
p_cdda->psz_source = strdup(psz_source); p_cdda->psz_source = strdup(psz_source);
p_cdda->b_header = VLC_FALSE; p_cdda->b_header = VLC_FALSE;
p_cdda->p_cdio = p_cdio; p_cdda->p_cdio = p_cdio;
p_cdda->i_tracks = 0; p_cdda->i_tracks = 0;
p_cdda->i_lsn = 0;
p_cdda->i_titles = 0; p_cdda->i_titles = 0;
p_cdda->i_track = i_track; p_cdda->i_track = i_track;
p_cdda->i_debug = config_GetInt(p_this, MODULE_STRING p_cdda->i_debug = config_GetInt(p_this, MODULE_STRING
...@@ -479,8 +637,16 @@ CDDAOpen( vlc_object_t *p_this ) ...@@ -479,8 +637,16 @@ CDDAOpen( vlc_object_t *p_this )
dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT), "%s", psz_source ); dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT), "%s", psz_source );
/* Set up p_access */ /* Set up p_access */
if (p_cdda->b_audio_ctl)
{
p_access->pf_read = CDDARead;
p_access->pf_block = NULL;
} else
{
p_access->pf_read = NULL; p_access->pf_read = NULL;
p_access->pf_block = CDDAReadBlocks; p_access->pf_block = CDDAReadBlocks;
}
p_access->pf_control = CDDAControl; p_access->pf_control = CDDAControl;
p_access->pf_seek = CDDASeek; p_access->pf_seek = CDDASeek;
...@@ -671,13 +837,24 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args ) ...@@ -671,13 +837,24 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
} }
case ACCESS_CAN_CONTROL_PACE: case ACCESS_CAN_CONTROL_PACE:
{
vlc_bool_t *pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
dbg_print( INPUT_DBG_META, "can control pace");
*pb_bool = p_cdda->b_audio_ctl ? VLC_FALSE : VLC_TRUE;
return VLC_SUCCESS;
}
case ACCESS_CAN_FASTSEEK: case ACCESS_CAN_FASTSEEK:
dbg_print( INPUT_DBG_META, "can fast seek");
goto common;
case ACCESS_CAN_SEEK: case ACCESS_CAN_SEEK:
dbg_print( INPUT_DBG_META, "can seek");
goto common;
case ACCESS_CAN_PAUSE: case ACCESS_CAN_PAUSE:
dbg_print( INPUT_DBG_META, "can pause");
common:
{ {
vlc_bool_t *pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); vlc_bool_t *pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
dbg_print( INPUT_DBG_META,
"can seek/fastseek/pause/control pace");
*pb_bool = VLC_TRUE; *pb_bool = VLC_TRUE;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -755,24 +932,24 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args ) ...@@ -755,24 +932,24 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
dbg_print( INPUT_DBG_EVENT, "set title %d", i ); dbg_print( INPUT_DBG_EVENT, "set title %d", i );
if( i != p_access->info.i_title ) if( i != p_access->info.i_title )
{ {
const track_t i_track = p_cdda->i_track + i;
/* Update info */ /* Update info */
p_access->info.i_title = i; p_access->info.i_title = i;
if ( p_cdda->b_nav_mode) if ( p_cdda->b_nav_mode)
{ {
lsn_t i_last_lsn; lsn_t i_last_lsn;
char *psz_title = char *psz_title = CDDAFormatTitle( p_access, i_track );
CDDAFormatTitle( p_access, i+1 );
input_Control( p_cdda->p_input, INPUT_SET_NAME, input_Control( p_cdda->p_input, INPUT_SET_NAME,
psz_title ); psz_title );
free(psz_title); free(psz_title);
p_cdda->i_track = p_cdda->i_first_track+i; p_cdda->i_track = i_track;
i_last_lsn = cdio_get_track_lsn(p_cdda->p_cdio, i_last_lsn = cdio_get_track_lsn(p_cdda->p_cdio,
CDIO_CDROM_LEADOUT_TRACK); CDIO_CDROM_LEADOUT_TRACK);
if (CDIO_INVALID_LSN != i_last_lsn) if (CDIO_INVALID_LSN != i_last_lsn)
p_access->info.i_size = (int64_t) CDIO_CD_FRAMESIZE_RAW p_access->info.i_size = (int64_t) CDIO_CD_FRAMESIZE_RAW
* i_last_lsn ; * i_last_lsn ;
p_access->info.i_pos = (int64_t) p_access->info.i_pos = (int64_t)
cdio_get_track_lsn( p_cdda->p_cdio, p_cdda->i_track ) cdio_get_track_lsn( p_cdda->p_cdio, i_track )
* CDIO_CD_FRAMESIZE_RAW; * CDIO_CD_FRAMESIZE_RAW;
} else { } else {
p_access->info.i_size = p_cdda->p_title[i]->i_size; p_access->info.i_size = p_cdda->p_title[i]->i_size;
...@@ -782,8 +959,7 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args ) ...@@ -782,8 +959,7 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
INPUT_UPDATE_TITLE | INPUT_UPDATE_SIZE; INPUT_UPDATE_TITLE | INPUT_UPDATE_SIZE;
/* Next sector to read */ /* Next sector to read */
p_cdda->i_lsn = p_cdda->i_lsn = cdio_get_track_lsn(p_cdda->p_cdio, i_track);
cdio_get_track_lsn(p_cdda->p_cdio, p_cdda->i_first_track+i);
} }
break; break;
} }
......
modules/access/cdda/cdda.c
View file @ cd077daf
...@@ -137,6 +137,13 @@ vlc_module_begin(); ...@@ -137,6 +137,13 @@ vlc_module_begin();
N_("Format to use in playlist \"title\" field when no CDDB"), N_("Format to use in playlist \"title\" field when no CDDB"),
TITLE_FMT_LONGTEXT, VLC_TRUE ); TITLE_FMT_LONGTEXT, VLC_TRUE );
#if LIBCDIO_VERSION_NUM >= 73
add_bool( MODULE_STRING "-analog-output", VLC_FALSE, NULL,
N_("Use CD audio controls and output?"),
N_("If set, audio controls and audio jack output are used"),
VLC_FALSE );
#endif
add_bool( MODULE_STRING "-cdtext-enabled", VLC_TRUE, CDTextEnabledCB, add_bool( MODULE_STRING "-cdtext-enabled", VLC_TRUE, CDTextEnabledCB,
N_("Do CD-Text lookups?"), N_("Do CD-Text lookups?"),
N_("If set, get CD-Text information"), N_("If set, get CD-Text information"),
......
modules/access/cdda/cdda.h
View file @ cd077daf
...@@ -24,6 +24,11 @@ ...@@ -24,6 +24,11 @@
#include <vlc/input.h> #include <vlc/input.h>
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/cdtext.h> #include <cdio/cdtext.h>
#if LIBCDIO_VERSION_NUM >= 73
#include <cdio/audio.h>
#include <cdio/mmc.h>
#endif
#include "vlc_meta.h" #include "vlc_meta.h"
#include "codecs.h" #include "codecs.h"
...@@ -31,6 +36,7 @@ ...@@ -31,6 +36,7 @@
#include <cddb/cddb.h> #include <cddb/cddb.h>
#endif #endif
#define CDDA_MRL_PREFIX "cddax://" #define CDDA_MRL_PREFIX "cddax://"
/* Frequency of sample in bits per second. */ /* Frequency of sample in bits per second. */
...@@ -115,6 +121,9 @@ typedef struct cdda_data_s ...@@ -115,6 +121,9 @@ typedef struct cdda_data_s
} cddb; } cddb;
#endif #endif
vlc_bool_t b_audio_ctl; /* Use CD-Text audio controls and
audio output? */
vlc_bool_t b_cdtext; /* Use CD-Text at all? If not, vlc_bool_t b_cdtext; /* Use CD-Text at all? If not,
cdtext_preferred is meaningless. */ cdtext_preferred is meaningless. */
vlc_bool_t b_cdtext_prefer; /* Prefer CD-Text info over vlc_bool_t b_cdtext_prefer; /* Prefer CD-Text info over
...@@ -128,7 +137,12 @@ typedef struct cdda_data_s ...@@ -128,7 +137,12 @@ typedef struct cdda_data_s
WAVEHEADER waveheader; /* Wave header for the output data */ WAVEHEADER waveheader; /* Wave header for the output data */
vlc_bool_t b_header; vlc_bool_t b_header;
vlc_bool_t b_nav_mode; vlc_bool_t b_nav_mode; /* If false we view the entire CD as
as a unit rather than each track
as a unit. If b_nav_mode then the
slider area represents the Disc rather
than a track
*/
input_thread_t *p_input; input_thread_t *p_input;
......
modules/access/cdda/info.c
View file @ cd077daf
/***************************************************************************** /*****************************************************************************
* info.c : CD digital audio input information routines * info.c : CD digital audio input information routines
***************************************************************************** *****************************************************************************
* Copyright (C) 2004 VideoLAN * Copyright (C) 2004, 2005 VideoLAN
* $Id: info.c 8845 2004-09-29 09:00:41Z rocky $ * $Id: info.c 8845 2004-09-29 09:00:41Z rocky $
* *
* Authors: Rocky Bernstein <rocky@panix.com> * Authors: Rocky Bernstein <rocky@panix.com>
...@@ -941,6 +941,9 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda, ...@@ -941,6 +941,9 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
if (p_playlist) { if (p_playlist) {
p_item = playlist_LockItemGetByInput( p_playlist,
((input_thread_t *)p_access->p_parent)->input.p_item );
if( p_item == p_playlist->status.p_item && !b_single_track ) if( p_item == p_playlist->status.p_item && !b_single_track )
{ {
b_play = VLC_TRUE; b_play = VLC_TRUE;
...@@ -984,7 +987,6 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda, ...@@ -984,7 +987,6 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
{ {
input_title_t *t; input_title_t *t;
if ( !p_cdda->b_nav_mode ) if ( !p_cdda->b_nav_mode )
playlist_ItemToNode( p_playlist, p_item ); playlist_ItemToNode( p_playlist, p_item );
...@@ -1028,9 +1030,9 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda, ...@@ -1028,9 +1030,9 @@ CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
p_playlist->status.i_view, p_playlist->status.i_view,
p_playlist->status.p_item, NULL ); p_playlist->status.p_item, NULL );
vlc_object_release( p_playlist );
} }
if (p_playlist) vlc_object_release( p_playlist );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
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