X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fcdda%2Fcdda.c;h=933fa20affae338fdbf767cbb73cf15237dbd768;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=1fd608d0fbe5c63bcfb8efc73a1370dd0c38a02d;hpb=c818ae899f1951fa1b123f82a6845f6816ed3163;p=vlc diff --git a/modules/access/cdda/cdda.c b/modules/access/cdda/cdda.c index 1fd608d0fb..933fa20aff 100644 --- a/modules/access/cdda/cdda.c +++ b/modules/access/cdda/cdda.c @@ -1,7 +1,7 @@ /***************************************************************************** * cdda.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 @@ -18,7 +18,7 @@ * * 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. *****************************************************************************/ /***************************************************************************** @@ -27,6 +27,7 @@ #include "callback.h" #include "access.h" +#include /***************************************************************************** * Module descriptor @@ -36,6 +37,12 @@ * Option help text *****************************************************************************/ +#if LIBCDIO_VERSION_NUM >= 72 +static const char *psz_paranoia_list[] = { "none", "overlap", "full" }; +static const char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"), + N_("full") }; +#endif + #define DEBUG_LONGTEXT N_( \ "This integer when viewed in binary is a debugging mask\n" \ "meta info 1\n" \ @@ -49,11 +56,11 @@ "libcddb (0x100) 256\n" ) #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for CDDA streams. This " \ + "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. " \ + "How many CD blocks to get on a single CD read. " \ "Generally on newer/faster CDs, 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.") @@ -90,6 +97,13 @@ " %t : The track title or MRL if no title\n" \ " %% : a % \n") +#define PARANOIA_TEXT N_("Enable CD paranoia?") +#define PARANOIA_LONGTEXT N_( \ + "Select whether to use CD Paranoia for jitter/error correction.\n" \ + "none: no paranoia - fastest.\n" \ + "overlap: do only overlap detection - not generally recommended.\n" \ + "full: complete jitter and error correction detection - slowest.\n" ) + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -98,7 +112,7 @@ vlc_module_begin(); add_usage_hint( N_("cddax://[device-or-file][@[T]track]") ); set_description( _("Compact Disc Digital Audio (CD-DA) input") ); set_capability( "access2", 10 /* compare with priority of cdda */ ); - set_shortname( N_("Audio CD")); + set_shortname( _("Audio Compact Disc")); set_callbacks( CDDAOpen, CDDAClose ); add_shortcut( "cddax" ); add_shortcut( "cd" ); @@ -107,7 +121,7 @@ vlc_module_begin(); /* Configuration options */ add_integer ( MODULE_STRING "-debug", 0, CDDADebugCB, - N_("If nonzero, this gives additional debug information."), + N_("Additional debug"), DEBUG_LONGTEXT, VLC_TRUE ); add_integer( MODULE_STRING "-caching", @@ -120,24 +134,51 @@ vlc_module_begin(); 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"), - TITLE_FMT_LONGTEXT, VLC_TRUE ); - add_string( MODULE_STRING "-title-format", "Track %T. %t", NULL, N_("Format to use in playlist \"title\" field when no CDDB"), 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, + N_("Do CD-Text lookups?"), + N_("If set, get CD-Text information"), + VLC_FALSE ); + + add_bool( MODULE_STRING "-navigation-mode", VLC_TRUE, +#if FIXED + CDDANavModeCB, +#else + NULL, +#endif + N_("Use Navigation-style playback?"), + N_("Tracks are navigated via Navagation rather than " + "a playlist entries"), + VLC_FALSE ); + +#if LIBCDIO_VERSION_NUM >= 72 + add_string( MODULE_STRING "-paranoia", NULL, NULL, + PARANOIA_TEXT, + PARANOIA_LONGTEXT, + VLC_FALSE ); + change_string_list( psz_paranoia_list, psz_paranoia_list_text, 0 ); +#endif /* LIBCDIO_VERSION_NUM >= 72 */ + #ifdef HAVE_LIBCDDB + set_section( N_("CDDB" ), 0 ); add_string( MODULE_STRING "-cddb-title-format", "Track %T. %t - %p %A", NULL, N_("Format to use in playlist \"title\" field when using CDDB"), CDDB_TITLE_FMT_LONGTEXT, VLC_TRUE ); - add_bool( MODULE_STRING "-cddb-enabled", 1, CDDBEnabledCB, - N_("Do CDDB lookups?"), + add_bool( MODULE_STRING "-cddb-enabled", VLC_TRUE, CDDBEnabledCB, + N_("CDDB lookups"), N_("If set, lookup CD-DA track information using the CDDB " "protocol"), VLC_FALSE ); @@ -145,7 +186,7 @@ vlc_module_begin(); 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"), @@ -155,7 +196,7 @@ vlc_module_begin(); 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", VLC_TRUE, NULL, N_("Cache CDDB lookups?"), @@ -177,30 +218,13 @@ vlc_module_begin(); 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, 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, CDTextEnabledCB, - N_("Do CD-Text lookups?"), - N_("If set, get CD-Text information"), - VLC_FALSE ); - - add_bool( MODULE_STRING "-navigation-mode", VLC_TRUE, -#if FIXED - CDDANavModeCB, -#else - NULL, -#endif - N_("Use Navigation-style playback?"), - N_("If set, tracks are navigated via Navagation rather than " - "a playlist entries"), + "to CDDB information when both are available"), VLC_FALSE ); +#endif /*HAVE_LIBCDDB*/ vlc_module_end();