/*****************************************************************************
- * cddax.c : CD digital audio input module for vlc using libcdio
+ * access.c : CD digital audio input module for vlc using libcdio
*****************************************************************************
- * Copyright (C) 2000, 2003, 2004 VideoLAN
+ * Copyright (C) 2000, 2003, 2004, 2005 the VideoLAN team
* $Id$
*
* Authors: Rocky Bernstein <rocky@panix.com>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
*****************************************************************************/
#include "callback.h" /* FIXME - reorganize callback.h, cdda.h better */
#include "cdda.h" /* private structures. Also #includes vlc things */
-#include <vlc_playlist.h> /* Has to come *after* cdda.h */
+#include "info.h" /* headers for meta info retrieval */
+#include "access.h"
#include "vlc_keys.h"
+#include <vlc_interface.h>
#include <cdio/cdio.h>
#include <cdio/logging.h>
#include <cdio/cd_types.h>
-#include <stdio.h>
/* #ifdef variables below are defined via config.h via #include vlc above. */
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-
-#define CDDA_MRL_PREFIX "cddax://"
-
-/* Frequency of sample in bits per second. */
-#define CDDA_FREQUENCY_SAMPLE 44100
-
/* FIXME: This variable is a hack. Would be nice to eliminate. */
access_t *p_cdda_input = NULL;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+static ssize_t CDDARead( access_t *, uint8_t *, size_t );
static block_t *CDDAReadBlocks( access_t * p_access );
static int CDDASeek( access_t * p_access, int64_t i_pos );
-static int CDDAControl( access_t *p_access, int i_query,
- va_list args );
-static void CDDAMetaInfo( access_t *p_access );
-static int CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
- const char *psz_source,
- vlc_bool_t b_single_track );
-static void CDDACreatePlaylistItem(const access_t *p_access,
- cdda_data_t *p_cdda,
- playlist_t *p_playlist,
- track_t i_track,
- char *psz_mrl, int psz_mrl_max,
- const char *psz_source,
- int playlist_operation,
- int i_pos);
-
-static int GetCDInfo( access_t *p_access, cdda_data_t *p_cdda ) ;
-
+static int CDDAControl( access_t *p_access, int i_query,
+ va_list args );
+static int CDDAInit( access_t *p_access, cdda_data_t *p_cdda ) ;
/****************************************************************************
* Private functions
****************************************************************************/
-/* process messages that originate from libcdio. */
+/* process messages that originate from libcdio.
+ called by CDDAOpen
+*/
static void
-cdio_log_handler (cdio_log_level_t level, const char message[])
+cdio_log_handler( cdio_log_level_t level, const char message[] )
{
- cdda_data_t *p_cdda = (cdda_data_t *)p_cdda_input->p_sys;
-
- if( p_cdda == NULL )
- return;
-
- switch (level) {
- case CDIO_LOG_DEBUG:
- case CDIO_LOG_INFO:
- if (p_cdda->i_debug & INPUT_DBG_CDIO)
- msg_Dbg( p_cdda_input, message);
- break;
- case CDIO_LOG_WARN:
- msg_Warn( p_cdda_input, message);
- break;
- case CDIO_LOG_ERROR:
- case CDIO_LOG_ASSERT:
- msg_Err( p_cdda_input, message);
- break;
- default:
- msg_Warn( p_cdda_input, message,
- "The above message had unknown cdio log level",
- level);
- }
- return;
-}
+ cdda_data_t *p_cdda = (cdda_data_t *)p_cdda_input->p_sys;
+ if( p_cdda == NULL )
+ return;
+
+ switch( level )
+ {
+ case CDIO_LOG_DEBUG:
+ case CDIO_LOG_INFO:
+ if (p_cdda->i_debug & INPUT_DBG_CDIO)
+ msg_Dbg( p_cdda_input, "%s", message);
+ break;
+ case CDIO_LOG_WARN:
+ msg_Warn( p_cdda_input, "%s", message);
+ break;
+ case CDIO_LOG_ERROR:
+ case CDIO_LOG_ASSERT:
+ msg_Err( p_cdda_input, "%s", message);
+ break;
+ default:
+ msg_Warn( p_cdda_input, "%s\n%s %d", message,
+ "the above message had unknown cdio log level",
+ level);
+ break;
+ }
+}
#ifdef HAVE_LIBCDDB
/*! This routine is called by libcddb routines on error.
- Setup is done by init_input_plugin.
+ called by CDDAOpen
*/
static void
-cddb_log_handler (cddb_log_level_t level, const char message[])
+cddb_log_handler( cddb_log_level_t level, const char message[] )
{
- cdda_data_t *p_cdda = (cdda_data_t *)p_cdda_input->p_sys;
- switch (level) {
- case CDDB_LOG_DEBUG:
- case CDDB_LOG_INFO:
- if (!(p_cdda->i_debug & INPUT_DBG_CDDB)) return;
- /* Fall through if to warn case */
- default:
- cdio_log_handler (level, message);
- }
+ cdda_data_t *p_cdda = (cdda_data_t *)p_cdda_input->p_sys;
+ switch( level )
+ {
+ case CDDB_LOG_DEBUG:
+ case CDDB_LOG_INFO:
+ if( !(p_cdda->i_debug & INPUT_DBG_CDDB) )
+ return;
+ /* Fall through if to warn case */
+ default:
+ cdio_log_handler( level, message );
+ break;
+ }
}
#endif /*HAVE_LIBCDDB*/
-/*! This routine is when xine is not fully set up (before full initialization)
- or is not around (before finalization).
+/*! This routine is when vlc is not fully set up (before full initialization)
+ or is not around (before finalization).
*/
static void
-uninit_log_handler (cdio_log_level_t level, const char message[])
+uninit_log_handler( cdio_log_level_t level, const char message[] )
{
- cdda_data_t *p_cdda = NULL;
-
- if (p_cdda_input)
- p_cdda = (cdda_data_t *)p_cdda_input->p_sys;
-
- switch (level) {
- case CDIO_LOG_DEBUG:
- case CDIO_LOG_INFO:
- if (!p_cdda || !(p_cdda->i_debug & (INPUT_DBG_CDIO|INPUT_DBG_CDDB)))
- return;
- /* Fall through if to warn case */
- case CDIO_LOG_WARN:
- fprintf(stderr, "WARN: %s\n", message);
- break;
- case CDIO_LOG_ERROR:
- fprintf(stderr, "ERROR: %s\n", message);
- break;
- case CDIO_LOG_ASSERT:
- fprintf(stderr, "ASSERT ERROR: %s\n", message);
- break;
- default:
- fprintf(stderr, "UNKNOWN ERROR: %s\n%s %d\n",
- message,
- "The above message had unknown cdio log level",
- level);
- }
-
- /* gl_default_cdio_log_handler (level, message); */
+ cdda_data_t *p_cdda = NULL;
+
+ if( p_cdda_input )
+ p_cdda = (cdda_data_t *)p_cdda_input->p_sys;
+
+ switch( level )
+ {
+ case CDIO_LOG_DEBUG:
+ case CDIO_LOG_INFO:
+ if( !p_cdda || !(p_cdda->i_debug & (INPUT_DBG_CDIO|INPUT_DBG_CDDB)) )
+ return;
+ /* Fall through if to warn case */
+ case CDIO_LOG_WARN:
+ fprintf( stderr, "WARN: %s\n", message );
+ break;
+ case CDIO_LOG_ERROR:
+ fprintf( stderr, "ERROR: %s\n", message );
+ break;
+ case CDIO_LOG_ASSERT:
+ fprintf( stderr, "ASSERT ERROR: %s\n", message );
+ break;
+ default:
+ fprintf( stderr, "UNKNOWN ERROR: %s\n%s %d\n", message,
+ "The above message had unknown cdio log level",
+ level );
+ break;
+ }
+ /* gl_default_cdio_log_handler (level, message); */
+}
+
+/* Only used in audio control mode. Gets the current LSN from the
+ CD-ROM drive. */
+static int64_t get_audio_position ( 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 )
+ {
+ i_offset = cdio_msf_to_lba( (&sub.abs_addr) );
+ }
+ else
+ {
+ i_offset = cdio_msf_to_lba( (&sub.rel_addr) );
+ }
+ }
+ else
+ {
+ i_offset = p_cdda->i_lsn;
+ }
+ }
+ else
+ {
+ i_offset = p_cdda->i_lsn;
+ }
+#else
+ i_offset = p_cdda->i_lsn;
+#endif
+ return i_offset;
}
/*****************************************************************************
* read. It is also possible if we haven't read a RIFF header in which
* case one that we creaded during Open/Initialization is returned.
*****************************************************************************/
-static block_t *
-CDDAReadBlocks( access_t * p_access )
+static block_t * CDDAReadBlocks( access_t * p_access )
{
block_t *p_block;
cdda_data_t *p_cdda = (cdda_data_t *) p_access->p_sys;
int i_blocks = p_cdda->i_blocks_per_read;
- dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_LSN), "called %d",
- p_cdda->i_lsn);
+ dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_LSN),
+ "called i_lsn: %d i_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 NULL;
+ if( p_access->info.b_eof )
+ return NULL;
if( !p_cdda->b_header )
{
/* Return only the dummy RIFF header we created in Open/Init */
p_block = block_New( p_access, sizeof( WAVEHEADER ) );
memcpy( p_block->p_buffer, &p_cdda->waveheader, sizeof(WAVEHEADER) );
- p_cdda->b_header = VLC_TRUE;
+ p_cdda->b_header = true;
return p_block;
}
/* Check end of track */
- while( p_cdda->i_lsn >= p_cdda->p_lsns[p_access->info.i_title + 1] )
+ while( p_cdda->i_lsn > cdio_get_track_last_lsn(p_cdda->p_cdio,
+ p_cdda->i_track) )
{
- if( p_access->info.i_title + 1 >= p_cdda->i_tracks )
+ bool go_on;
+
+ if( p_cdda->b_nav_mode )
+ go_on = p_cdda->i_lsn > p_cdda->last_disc_frame;
+ else
+ go_on = p_cdda->i_track >= p_cdda->i_first_track+p_cdda->i_titles-1 ;
+
+ if( go_on )
{
- p_access->info.b_eof = VLC_TRUE;
+ dbg_print( (INPUT_DBG_LSN), "EOF");
+ p_access->info.b_eof = true;
return NULL;
}
- p_access->info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_SIZE;
+ p_access->info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_META;
p_access->info.i_title++;
- p_access->info.i_size =
- p_cdda->p_title[p_access->info.i_title]->i_size;
- p_access->info.i_pos = 0;
- p_cdda->i_track++;
+ 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;
+ }
}
/* Possibly adjust i_blocks so we don't read past the end of a track. */
if( p_cdda->i_lsn + i_blocks >=
- p_cdda->p_lsns[p_access->info.i_title + 1] )
+ cdio_get_track_lsn(p_cdda->p_cdio, p_cdda->i_track+1) )
{
- i_blocks = p_cdda->p_lsns[p_access->info.i_title + 1 ] -
- p_cdda->i_lsn;
+ i_blocks = cdio_get_track_lsn( p_cdda->p_cdio, p_cdda->i_track+1 )
+ - p_cdda->i_lsn;
}
/* Do the actual reading */
p_block = block_New( p_access, i_blocks * CDIO_CD_FRAMESIZE_RAW );
if( !p_block)
{
- msg_Err( p_access, "Cannot get a new block of size: %i",
- i_blocks * CDIO_CD_FRAMESIZE_RAW );
- return NULL;
+ msg_Err( p_access, "cannot get a new block of size: %i",
+ i_blocks * CDIO_CD_FRAMESIZE_RAW );
+ intf_UserFatal( p_access, false, _("CD reading failed"),
+ _("VLC could not get a new block of size: %i."),
+ i_blocks * CDIO_CD_FRAMESIZE_RAW );
+ return NULL;
}
- if( cdio_read_audio_sectors( p_cdda->p_cdio, p_block->p_buffer,
- p_cdda->i_lsn, i_blocks) != 0 )
+ {
+#if LIBCDIO_VERSION_NUM >= 72
+ driver_return_code_t rc = DRIVER_OP_SUCCESS;
+
+ if( p_cdda->e_paranoia && p_cdda->paranoia )
{
- msg_Err( p_access, "could not read sector %lu",
- (long unsigned int) p_cdda->i_lsn );
- block_Release( p_block );
-
- /* If we had problems above, assume the problem is with
- the first sector of the read and set to skip it. In
- the future libcdio may have cdparanoia support.
- */
- p_cdda->i_lsn++;
- p_access->info.i_pos += CDIO_CD_FRAMESIZE_RAW;
- return NULL;
+ int i;
+ for( i = 0; i < i_blocks; i++ )
+ {
+ int16_t *p_readbuf = cdio_paranoia_read( p_cdda->paranoia, NULL );
+ char *psz_err = cdio_cddap_errors( p_cdda->paranoia_cd );
+ char *psz_mes = cdio_cddap_messages( p_cdda->paranoia_cd );
+
+ if( psz_mes || psz_err )
+ msg_Err( p_access, "%s%s\n", psz_mes ? psz_mes: "",
+ psz_err ? psz_err: "" );
+
+ free( psz_err );
+ free( psz_mes );
+ if( !p_readbuf )
+ {
+ msg_Err( p_access, "paranoia read error on frame %i\n",
+ p_cdda->i_lsn+i );
+ }
+ else
+ memcpy( p_block->p_buffer + i * CDIO_CD_FRAMESIZE_RAW,
+ p_readbuf, CDIO_CD_FRAMESIZE_RAW );
+ }
}
-
- p_cdda->i_lsn += i_blocks;
- p_access->info.i_pos += p_block->i_buffer;
-
- return p_block;
-}
-
-/****************************************************************************
- * CDDASeek - change position for subsequent reads. For example, this
- * can happen if the user moves a position slider bar in a GUI.
- ****************************************************************************/
-static int
-CDDASeek( access_t * p_access, int64_t i_pos )
-{
- cdda_data_t *p_cdda = (cdda_data_t *) p_access->p_sys;
+ else
+ {
+ rc = cdio_read_audio_sectors( p_cdda->p_cdio, p_block->p_buffer,
+ p_cdda->i_lsn, i_blocks );
+#else
+#define DRIVER_OP_SUCCESS 0
+ int rc;
+ rc = cdio_read_audio_sectors( p_cdda->p_cdio, p_block->p_buffer,
+ p_cdda->i_lsn, i_blocks);
+#endif
+ }
+ if( rc != DRIVER_OP_SUCCESS )
+ {
+ msg_Err( p_access, "could not read %d sectors starting from %lu",
+ i_blocks, (long unsigned int) p_cdda->i_lsn );
+ block_Release( p_block );
+
+ /* If we had problems above, assume the problem is with
+ the first sector of the read and set to skip it. In
+ the future libcdio may have cdparanoia support.
+ */
+ p_cdda->i_lsn++;
+ p_access->info.i_pos += CDIO_CD_FRAMESIZE_RAW;
+ return NULL;
+ }
+ }
- p_cdda->i_lsn = p_cdda->p_lsns[p_access->info.i_title]
- + (i_pos / CDIO_CD_FRAMESIZE_RAW);
- p_access->info.i_pos = i_pos;
+ p_cdda->i_lsn += i_blocks;
+ p_access->info.i_pos += i_blocks * CDIO_CD_FRAMESIZE_RAW;
- 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 p_block;
}
-#ifdef HAVE_LIBCDDB
-
-#define free_and_dup(var, val) \
- if (var) free(var); \
- if (val) var=strdup(val);
-
-
-static void
-GetCDDBInfo( access_t *p_access, cdda_data_t *p_cdda )
+/*****************************************************************************
+ * CDDARead: Handler for audio control reads the CD-DA.
+ *****************************************************************************/
+static ssize_t
+CDDARead( access_t * p_access, uint8_t *p_buffer, size_t i_len )
{
+ cdda_data_t *p_cdda = (cdda_data_t *) p_access->p_sys;
- dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT), "" );
-
- if (config_GetInt( p_access, MODULE_STRING "-cddb-enabled" )) {
- int i, i_matches;
- cddb_conn_t *conn = cddb_new();
- const CdIo *p_cdio = p_cdda->p_cdio;
-
-
- cddb_log_set_handler (uninit_log_handler);
-
- if (!conn) {
- msg_Warn( p_access, "Unable to initialize libcddb" );
- goto cddb_destroy;
- }
-
- cddb_set_email_address( conn,
- config_GetPsz( p_access,
- MODULE_STRING "-cddb-email") );
-
- cddb_set_server_name( conn,
- config_GetPsz( p_access,
- MODULE_STRING "-cddb-server") );
-
- cddb_set_server_port(conn,
- config_GetInt( p_access,
- MODULE_STRING "-cddb-port") );
-
- /* Set the location of the local CDDB cache directory.
- The default location of this directory is */
-
- if (!config_GetInt( p_access, MODULE_STRING "-cddb-enable-cache" ))
- cddb_cache_disable(conn);
-
- cddb_cache_set_dir(conn,
- config_GetPsz( p_access,
- MODULE_STRING "-cddb-cachedir") );
-
- cddb_set_timeout(conn,
- config_GetInt( p_access, MODULE_STRING "-cddb-timeout") );
-
-
- if (config_GetInt( p_access, MODULE_STRING "-cddb-httpd" )) {
- cddb_http_enable(conn);
- } else
- cddb_http_disable(conn);
-
- p_cdda->cddb.disc = cddb_disc_new();
- if (!p_cdda->cddb.disc) {
- msg_Err( p_access, "Unable to create CDDB disc structure." );
- goto cddb_end;
- }
-
- p_cdda->psz_mcn = cdio_get_mcn(p_cdio);
+ 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);
- for(i = 1; i <= p_cdda->i_tracks; i++) {
- cddb_track_t *t = cddb_track_new();
- t->frame_offset = cdio_get_track_lba(p_cdio, i);
- cddb_disc_add_track(p_cdda->cddb.disc, t);
- }
+ /* Check end of file */
+ if( p_access->info.b_eof )
+ return 0;
- p_cdda->cddb.disc->length =
- cdio_get_track_lba(p_cdio, CDIO_CDROM_LEADOUT_TRACK)
- / CDIO_CD_FRAMES_PER_SEC;
+ {
+ lsn_t i_lsn = get_audio_position(p_access);
+ if( CDIO_INVALID_LSN == i_lsn )
+ {
+ dbg_print( (INPUT_DBG_LSN), "invalid lsn" );
+ memset( p_buffer, 0, i_len );
+ return i_len;
+ }
- if (!cddb_disc_calc_discid(p_cdda->cddb.disc)) {
- msg_Err( p_access, "CDDB disc ID calculation failed" );
- goto cddb_destroy;
+ p_cdda->i_lsn = i_lsn;
+ p_access->info.i_pos = p_cdda->i_lsn * CDIO_CD_FRAMESIZE_RAW;
}
- i_matches = cddb_query(conn, p_cdda->cddb.disc);
- if (i_matches > 0) {
- if (i_matches > 1)
- msg_Warn( p_access, "Found %d matches in CDDB. Using first one.",
- i_matches);
- cddb_read(conn, p_cdda->cddb.disc);
+ dbg_print( (INPUT_DBG_LSN), "updated lsn: %d", p_cdda->i_lsn );
- if (p_cdda->i_debug & INPUT_DBG_CDDB)
- cddb_disc_print(p_cdda->cddb.disc);
+ /* 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 = true;
+ return 0;
+ }
+ p_access->info.i_update |= INPUT_UPDATE_TITLE;
+ p_access->info.i_title++;
+ p_cdda->i_track++;
- } else {
- msg_Warn( p_access, "CDDB error: %s", cddb_error_str(errno));
+ 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;
+ }
}
-
- cddb_destroy:
- cddb_destroy(conn);
- }
- cddb_end: ;
+ memset( p_buffer, 0, i_len );
+ return i_len;
}
-#endif /*HAVE_LIBCDDB*/
-#define add_meta_val(FIELD, VLC_META, VAL) \
- if ( p_cdda->p_meta && VAL) { \
- vlc_meta_Add( p_cdda->p_meta, VLC_META, VAL ); \
- dbg_print( INPUT_DBG_META, "field %s: %s\n", VLC_META, VAL ); \
- } \
-
-#define add_cddb_meta(FIELD, VLC_META) \
- add_meta_val(FIELD, VLC_META, p_cdda->cddb.disc->FIELD);
-
-#define add_cddb_meta_fmt(FIELD, FORMAT_SPEC, VLC_META) \
- { \
- char psz_buf[100]; \
- snprintf( psz_buf, sizeof(psz_buf)-1, FORMAT_SPEC, \
- p_cdda->cddb.disc->FIELD ); \
- psz_buf[sizeof(psz_buf)-1] = '\0'; \
- add_meta_val(FIELD, VLC_META, psz_buf); \
- }
-
-/*
- Gets and saves CDDA Meta Information. In the Control routine,
- we handle Meta Information requests and basically copy what we've
- saved here.
- */
-static void CDDAMetaInfo( access_t *p_access )
+/*! Pause CD playing via audio control */
+static bool cdda_audio_pause( CdIo_t *p_cdio )
{
- cdda_data_t *p_cdda = (cdda_data_t *) p_access->p_sys;
-
-#ifdef HAVE_LIBCDDB
- if ( p_cdda && p_cdda->i_cddb_enabled ) {
-
- GetCDDBInfo(p_access, p_cdda);
-
- if ( p_cdda->cddb.disc ) {
-
- p_cdda->p_meta = vlc_meta_New();
-
- add_cddb_meta(title, VLC_META_CDDB_TITLE);
- add_cddb_meta(artist, VLC_META_CDDB_ARTIST);
- add_cddb_meta(genre, VLC_META_CDDB_GENRE);
- add_cddb_meta(ext_data, VLC_META_CDDB_EXT_DATA);
-
- add_cddb_meta_fmt(year, "%d", VLC_META_CDDB_YEAR);
- add_cddb_meta_fmt(discid, "%x", VLC_META_CDDB_DISCID);
- }
- }
-
-#endif /*HAVE_LIBCDDB*/
-#define TITLE_MAX 30
-
-#if UPDATE_TRACK_INFORMATION_FINISHED
- {
- track_t i_track = p_cdda->i_tracks;
- char psz_buffer[MSTRTIME_MAX_SIZE];
- mtime_t i_duration =
- (p_cdda->p_lsns[i_track] - p_cdda->p_lsns[0])
- / CDIO_CD_FRAMES_PER_SEC;
-
- dbg_print( INPUT_DBG_META, "Duration %ld", (long int) i_duration );
- input_Control( p_access, INPUT_ADD_INFO, _("General"), _("Duration"), "%s",
- secstotimestr( psz_buffer, i_duration ) );
-
- for( i_track = 0 ; i_track < p_cdda->i_tracks ; i_track++ ) {
- char track_str[TITLE_MAX];
- mtime_t i_duration =
- (p_cdda->p_lsns[i_track+1] - p_cdda->p_lsns[i_track])
- / CDIO_CD_FRAMES_PER_SEC;
- snprintf(track_str, TITLE_MAX, "%s %02d", _("Track"), i_track+1);
- input_Control( p_access, INPUT_ADD_INFO, track_str, _("Duration"), "%s",
- secstotimestr( psz_buffer, i_duration ) );
+ bool b_ok = true;
+#if LIBCDIO_VERSION_NUM >= 73
+ cdio_subchannel_t sub;
-#ifdef HAVE_LIBCDDB
- if (p_cdda->i_cddb_enabled) {
- cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
- i_track);
- if (t != NULL) {
- if ( t->artist != NULL && strlen(t->artist) ) {
- input_Control( p_access, INPUT_ADD_INFO, track_str,
- _("Artist"), "%s", t->artist );
- }
- if ( t->title != NULL && strlen(t->title) ) {
- input_Control( p_access, INPUT_ADD_INFO, track_str,
- _("Title"), "%s", t->title );
- }
- if ( t->ext_data != NULL && strlen(t->ext_data) ) {
- input_Control( p_access, INPUT_ADD_INFO, track_str,
- _("Extended Data"), "%s", t->ext_data );
- }
+ 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);
}
- }
-#endif /*HAVE_LIBCDDB*/
}
- }
-#endif /* UPDATE_TRACK_INFORMATION_FINISHED */
+ else
+ b_ok = false;
+#endif
+ return b_ok;
}
-#define add_format_str_info(val) \
- { \
- const char *str = val; \
- unsigned int len; \
- if (val != NULL) { \
- len=strlen(str); \
- if (len != 0) { \
- strncat(tp, str, TEMP_STR_LEN-(tp-temp_str)); \
- tp += len; \
- } \
- saw_control_prefix = false; \
- } \
- }
-
-#define add_format_num_info(val, fmt) \
- { \
- char num_str[10]; \
- unsigned int len; \
- sprintf(num_str, fmt, val); \
- len=strlen(num_str); \
- if (len != 0) { \
- strncat(tp, num_str, TEMP_STR_LEN-(tp-temp_str)); \
- tp += len; \
- } \
- saw_control_prefix = false; \
- }
-
-/*!
- Take a format string and expand escape sequences, that is sequences that
- begin with %, with information from the current CD.
- The expanded string is returned. Here is a list of escape sequences:
-
- %a : The album artist **
- %A : The album information **
- %C : Category **
- %I : CDDB disk ID **
- %G : Genre **
- %M : The current MRL
- %m : The CD-DA Media Catalog Number (MCN)
- %n : The number of tracks on the CD
- %p : The artist/performer/composer in the track **
- %T : The track number **
- %s : Number of seconds in this track
- %t : The name **
- %Y : The year 19xx or 20xx **
- %% : a %
-*/
-static char *
-CDDAFormatStr( const access_t *p_access, cdda_data_t *p_cdda,
- const char format_str[], const char *mrl, int i_track)
+#if LIBCDIO_VERSION_NUM >= 73
+/*! 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 )
{
-#define TEMP_STR_SIZE 256
-#define TEMP_STR_LEN (TEMP_STR_SIZE-1)
- static char temp_str[TEMP_STR_SIZE];
- size_t i;
- char * tp = temp_str;
- vlc_bool_t saw_control_prefix = false;
- size_t format_len = strlen(format_str);
-
- memset(temp_str, 0, TEMP_STR_SIZE);
-
- for (i=0; i<format_len; i++) {
-
- if (!saw_control_prefix && format_str[i] != '%') {
- *tp++ = format_str[i];
- saw_control_prefix = false;
- continue;
- }
-
- switch(format_str[i]) {
- case '%':
- if (saw_control_prefix) {
- *tp++ = '%';
- }
- saw_control_prefix = !saw_control_prefix;
- break;
-#ifdef HAVE_LIBCDDB
- case 'a':
- if (!p_cdda->i_cddb_enabled) goto not_special;
- if (p_cdda->cddb.disc)
- add_format_str_info(p_cdda->cddb.disc->artist);
- break;
- case 'A':
- if (!p_cdda->i_cddb_enabled) goto not_special;
- if (p_cdda->cddb.disc)
- add_format_str_info(p_cdda->cddb.disc->title);
- break;
- case 'C':
- if (!p_cdda->i_cddb_enabled) goto not_special;
- if (p_cdda->cddb.disc)
- add_format_str_info(CDDB_CATEGORY[p_cdda->cddb.disc->category]);
- break;
- case 'G':
- if (!p_cdda->i_cddb_enabled) goto not_special;
- if (p_cdda->cddb.disc)
- add_format_str_info(p_cdda->cddb.disc->genre);
- break;
- case 'I':
- if (!p_cdda->i_cddb_enabled) goto not_special;
- if (p_cdda->cddb.disc)
- add_format_num_info(p_cdda->cddb.disc->discid, "%x");
- break;
- case 'Y':
- if (!p_cdda->i_cddb_enabled) goto not_special;
- if (p_cdda->cddb.disc)
- add_format_num_info(p_cdda->cddb.disc->year, "%5d");
- break;
- case 't':
- if (p_cdda && p_cdda->i_cddb_enabled && p_cdda->cddb.disc) {
- cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
- i_track-1);
- if (t != NULL && t->title != NULL)
- add_format_str_info(t->title);
- } else goto not_special;
- break;
- case 'p':
- if (p_cdda->i_cddb_enabled && p_cdda->cddb.disc) {
- cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
- i_track-1);
- if (t != NULL && t->artist != NULL)
- add_format_str_info(t->artist);
- } else goto not_special;
- break;
- case 'e':
- if (p_cdda->i_cddb_enabled && p_cdda->cddb.disc) {
- cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
- i_track-1);
- if (t != NULL && t->ext_data != NULL)
- add_format_str_info(t->ext_data);
- } else goto not_special;
- break;
-#endif
-
- case 'M':
- add_format_str_info(mrl);
- break;
-
- case 'm':
- add_format_str_info(p_cdda->psz_mcn);
- break;
-
- case 'n':
- add_format_num_info(p_cdda->i_tracks, "%d");
- break;
-
- case 's':
- if (p_cdda->i_cddb_enabled) {
- char psz_buffer[MSTRTIME_MAX_SIZE];
- mtime_t i_duration =
- (p_cdda->p_lsns[i_track] - p_cdda->p_lsns[i_track-1])
- / CDIO_CD_FRAMES_PER_SEC;
- add_format_str_info(secstotimestr( psz_buffer, i_duration ) );
- } else goto not_special;
- break;
-
- case 'T':
- add_format_num_info(i_track, "%02d");
- break;
-#ifdef HAVE_LIBCDDB
- not_special:
-#endif
- default:
- *tp++ = '%';
- *tp++ = format_str[i];
- saw_control_prefix = false;
- }
- }
- return strdup(temp_str);
+ 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
-static void
-CDDACreatePlaylistItem(const access_t *p_access, cdda_data_t *p_cdda,
- playlist_t *p_playlist, track_t i_track,
- char *psz_mrl, int psz_mrl_max,
- const char *psz_source, int playlist_operation,
- int i_pos)
+/****************************************************************************
+ * CDDASeek - change position for subsequent reads. For example, this
+ * can happen if the user moves a position slider bar in a GUI.
+ ****************************************************************************/
+static int CDDASeek( access_t * p_access, int64_t i_pos )
{
- mtime_t i_duration =
- (p_cdda->p_lsns[i_track] - p_cdda->p_lsns[i_track-1])
- * (1000000 / CDIO_CD_FRAMES_PER_SEC) ;
- char *p_author;
- char *p_title;
- char *config_varname = MODULE_STRING "-title-format";
- playlist_item_t *p_item;
-
-#ifdef HAVE_LIBCDDB
- if (p_cdda->i_cddb_enabled) {
- config_varname = MODULE_STRING "-cddb-title-format";
- }
-#endif /*HAVE_LIBCDDB*/
-
- snprintf(psz_mrl, psz_mrl_max, "%s%s@T%u",
- CDDA_MRL_PREFIX, psz_source, i_track);
-
- p_title = CDDAFormatStr(p_access, p_cdda,
- config_GetPsz( p_access, config_varname ),
- psz_mrl, i_track);
-
- dbg_print( INPUT_DBG_META, "mrl: %s, title: %s, duration, %ld, pos %d",
- psz_mrl, p_title, (long int) i_duration / 1000000 , i_pos );
- playlist_AddExt( p_playlist, psz_mrl, p_title, playlist_operation,
- i_pos, i_duration , NULL, 0);
+ cdda_data_t *p_cdda = (cdda_data_t *) p_access->p_sys;
- if( i_pos == PLAYLIST_END ) i_pos = p_playlist->i_size - 1;
+ dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT|INPUT_DBG_SEEK),
+ "lsn %lu, offset: %lld",
+ (long unsigned int) p_cdda->i_lsn, i_pos );
- vlc_mutex_lock( &p_playlist->object_lock );
- p_item = playlist_ItemGetByPos( p_playlist, i_pos );
- vlc_mutex_unlock( &p_playlist->object_lock );
- if( !p_item )
- return;
+ p_cdda->i_lsn = (i_pos / CDIO_CD_FRAMESIZE_RAW);
- vlc_mutex_lock( &p_item->input.lock );
+#if LIBCDIO_VERSION_NUM >= 72
+ if( p_cdda->e_paranoia && p_cdda->paranoia )
+ cdio_paranoia_seek( p_cdda->paranoia, p_cdda->i_lsn, SEEK_SET );
+#endif
- p_author =
- CDDAFormatStr( p_access, p_cdda,
- config_GetPsz( p_access, MODULE_STRING "-author-format" ),
- psz_mrl, i_track );
+#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 i_last_lsn;
- playlist_ItemAddInfo( p_item , _("General"),_("Author"), p_author);
+ if( p_cdda->b_nav_mode )
+ i_last_lsn = p_cdda->last_disc_frame;
+ else
+ i_last_lsn = cdio_get_track_last_lsn( p_cdda->p_cdio, i_track );
-#ifdef HAVE_LIBCDDB
- if (p_cdda->i_cddb_enabled) {
- const char *psz_general_cat = _("General");
-
- playlist_ItemAddInfo( p_item, psz_general_cat, _("Album"),
- "%s", p_cdda->cddb.disc->title);
- playlist_ItemAddInfo( p_item, psz_general_cat, _("Disc Artist(s)"),
- "%s", p_cdda->cddb.disc->artist);
- playlist_ItemAddInfo( p_item, psz_general_cat,
- _("CDDB Disc Category"),
- "%s", CDDB_CATEGORY[p_cdda->cddb.disc->category]);
- playlist_ItemAddInfo( p_item, psz_general_cat, _("Genre"),
- "%s", p_cdda->cddb.disc->genre);
- if ( p_cdda->cddb.disc->discid ) {
- playlist_ItemAddInfo( p_item, psz_general_cat, _("CDDB Disc ID"),
- "%x", p_cdda->cddb.disc->discid );
- }
- if (p_cdda->cddb.disc->year != 0) {
- playlist_ItemAddInfo( p_item, psz_general_cat,
- _("Year"), "%5d", p_cdda->cddb.disc->year );
+ cdda_audio_play( p_cdda->p_cdio, p_cdda->i_lsn, i_last_lsn );
}
+#endif
- if (p_cdda->i_cddb_enabled) {
- cddb_track_t *t=cddb_disc_get_track(p_cdda->cddb.disc,
- i_track-1);
- if (t != NULL && t->artist != NULL) {
- playlist_ItemAddInfo( p_item, psz_general_cat,
- _("Track Artist"), "%s", t->artist );
- playlist_ItemAddInfo( p_item , psz_general_cat,
- _("Track Title"), "%s", t->title );
- }
- }
+ if( ! p_cdda->b_nav_mode )
+ p_cdda->i_lsn += cdio_get_track_lsn( p_cdda->p_cdio, p_cdda->i_track );
- }
-#endif /*HAVE_LIBCDDB*/
+ /* Seeked backwards and we are doing disc mode. */
+ if( p_cdda->b_nav_mode && p_access->info.i_pos > i_pos )
+ {
+ track_t i_track;
+ char *psz_title;
+
+ for( i_track = p_cdda->i_track; i_track > 1 &&
+ p_cdda->i_lsn < cdio_get_track_lsn( p_cdda->p_cdio, i_track );
+ i_track--, p_access->info.i_title-- )
+ ;
+
+ p_cdda->i_track = i_track;
+ p_access->info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_META ;
+ psz_title = CDDAFormatTitle( p_access, p_cdda->i_track );
+ input_Control( p_cdda->p_input, INPUT_SET_NAME,
+ psz_title );
+ free( psz_title );
+ }
- vlc_mutex_unlock( &p_item->input.lock );
+ p_access->info.i_pos = i_pos;
+ p_access->info.b_eof = false;
+ return VLC_SUCCESS;
}
-static int
-CDDAFixupPlaylist( access_t *p_access, cdda_data_t *p_cdda,
- const char *psz_source, vlc_bool_t b_single_track )
+/*
+ Set up internal state so that we play a given track.
+ If we are using audio-ctl mode we also activate CD-ROM
+ to play.
+ */
+static bool cdda_play_track( access_t *p_access, track_t i_track )
{
- int i;
- playlist_t * p_playlist;
- char * psz_mrl;
- unsigned int psz_mrl_max = strlen(CDDA_MRL_PREFIX) + strlen(psz_source) +
- strlen("@T") + strlen("100") + 1;
-
-#ifdef HAVE_LIBCDDB
- p_cdda->i_cddb_enabled =
- config_GetInt( p_access, MODULE_STRING "-cddb-enabled" );
- if( b_single_track && !p_cdda->i_cddb_enabled ) return 0;
-#else
- if( b_single_track ) return VLC_SUCCESS;
-#endif
+ cdda_data_t *p_cdda = (cdda_data_t *) p_access->p_sys;
- psz_mrl = malloc( psz_mrl_max );
+ dbg_print( (INPUT_DBG_CALL), "called track: %d\n", i_track );
- if( psz_mrl == NULL )
+ if( i_track > p_cdda->i_tracks )
{
- msg_Warn( p_access, "out of memory" );
- return VLC_ENOMEM;
+ msg_Err( p_access, "CD has %d tracks, and you requested track %d",
+ p_cdda->i_tracks, i_track );
+ return false;
}
+ p_cdda->i_track = i_track;
- p_playlist = (playlist_t *) vlc_object_find( p_access, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !p_playlist )
- {
- msg_Warn( p_access, "can't find playlist" );
- free(psz_mrl);
- return VLC_EGENERIC;
- }
+ /* set up the frame boundaries for this particular track */
+ p_cdda->first_frame = p_cdda->i_lsn =
+ cdio_get_track_lsn( p_cdda->p_cdio, i_track );
- CDDAMetaInfo(p_access);
+ p_cdda->last_frame = cdio_get_track_lsn( p_cdda->p_cdio, i_track+1 ) - 1;
- if (b_single_track) {
- /* May fill out more information when the playlist user interface becomes
- more mature.
- */
- CDDACreatePlaylistItem(p_access, p_cdda, p_playlist, p_cdda->i_track,
- psz_mrl, psz_mrl_max, psz_source, PLAYLIST_REPLACE,
- p_playlist->i_index);
- } else {
-
- for( i = 1 ; i <= p_cdda->i_tracks ; i++ )
- {
- input_title_t *t = p_cdda->p_title[i-1] = vlc_input_title_New();
-
- asprintf( &t->psz_name, _("Track %i"), i );
- t->i_size = ( p_cdda->p_lsns[i] - p_cdda->p_lsns[i-1] ) *
- (int64_t)CDIO_CD_FRAMESIZE_RAW;
-
- t->i_length = I64C(1000000) * t->i_size / CDDA_FREQUENCY_SAMPLE / 4;
- CDDACreatePlaylistItem(p_access, p_cdda, p_playlist, i, psz_mrl,
- psz_mrl_max, psz_source, PLAYLIST_APPEND,
- PLAYLIST_END);
- }
- }
-
- return VLC_SUCCESS;
+#if LIBCDIO_VERSION_NUM >= 73
+ if( p_cdda->b_audio_ctl )
+ {
+ lsn_t i_last_lsn;
+ if( p_cdda->b_nav_mode )
+ i_last_lsn = p_cdda->last_disc_frame;
+ else
+ i_last_lsn = cdio_get_track_last_lsn( p_cdda->p_cdio, i_track );
+ cdda_audio_play( p_cdda->p_cdio, p_cdda->i_lsn, i_last_lsn );
+ }
+#endif
+ return true;
}
/****************************************************************************
****************************************************************************/
/*****************************************************************************
- * Open: open cdda device or image file and initialize structures
- * for subsequent operations.
+ * Open: open cdda device or image file and initialize structures
+ * for subsequent operations.
*****************************************************************************/
-int
-E_(CDDAOpen)( vlc_object_t *p_this )
+int CDDAOpen( vlc_object_t *p_this )
{
access_t *p_access = (access_t*)p_this;
char * psz_source = NULL;
- cdda_data_t *p_cdda;
- CdIo *p_cdio;
+ cdda_data_t *p_cdda = NULL;
+ CdIo_t *p_cdio;
track_t i_track = 1;
- vlc_bool_t b_single_track = false;
+ bool b_single_track = false;
int i_rc = VLC_EGENERIC;
p_access->p_sys = NULL;
p_cdda_input = p_access;
/* parse the options passed in command line : */
-
if( p_access->psz_path && *p_access->psz_path )
{
- char *psz_parser = psz_source = strdup( p_access->psz_path );
-
- while( *psz_parser && *psz_parser != '@' )
- {
- psz_parser++;
- }
-
- if( *psz_parser == '@' )
- {
- /* Found options */
- *psz_parser = '\0';
- ++psz_parser;
-
- if ('T' == *psz_parser || 't' == *psz_parser )
+ char *psz_parser = psz_source = strdup( p_access->psz_path );
+
+ while( *psz_parser && *psz_parser != '@' )
+ {
+ psz_parser++;
+ }
+
+ if( *psz_parser == '@' )
+ {
+ /* Found options */
+ *psz_parser = '\0';
++psz_parser;
-
- i_track = (int)strtol( psz_parser, NULL, 10 );
- i_track = i_track ? i_track : 1;
- b_single_track = true;
- }
- }
-
- if (!psz_source || !*psz_source)
- {
- /* No device/track given. Continue only when this plugin was
- selected */
- if( !p_this->b_force ) return VLC_EGENERIC;
- psz_source = var_CreateGetString( p_this, "cd-audio" );
+ if ('T' == *psz_parser || 't' == *psz_parser )
+ ++psz_parser;
- if( !psz_source || !*psz_source ) {
- /* Scan for a CD-ROM drive with a CD-DA in it. */
- char **cd_drives =
- cdio_get_devices_with_cap(NULL, CDIO_FS_AUDIO, false);
-
- if (NULL == cd_drives || NULL == cd_drives[0] ) {
- msg_Err( p_access,
- "libcdio couldn't find something with a CD-DA in it" );
- if (cd_drives) cdio_free_device_list(cd_drives);
- return VLC_EGENERIC;
- }
-
- psz_source = strdup(cd_drives[0]);
- cdio_free_device_list(cd_drives);
- }
+ i_track = (int)strtol( psz_parser, NULL, 10 );
+ i_track = i_track ? i_track : 1;
+ b_single_track = true;
+ }
}
- cdio_log_set_handler ( cdio_log_handler );
+ if( !psz_source || !*psz_source )
+ {
+ /* No device/track given. Continue only when this plugin was
+ selected */
+ if( !p_this->b_force )
+ return VLC_EGENERIC;
+
+ psz_source = var_CreateGetString( p_this, "cd-audio" );
+ if( !psz_source || !*psz_source )
+ {
+ free( psz_source );
+ /* Scan for a CD-ROM drive with a CD-DA in it. */
+ char **ppsz_drives =
+ cdio_get_devices_with_cap( NULL, CDIO_FS_AUDIO, false );
+
+ if( (NULL == ppsz_drives) || (NULL == ppsz_drives[0]) )
+ {
+ msg_Err( p_access,
+ "libcdio couldn't find something with a CD-DA in it" );
+ if( ppsz_drives )
+ cdio_free_device_list( ppsz_drives );
+ return VLC_EGENERIC;
+ }
+ psz_source = strdup( ppsz_drives[0] );
+ cdio_free_device_list( ppsz_drives );
+ }
+ }
+ cdio_log_set_handler( cdio_log_handler );
/* Open CDDA */
if( !(p_cdio = cdio_open( psz_source, DRIVER_UNKNOWN )) )
{
msg_Warn( p_access, "could not open %s", psz_source );
- goto error2;
+ free( psz_source );
+ return VLC_EGENERIC;
}
- p_cdda = malloc( sizeof(cdda_data_t) );
+ p_cdda = calloc( 1, sizeof(cdda_data_t) );
if( p_cdda == NULL )
{
- msg_Err( p_access, "out of memory" );
free( psz_source );
return VLC_ENOMEM;
}
- memset( p_cdda, 0, sizeof(cdda_data_t) );
#ifdef HAVE_LIBCDDB
cddb_log_set_handler ( cddb_log_handler );
p_cdda->cddb.disc = NULL;
- p_cdda->i_cddb_enabled =
- config_GetInt( p_access, MODULE_STRING "-cddb-enabled" );
+ p_cdda->b_cddb_enabled =
+ config_GetInt( p_access, MODULE_STRING "-cddb-enabled" );
+#endif
+ p_cdda->b_cdtext =
+ config_GetInt( p_access, MODULE_STRING "-cdtext-enabled" );
+ p_cdda->b_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->b_header = VLC_FALSE;
- p_cdda->p_cdio = p_cdio;
- p_cdda->i_track = i_track;
- p_cdda->i_debug = config_GetInt(p_this, MODULE_STRING "-debug");
- p_cdda->i_blocks_per_read
- = config_GetInt(p_this, MODULE_STRING "-blocks-per-read");
-
- if (0 == p_cdda->i_blocks_per_read)
- p_cdda->i_blocks_per_read = DEFAULT_BLOCKS_PER_READ;
-
- if ( p_cdda->i_blocks_per_read < MIN_BLOCKS_PER_READ
- || p_cdda->i_blocks_per_read > MAX_BLOCKS_PER_READ ) {
- msg_Warn( p_cdda_input,
- "Number of blocks (%d) has to be between %d and %d. "
- "Using %d.",
- p_cdda->i_blocks_per_read,
- MIN_BLOCKS_PER_READ, MAX_BLOCKS_PER_READ,
- DEFAULT_BLOCKS_PER_READ );
- p_cdda->i_blocks_per_read = DEFAULT_BLOCKS_PER_READ;
+ p_cdda->psz_source = strdup( psz_source );
+ p_cdda->b_header = false;
+ p_cdda->p_cdio = p_cdio;
+ p_cdda->i_tracks = 0;
+ p_cdda->i_titles = 0;
+ p_cdda->i_debug = config_GetInt( p_this, MODULE_STRING "-debug" );
+ p_cdda->b_nav_mode = config_GetInt(p_this, MODULE_STRING "-navigation-mode" );
+ p_cdda->i_blocks_per_read =
+ config_GetInt( p_this, MODULE_STRING "-blocks-per-read" );
+ p_cdda->last_disc_frame =
+ cdio_get_track_lsn( p_cdio, CDIO_CDROM_LEADOUT_TRACK );
+ p_cdda->p_input = vlc_object_find( p_access, VLC_OBJECT_INPUT,
+ FIND_PARENT );
+
+ if( 0 == p_cdda->i_blocks_per_read )
+ p_cdda->i_blocks_per_read = DEFAULT_BLOCKS_PER_READ;
+
+ if( (p_cdda->i_blocks_per_read < MIN_BLOCKS_PER_READ)
+ || (p_cdda->i_blocks_per_read > MAX_BLOCKS_PER_READ) )
+ {
+ msg_Warn( p_cdda_input,
+ "number of blocks (%d) has to be between %d and %d. "
+ "Using %d.",
+ p_cdda->i_blocks_per_read,
+ MIN_BLOCKS_PER_READ, MAX_BLOCKS_PER_READ,
+ DEFAULT_BLOCKS_PER_READ );
+ p_cdda->i_blocks_per_read = DEFAULT_BLOCKS_PER_READ;
}
-
dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT), "%s", psz_source );
/* Set up p_access */
- p_access->pf_read = NULL;
- p_access->pf_block = CDDAReadBlocks;
+ 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_block = CDDAReadBlocks;
+ }
+
p_access->pf_control = CDDAControl;
p_access->pf_seek = CDDASeek;
+ {
+ lsn_t i_last_lsn;
+
+ if( p_cdda->b_nav_mode )
+ i_last_lsn = p_cdda->last_disc_frame;
+ else
+ i_last_lsn = cdio_get_track_last_lsn( p_cdio, i_track );
+
+ if( CDIO_INVALID_LSN != i_last_lsn )
+ p_access->info.i_size = i_last_lsn * (uint64_t) CDIO_CD_FRAMESIZE_RAW;
+ else
+ p_access->info.i_size = 0;
+ }
+
p_access->info.i_update = 0;
- p_access->info.i_size = 0;
- p_access->info.i_pos = 0;
- p_access->info.b_eof = VLC_FALSE;
+ p_access->info.b_eof = false;
p_access->info.i_title = 0;
p_access->info.i_seekpoint = 0;
p_access->p_sys = (access_sys_t *) p_cdda;
/* We read the Table Of Content information */
- i_rc = GetCDInfo( p_access, p_cdda );
- if ( VLC_SUCCESS != i_rc ) goto error;
+ i_rc = CDDAInit( p_access, p_cdda );
+ if( VLC_SUCCESS != i_rc )
+ goto error;
+
+ cdda_play_track( p_access, i_track );
+ CDDAFixupPlaylist( p_access, p_cdda, b_single_track );
+
+#if LIBCDIO_VERSION_NUM >= 72
+ {
+ char *psz_paranoia = config_GetPsz( p_access,
+ MODULE_STRING "-paranoia" );
+
+ p_cdda->e_paranoia = PARANOIA_MODE_DISABLE;
+ if( psz_paranoia && *psz_paranoia )
+ {
+ if( !strncmp( psz_paranoia, "full", strlen("full") ) )
+ p_cdda->e_paranoia = PARANOIA_MODE_FULL;
+ else if( !strncmp(psz_paranoia, "overlap", strlen("overlap")) )
+ p_cdda->e_paranoia = PARANOIA_MODE_OVERLAP;
+
+ /* Use CD Paranoia? */
+ if( p_cdda->e_paranoia )
+ {
+ p_cdda->paranoia_cd =
+ cdio_cddap_identify_cdio( p_cdio, 1, NULL );
+ /* We'll set for verbose paranoia messages. */
+ cdio_cddap_verbose_set( p_cdda->paranoia_cd,
+ CDDA_MESSAGE_PRINTIT,
+ CDDA_MESSAGE_PRINTIT );
+ if ( 0 != cdio_cddap_open(p_cdda->paranoia_cd) )
+ {
+ msg_Warn( p_cdda_input, "unable to get paranoia support - "
+ "continuing without it." );
+ p_cdda->e_paranoia = PARANOIA_MODE_DISABLE;
+ }
+ else
+ {
+ p_cdda->paranoia = cdio_paranoia_init(p_cdda->paranoia_cd);
+ cdio_paranoia_seek( p_cdda->paranoia, p_cdda->i_lsn,
+ SEEK_SET);
+
+ /* Set reading mode for full or overlap paranoia,
+ * but allow skipping sectors. */
+ cdio_paranoia_modeset( p_cdda->paranoia,
+ PARANOIA_MODE_FULL == p_cdda->e_paranoia ?
+ PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP :
+ PARANOIA_MODE_OVERLAP^PARANOIA_MODE_NEVERSKIP );
+ }
+ }
+ }
+ free( psz_paranoia );
+ }
+#endif
- CDDAFixupPlaylist( p_access, p_cdda, psz_source, b_single_track );
-
- /* Build a WAV header to put in front of the output data.
+ /* Build a WAV header to put in front of the output data.
This gets sent back in the Block (read) routine.
*/
memset( &p_cdda->waveheader, 0, sizeof(WAVEHEADER) );
+
SetWLE( &p_cdda->waveheader.Format, 1 ); /*WAVE_FORMAT_PCM*/
SetWLE( &p_cdda->waveheader.BitsPerSample, 16);
+
p_cdda->waveheader.MainChunkID = VLC_FOURCC('R', 'I', 'F', 'F');
p_cdda->waveheader.Length = 0; /* we just don't know */
p_cdda->waveheader.ChunkTypeID = VLC_FOURCC('W', 'A', 'V', 'E');
p_cdda->waveheader.SubChunkID = VLC_FOURCC('f', 'm', 't', ' ');
+
SetDWLE( &p_cdda->waveheader.SubChunkLength, 16);
SetWLE( &p_cdda->waveheader.Modus, 2);
SetDWLE( &p_cdda->waveheader.SampleFreq, CDDA_FREQUENCY_SAMPLE);
SetWLE( &p_cdda->waveheader.BytesPerSample,
2 /*Modus*/ * 16 /*BitsPerSample*/ / 8 );
SetDWLE( &p_cdda->waveheader.BytesPerSec,
- 2*16/8 /*BytesPerSample*/ * CDDA_FREQUENCY_SAMPLE );
+ 2*16/8 /*BytesPerSample*/ * CDDA_FREQUENCY_SAMPLE );
+
p_cdda->waveheader.DataChunkID = VLC_FOURCC('d', 'a', 't', 'a');
p_cdda->waveheader.DataLength = 0; /* we just don't know */
/* PTS delay */
- var_Create( p_access, MODULE_STRING "-caching",
- VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
+ var_Create( p_access, MODULE_STRING "-caching",
+ VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
+ vlc_object_release( p_cdda->p_input );
return VLC_SUCCESS;
error:
cdio_destroy( p_cdda->p_cdio );
- free( p_cdda );
- error2:
free( psz_source );
+ if( p_cdda )
+ {
+ if ( p_cdda->p_input )
+ vlc_object_release( p_cdda->p_input );
+ free(p_cdda);
+ }
return i_rc;
-
}
/*****************************************************************************
* CDDAClose: closes cdda and frees any resources associded with it.
*****************************************************************************/
-void
-E_(CDDAClose)( vlc_object_t *p_this )
+void CDDAClose (vlc_object_t *p_this )
{
access_t *p_access = (access_t *) p_this;
cdda_data_t *p_cdda = (cdda_data_t *) p_access->p_sys;
track_t i;
+#if LIBCDIO_VERSION_NUM >= 73
+ if( p_cdda->b_audio_ctl )
+ cdio_audio_stop(p_cdda->p_cdio);
+#endif
+
dbg_print( (INPUT_DBG_CALL|INPUT_DBG_EXT), "" );
/* Remove playlist titles */
- for( i = 0; i < p_cdda->i_tracks; i++ )
+ for( i = 0; i < p_cdda->i_titles; i++ )
{
vlc_input_title_Delete( p_cdda->p_title[i] );
}
- cdio_destroy( p_cdda->p_cdio );
+#ifdef HAVE_LIBCDDB
+ cddb_log_set_handler( (cddb_log_handler_t) uninit_log_handler );
+ if( p_cdda->b_cddb_enabled )
+ cddb_disc_destroy( p_cdda->cddb.disc );
+#endif
- cdio_log_set_handler (uninit_log_handler);
+ cdio_destroy( p_cdda->p_cdio );
+ cdio_log_set_handler( uninit_log_handler );
-#ifdef HAVE_LIBCDDB
- cddb_log_set_handler (uninit_log_handler);
- if (p_cdda->i_cddb_enabled)
- cddb_disc_destroy(p_cdda->cddb.disc);
+#if LIBCDIO_VERSION_NUM >= 72
+ if( p_cdda->paranoia )
+ cdio_paranoia_free(p_cdda->paranoia);
+ if( p_cdda->paranoia_cd )
+ cdio_cddap_close_no_free_cdio( p_cdda->paranoia_cd );
#endif
- free( p_cdda->p_lsns );
- if (p_cdda->psz_mcn) free( p_cdda->psz_mcn );
+ free( p_cdda->psz_mcn );
+ free( p_cdda->psz_source );
+
+#if LIBCDDB_VERSION_NUM >= 1
+ libcddb_shutdown();
+#endif
free( p_cdda );
+ p_cdda = NULL;
p_cdda_input = NULL;
}
switch( i_query )
{
/* Pass back a copy of meta information that was gathered when we
- during the Open/Initialize call.
- */
+ during the Open/Initialize call.
+ */
case ACCESS_GET_META:
- {
- vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
- if ( p_cdda->p_meta ) {
- *pp_meta = vlc_meta_Duplicate( p_cdda->p_meta );
- dbg_print( INPUT_DBG_META, "%s", "Meta copied" );
- } else
- msg_Warn( p_access, "tried to copy NULL meta info" );
-
- return VLC_SUCCESS;
- }
- return VLC_EGENERIC;
+ {
+#if 0
+ vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
+ if( p_cdda->p_meta )
+ {
+ *pp_meta = vlc_meta_Duplicate( p_cdda->p_meta );
+ dbg_print( INPUT_DBG_META, "%s", "Meta copied" );
+ return VLC_SUCCESS;
+ }
+ else
+#endif
+ {
+ msg_Warn( p_access, "tried to copy NULL meta info" );
+ return VLC_EGENERIC;
+ }
+ }
+
+ case ACCESS_CAN_CONTROL_PACE:
+ {
+ bool *pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = p_cdda->b_audio_ctl ? false : true;
+ dbg_print( INPUT_DBG_META, "can control pace? %d", *pb_bool);
+ return VLC_SUCCESS;
+ }
- case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
+ dbg_print( INPUT_DBG_META, "can fast seek?");
+ goto common;
+ case ACCESS_CAN_SEEK:
+ dbg_print( INPUT_DBG_META, "can seek?");
+ goto common;
case ACCESS_CAN_PAUSE:
- case ACCESS_CAN_CONTROL_PACE:
- {
- vlc_bool_t *pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
- *pb_bool = VLC_TRUE;
- break;
- }
+ dbg_print( INPUT_DBG_META, "can pause?");
+ common:
+ {
+ bool *pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = true;
+ return VLC_SUCCESS;
+ }
/* */
case ACCESS_GET_MTU:
+ {
pi_int = (int*)va_arg( args, int * );
*pi_int = p_cdda-> i_blocks_per_read * CDIO_CD_FRAMESIZE_RAW;
+ dbg_print( INPUT_DBG_META, "Get MTU %d", *pi_int);
break;
+ }
case ACCESS_GET_PTS_DELAY:
- {
- int64_t *pi_64 = (int64_t*)va_arg( args, int64_t * );
+ {
+ int64_t *pi_64 = (int64_t*)va_arg( args, int64_t * );
*pi_64 = var_GetInteger( p_access, MODULE_STRING "-caching" )
- * MILLISECONDS_PER_SEC;
- break;
- }
-
- /* */
- case ACCESS_SET_PAUSE_STATE:
+ * MILLISECONDS_PER_SEC;
break;
+ }
case ACCESS_GET_TITLE_INFO:
- { input_title_t ***ppp_title;
- ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
+ {
+ input_title_t ***ppp_title =
+ (input_title_t***)va_arg( args, input_title_t*** );
+
pi_int = (int*)va_arg( args, int* );
- *((int*)va_arg( args, int* )) = 1; /* Title offset */
+ *((int*)va_arg( args, int* )) = 1; /* Title offset */
- /* Duplicate track info */
- *pi_int = p_cdda->i_tracks;
- *ppp_title = malloc(sizeof( input_title_t **) * p_cdda->i_tracks );
+ dbg_print ( INPUT_DBG_EVENT,
+ "GET TITLE: i_tracks %d, i_tracks %d",
+ p_cdda->i_tracks, p_cdda->i_tracks );
- if (!*ppp_title) return VLC_ENOMEM;
+ CDDAMetaInfo( p_access, CDIO_INVALID_TRACK );
- for( i = 0; i < p_cdda->i_tracks; i++ )
+ if( p_cdda->b_nav_mode)
{
- if ( p_cdda->p_title[i] )
- (*ppp_title)[i] =
- vlc_input_title_Duplicate( p_cdda->p_title[i] );
+ char *psz_title = CDDAFormatTitle( p_access, p_cdda->i_track );
+ input_Control( p_cdda->p_input, INPUT_SET_NAME, psz_title );
+ free(psz_title);
}
- }
- break;
+
+ /* Duplicate title info */
+ if( p_cdda->i_titles == 0 )
+ {
+ *pi_int = 0; ppp_title = NULL;
+ return VLC_SUCCESS;
+ }
+ *pi_int = p_cdda->i_titles;
+ *ppp_title = calloc(1, sizeof( input_title_t **)
+ * p_cdda->i_titles );
+
+ if (!*ppp_title)
+ return VLC_ENOMEM;
+
+ for( i = 0; i < p_cdda->i_titles; i++ )
+ {
+ if ( p_cdda->p_title[i] )
+ {
+ (*ppp_title)[i] =
+ vlc_input_title_Duplicate( p_cdda->p_title[i] );
+ }
+ }
+ break;
+ }
case ACCESS_SET_TITLE:
+ {
i = (int)va_arg( args, int );
+
+ dbg_print( INPUT_DBG_EVENT, "set title %d", i );
if( i != p_access->info.i_title )
{
+ const track_t i_track = p_cdda->i_first_track + i;
/* Update info */
- p_access->info.i_update |=
- INPUT_UPDATE_TITLE|INPUT_UPDATE_SIZE;
p_access->info.i_title = i;
- p_access->info.i_size = p_cdda->p_title[i]->i_size;
- p_access->info.i_pos = 0;
+ if( p_cdda->b_nav_mode)
+ {
+ lsn_t i_last_lsn;
+ char *psz_title = CDDAFormatTitle( p_access, i_track );
+ input_Control( p_cdda->p_input, INPUT_SET_NAME,
+ psz_title );
+ free( psz_title );
+ p_cdda->i_track = i_track;
+ i_last_lsn = cdio_get_track_lsn( p_cdda->p_cdio,
+ CDIO_CDROM_LEADOUT_TRACK );
+ if( CDIO_INVALID_LSN != i_last_lsn )
+ p_access->info.i_size = (int64_t) CDIO_CD_FRAMESIZE_RAW
+ * i_last_lsn ;
+ p_access->info.i_pos = (int64_t)
+ cdio_get_track_lsn( p_cdda->p_cdio, i_track )
+ * CDIO_CD_FRAMESIZE_RAW;
+ }
+ else
+ {
+ p_access->info.i_size = p_cdda->p_title[i]->i_size;
+ p_access->info.i_pos = 0;
+ }
+ p_access->info.i_update = INPUT_UPDATE_TITLE|INPUT_UPDATE_SIZE;
/* Next sector to read */
- p_cdda->i_lsn = p_cdda->p_lsns[i];
+ p_cdda->i_lsn = cdio_get_track_lsn( p_cdda->p_cdio, i_track );
}
break;
+ }
+
+ case ACCESS_SET_PAUSE_STATE:
+ dbg_print( INPUT_DBG_META, "Pause");
+ if( p_cdda->b_audio_ctl )
+ cdda_audio_pause( p_cdda->p_cdio );
+ break;
case ACCESS_SET_SEEKPOINT:
+ dbg_print( INPUT_DBG_META, "set seekpoint");
+ return VLC_EGENERIC;
+
case ACCESS_SET_PRIVATE_ID_STATE:
+ dbg_print( INPUT_DBG_META, "set private id state");
return VLC_EGENERIC;
+
default:
- msg_Warn( p_access, "unimplemented query in control" );
+ msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
}
/*****************************************************************************
- GetCDInfo:
+ CDDAInit:
Initialize information pertaining to the CD: the number of tracks,
first track number, LSNs for each track and the leadout. The leadout
We return the VLC-type status, e.g. VLC_SUCCESS, VLC_ENOMEM, etc.
*****************************************************************************/
-static int
-GetCDInfo( access_t *p_access, cdda_data_t *p_cdda )
+static int CDDAInit( access_t *p_access, cdda_data_t *p_cdda )
{
- track_t i;
discmode_t discmode = CDIO_DISC_MODE_NO_INFO;
- p_cdda->i_tracks = cdio_get_num_tracks(p_cdda->p_cdio);
- p_cdda->i_first_track = cdio_get_first_track_num(p_cdda->p_cdio);
-
- discmode = cdio_get_discmode(p_cdda->p_cdio);
- switch(discmode) {
- case CDIO_DISC_MODE_CD_DA:
- case CDIO_DISC_MODE_CD_MIXED:
- /* These are possible for CD-DA */
- break;
- default:
- /* These are not possible for CD-DA */
- msg_Err( p_access,
- "Disc seems not to be CD-DA. libcdio reports it is %s",
- discmode2str[discmode]
- );
- return VLC_EGENERIC;
- }
-
- p_cdda->p_lsns = malloc( (p_cdda->i_tracks + 1) * sizeof(lsn_t) );
-
- if( p_cdda->p_lsns == NULL )
- {
- msg_Err( p_access, "out of memory" );
- return VLC_ENOMEM;
- }
-
+ p_cdda->i_tracks = cdio_get_num_tracks( p_cdda->p_cdio );
+ p_cdda->i_first_track = cdio_get_first_track_num( p_cdda->p_cdio );
- /* Fill the p_lsns structure with the track/sector matches.
- Note cdio_get_track_lsn when given num_tracks + 1 will return
- the leadout LSN.
- */
- for( i = 0 ; i <= p_cdda->i_tracks ; i++ )
- {
- (p_cdda->p_lsns)[ i ] =
- cdio_get_track_lsn(p_cdda->p_cdio, p_cdda->i_first_track+i);
- }
+ discmode = cdio_get_discmode( p_cdda->p_cdio );
+ switch( discmode )
+ {
+ case CDIO_DISC_MODE_CD_DA:
+ case CDIO_DISC_MODE_CD_MIXED:
+ /* These are possible for CD-DA */
+ break;
+ default:
+ /* These are not possible for CD-DA */
+ msg_Err( p_access,
+ "Disc seems not to be CD-DA. libcdio reports it is %s",
+ discmode2str[discmode]
+ );
+ return VLC_EGENERIC;
+ }
/* Set reading start LSN. */
- p_cdda->i_lsn = p_cdda->p_lsns[p_cdda->i_track - p_cdda->i_first_track];
+ p_cdda->i_lsn = cdio_get_track_lsn(p_cdda->p_cdio, p_cdda->i_track);
return VLC_SUCCESS;
}
+
+/*
+ * Local variables:
+ * mode: C
+ * style: gnu
+ * End:
+ */
projects / vlc / blobdiff