/*****************************************************************************
* cddax.c : CD digital audio input module for vlc using libcdio
*****************************************************************************
- * Copyright (C) 2000,2003 VideoLAN
- * $Id: cdda.c,v 1.18 2004/02/14 17:36:05 gbazin Exp $
+ * Copyright (C) 2000, 2003, 2004 VideoLAN
+ * $Id$
*
* Authors: Rocky Bernstein <rocky@panix.com>
- * Laurent Aimar <fenrir@via.ecp.fr>
- * Gildas Bazin <gbazin@netcourrier.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
-
-/*****************************************************************************
- * prototypes
- *****************************************************************************/
-int E_(Open) ( vlc_object_t * );
-void E_(Close) ( vlc_object_t * );
-
-int E_(OpenIntf) ( vlc_object_t * );
-void E_(CloseIntf) ( vlc_object_t * );
-
-int E_(DebugCB) ( vlc_object_t *p_this, const char *psz_name,
- vlc_value_t oldval, vlc_value_t val,
- void *p_data );
-
-int E_(CDDBEnabledCB)( vlc_object_t *p_this, const char *psz_name,
- vlc_value_t oldval, vlc_value_t val,
- void *p_data );
+#include "callback.h"
+#include "access.h"
/*****************************************************************************
* Module descriptor
#define DEBUG_LONGTEXT N_( \
"This integer when viewed in binary is a debugging mask\n" \
- "meta info 1\n" \
- "events 2\n" \
- "MRL 4\n" \
- "external call 8\n" \
- "all calls (10) 16\n" \
- "LSN (20) 32\n" \
- "seek (40) 64\n" \
- "libcdio (80) 128\n" \
- "libcddb (100) 256\n" )
+ "meta info 1\n" \
+ "events 2\n" \
+ "MRL 4\n" \
+ "external call 8\n" \
+ "all calls (0x10) 16\n" \
+ "LSN (0x20) 32\n" \
+ "seek (0x40) 64\n" \
+ "libcdio (0x80) 128\n" \
+ "libcddb (0x100) 256\n" )
#define CACHING_LONGTEXT N_( \
"Allows you to modify the default caching value for CDDA streams. This " \
"value should be set in millisecond units." )
+#define BLOCKS_PER_READ_LONGTEXT N_( \
+ "Allows you to specify how many CD blocks to get on a single CD read. " \
+ "Generally on newer/faster CD's, this increases throughput at the " \
+ "expense of a little more memory usage and initial delay. SCSI-MMC " \
+ "limitations generally don't allow for more than 25 blocks per access.")
+
#define CDDB_TITLE_FMT_LONGTEXT N_( \
"Format used in the GUI Playlist Title. Similar to the Unix date \n" \
"Format specifiers that start with a percent sign. Specifiers are: \n" \
-" %a : The artist\n" \
+" %a : The artist (for the album)\n" \
" %A : The album information\n" \
" %C : Category\n" \
+" %e : The extended data (for a track)\n" \
" %I : CDDB disk ID\n" \
" %G : Genre\n" \
" %M : The current MRL\n" \
*****************************************************************************/
vlc_module_begin();
- add_usage_hint( N_("cddax://[device-or-file][@[T]num]") );
+ add_usage_hint( N_("cddax://[device-or-file][@[T]track]") );
set_description( _("Compact Disc Digital Audio (CD-DA) input") );
- set_capability( "access", 75 /* slightly higher than cdda */ );
- set_callbacks( E_(Open), E_(Close) );
- add_shortcut( "cdda" );
+ set_capability( "access2", 10 /* compare with priority of cdda */ );
+ set_callbacks( E_(CDDAOpen), E_(CDDAClose) );
add_shortcut( "cddax" );
+ add_shortcut( "cd" );
/* Configuration options */
- add_integer ( MODULE_STRING "-debug", 0, E_(DebugCB),
+ add_integer ( MODULE_STRING "-debug", 0, E_(CDDADebugCB),
N_("If nonzero, this gives additional debug information."),
DEBUG_LONGTEXT, VLC_TRUE );
add_integer( MODULE_STRING "-caching",
- DEFAULT_PTS_DELAY / 1000, NULL,
+ DEFAULT_PTS_DELAY / MILLISECONDS_PER_SEC, NULL,
N_("Caching value in microseconds"),
CACHING_LONGTEXT, VLC_TRUE );
+ add_integer( MODULE_STRING "-blocks-per-read",
+ DEFAULT_BLOCKS_PER_READ, E_(CDDABlocksPerReadCB),
+ N_("Number of blocks per CD read"),
+ BLOCKS_PER_READ_LONGTEXT, VLC_TRUE );
+
add_string( MODULE_STRING "-author-format",
"%A - %a %C %I", NULL,
N_("Format to use in playlist \"author\" field"),
add_string( MODULE_STRING "-cddb-server", "freedb.freedb.org", NULL,
N_("CDDB server"),
N_( "Contact this CDDB server look up CD-DA information"),
- VLC_TRUE );
+ VLC_TRUE );
add_integer( MODULE_STRING "-cddb-port", 8880, NULL,
N_("CDDB server port"),
add_string( MODULE_STRING "-cddb-email", "me@home", NULL,
N_("email address reported to CDDB server"),
N_("email address reported to CDDB server"),
- VLC_TRUE );
+ VLC_TRUE );
- add_bool( MODULE_STRING "-cddb-enable-cache", 1, NULL,
+ add_bool( MODULE_STRING "-cddb-enable-cache", VLC_TRUE, NULL,
N_("Cache CDDB lookups?"),
N_("If set cache CDDB information about this CD"),
VLC_FALSE );
- add_bool( MODULE_STRING "-cddb-httpd", 0, NULL,
+ add_bool( MODULE_STRING "-cddb-httpd", VLC_FALSE, NULL,
N_("Contact CDDB via the HTTP protocol?"),
N_("If set, the CDDB server gets information via the CDDB HTTP "
"protocol"),
add_string( MODULE_STRING "-cddb-cachedir", "~/.cddbslave", NULL,
N_("Directory to cache CDDB requests"),
N_("Directory to cache CDDB requests"),
- VLC_TRUE );
+ VLC_TRUE );
+
+ add_bool( MODULE_STRING "-cdtext-prefer", VLC_TRUE, E_(CDTextPreferCB),
+ N_("Prefer CD-Text info to CDDB info?"),
+ N_("If set, CD-Text information will be preferred "
+ "to CDDB information when both are available"),
+ VLC_FALSE );
#endif
+ add_bool( MODULE_STRING "-cdtext-enabled", VLC_TRUE, E_(CDTextEnabledCB),
+ N_("Do CD-Text lookups?"),
+ N_("If set, get CD-Text information"),
+ VLC_FALSE );
+
vlc_module_end();
projects / vlc / blobdiff