X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fcdda%2Fcdda.c;h=9bbcc29217205ba76af48b789db6e5d6f600658c;hb=4d76391166a752c9405f1bc96447a1a91be5996c;hp=ab3d4fa4e7912cbe717f292910678e780877b084;hpb=a21fa2255e8a6cf288fe3ecc5c779428ec3585dc;p=vlc diff --git a/modules/access/cdda/cdda.c b/modules/access/cdda/cdda.c index ab3d4fa4e7..9bbcc29217 100644 --- a/modules/access/cdda/cdda.c +++ b/modules/access/cdda/cdda.c @@ -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. *****************************************************************************/ /***************************************************************************** @@ -28,6 +28,7 @@ #include "callback.h" #include "access.h" #include +#include /***************************************************************************** * Module descriptor @@ -38,9 +39,9 @@ *****************************************************************************/ #if LIBCDIO_VERSION_NUM >= 72 -static char *psz_paranoia_list[] = { "none", "overlap", "full" }; -static char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"), - N_("full") }; +static const char *const psz_paranoia_list[] = { "none", "overlap", "full" }; +static const char *const psz_paranoia_list_text[] = { N_("none"), N_("overlap"), + N_("full") }; #endif #define DEBUG_LONGTEXT N_( \ @@ -56,11 +57,11 @@ static char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"), "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.") @@ -110,8 +111,8 @@ static char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"), 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_description( N_("Compact Disc Digital Audio (CD-DA) input") ); + set_capability( "access", 10 /* compare with priority of cdda */ ); set_shortname( N_("Audio Compact Disc")); set_callbacks( CDDAOpen, CDDAClose ); add_shortcut( "cddax" ); @@ -121,52 +122,52 @@ vlc_module_begin(); /* Configuration options */ add_integer ( MODULE_STRING "-debug", 0, CDDADebugCB, - N_("If nonzero, this gives additional debug information."), - DEBUG_LONGTEXT, VLC_TRUE ); + N_("Additional debug"), + DEBUG_LONGTEXT, true ); add_integer( MODULE_STRING "-caching", DEFAULT_PTS_DELAY / MILLISECONDS_PER_SEC, NULL, N_("Caching value in microseconds"), - CACHING_LONGTEXT, VLC_TRUE ); + CACHING_LONGTEXT, true ); add_integer( MODULE_STRING "-blocks-per-read", DEFAULT_BLOCKS_PER_READ, CDDABlocksPerReadCB, N_("Number of blocks per CD read"), - BLOCKS_PER_READ_LONGTEXT, VLC_TRUE ); + BLOCKS_PER_READ_LONGTEXT, 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 ); + TITLE_FMT_LONGTEXT, true ); #if LIBCDIO_VERSION_NUM >= 73 - add_bool( MODULE_STRING "-analog-output", VLC_FALSE, NULL, + add_bool( MODULE_STRING "-analog-output", false, NULL, N_("Use CD audio controls and output?"), N_("If set, audio controls and audio jack output are used"), - VLC_FALSE ); + false ); #endif - add_bool( MODULE_STRING "-cdtext-enabled", VLC_TRUE, CDTextEnabledCB, + add_bool( MODULE_STRING "-cdtext-enabled", true, CDTextEnabledCB, N_("Do CD-Text lookups?"), N_("If set, get CD-Text information"), - VLC_FALSE ); + false ); - add_bool( MODULE_STRING "-navigation-mode", VLC_TRUE, + add_bool( MODULE_STRING "-navigation-mode", true, #if FIXED - CDDANavModeCB, + CDDANavModeCB, #else - NULL, + NULL, #endif N_("Use Navigation-style playback?"), - N_("If set, tracks are navigated via Navagation rather than " - "a playlist entries"), - VLC_FALSE ); + N_("Tracks are navigated via Navagation rather than " + "a playlist entries"), + false ); #if LIBCDIO_VERSION_NUM >= 72 add_string( MODULE_STRING "-paranoia", NULL, NULL, - PARANOIA_TEXT, - PARANOIA_LONGTEXT, - VLC_FALSE ); + PARANOIA_TEXT, + PARANOIA_LONGTEXT, + false ); change_string_list( psz_paranoia_list, psz_paranoia_list_text, 0 ); #endif /* LIBCDIO_VERSION_NUM >= 72 */ @@ -175,56 +176,56 @@ vlc_module_begin(); 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 ); + CDDB_TITLE_FMT_LONGTEXT, true ); - add_bool( MODULE_STRING "-cddb-enabled", VLC_TRUE, CDDBEnabledCB, - N_("Do CDDB lookups?"), + add_bool( MODULE_STRING "-cddb-enabled", true, CDDBEnabledCB, + N_("CDDB lookups"), N_("If set, lookup CD-DA track information using the CDDB " "protocol"), - VLC_FALSE ); + false ); 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 ); + true ); add_integer( MODULE_STRING "-cddb-port", 8880, NULL, N_("CDDB server port"), N_("CDDB server uses this port number to communicate on"), - VLC_TRUE ); + true ); 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 ); + true ); - add_bool( MODULE_STRING "-cddb-enable-cache", VLC_TRUE, NULL, + add_bool( MODULE_STRING "-cddb-enable-cache", true, NULL, N_("Cache CDDB lookups?"), N_("If set cache CDDB information about this CD"), - VLC_FALSE ); + false ); - add_bool( MODULE_STRING "-cddb-httpd", VLC_FALSE, NULL, + add_bool( MODULE_STRING "-cddb-httpd", false, NULL, N_("Contact CDDB via the HTTP protocol?"), N_("If set, the CDDB server gets information via the CDDB HTTP " "protocol"), - VLC_TRUE ); + true ); add_integer( MODULE_STRING "-cddb-timeout", 10, NULL, N_("CDDB server timeout"), N_("Time (in seconds) to wait for a response from the " "CDDB server"), - VLC_FALSE ); + false ); add_string( MODULE_STRING "-cddb-cachedir", "~/.cddbslave", NULL, N_("Directory to cache CDDB requests"), N_("Directory to cache CDDB requests"), - VLC_TRUE ); + true ); - add_bool( MODULE_STRING "-cdtext-prefer", VLC_TRUE, CDTextPreferCB, + add_bool( MODULE_STRING "-cdtext-prefer", 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 ); + "to CDDB information when both are available"), + false ); #endif /*HAVE_LIBCDDB*/ vlc_module_end();