Skip to content

Commit

Permalink
Trailing ;
Browse files Browse the repository at this point in the history
  • Loading branch information
Rémi Denis-Courmont committed Jan 27, 2009
1 parent b9259bb commit fa4bde0
Show file tree
Hide file tree
Showing 152 changed files with 878 additions and 878 deletions.
24 changes: 12 additions & 12 deletions modules/access/alsa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,23 +83,23 @@ static void DemuxClose( vlc_object_t * );
#define ALSA_DEFAULT "hw"
#define CFG_PREFIX "alsa-"

vlc_module_begin();
set_shortname( N_("Alsa") );
set_description( N_("Alsa audio capture input") );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
vlc_module_begin()
set_shortname( N_("Alsa") )
set_description( N_("Alsa audio capture input") )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )

add_shortcut( "alsa" );
set_capability( "access_demux", 10 );
set_callbacks( DemuxOpen, DemuxClose );
add_shortcut( "alsa" )
set_capability( "access_demux", 10 )
set_callbacks( DemuxOpen, DemuxClose )

add_bool( CFG_PREFIX "stereo", true, NULL, STEREO_TEXT, STEREO_LONGTEXT,
true );
true )
add_integer( CFG_PREFIX "samplerate", 48000, NULL, SAMPLERATE_TEXT,
SAMPLERATE_LONGTEXT, true );
SAMPLERATE_LONGTEXT, true )
add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, true );
vlc_module_end();
CACHING_TEXT, CACHING_LONGTEXT, true )
vlc_module_end()

/*****************************************************************************
* Access: local prototypes
Expand Down
2 changes: 1 addition & 1 deletion modules/access/bd/bd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ vlc_module_begin ()
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
add_integer( "bd-caching", DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, true );
CACHING_TEXT, CACHING_LONGTEXT, true )
set_capability( "access_demux", 60 )
add_shortcut( "bd" )
set_callbacks( Open, Close )
Expand Down
66 changes: 33 additions & 33 deletions modules/access/bda/bda.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,96 +190,96 @@ vlc_module_begin ()
set_subcategory( SUBCAT_INPUT_ACCESS )

add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
CACHING_LONGTEXT, true );
CACHING_LONGTEXT, true )
add_integer( "dvb-frequency", 0, NULL, FREQ_TEXT, FREQ_LONGTEXT,
false );
false )
# if defined(WIN32) || defined(WINCE)
add_string( "dvb-network-name", NULL, NULL, NAME_TEXT, NAME_LONGTEXT,
true );
true )
add_string( "dvb-create-name", NULL, NULL, CREATE_TEXT,
CREATE_LONGTEXT, true );
CREATE_LONGTEXT, true )
add_integer( "dvb-adapter", -1, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT,
true );
true )
# else
/* dvb-device refers to a frontend within an adapter */
add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
true );
add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, true );
true )
add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, true )
add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
true );
true )
# endif

/* DVB-S (satellite) */
add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT,
INVERSION_LONGTEXT, true );
INVERSION_LONGTEXT, true )
change_integer_list( i_inversion_list, ppsz_inversion_text, NULL );
# if defined(WIN32) || defined(WINCE)
add_string( "dvb-polarisation", NULL, NULL, POLARISATION_TEXT,
POLARISATION_LONGTEXT, false );
POLARISATION_LONGTEXT, false )
change_string_list( ppsz_polar_list, ppsz_polar_text, 0 );
/* Note: Polaristion H = voltage 18; V = voltage 13; */
add_integer( "dvb-network-id", 0, NULL, NETID_TEXT, NETID_LONGTEXT,
true );
true )
add_integer( "dvb-azimuth", 0, NULL, AZIMUTH_TEXT, AZIMUTH_LONGTEXT,
true );
true )
add_integer( "dvb-elevation", 0, NULL, ELEVATION_TEXT,
ELEVATION_LONGTEXT, true );
ELEVATION_LONGTEXT, true )
add_integer( "dvb-longitude", 0, NULL, LONGITUDE_TEXT,
LONGITUDE_LONGTEXT, true );
LONGITUDE_LONGTEXT, true )
add_string( "dvb-range", NULL, NULL, RANGE_TEXT,
RANGE_LONGTEXT, true );
RANGE_LONGTEXT, true )
/* dvb-range corresponds to the BDA InputRange parameter which is
* used by some drivers to control the diseqc */
# else
add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT,
true );
true )
add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT,
true );
true )
add_bool( "dvb-high-voltage", 0, NULL, HIGH_VOLTAGE_TEXT,
HIGH_VOLTAGE_LONGTEXT, true );
HIGH_VOLTAGE_LONGTEXT, true )
add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT,
true );
add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true );
true )
add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true )
# endif
add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT,
LNB_LOF1_LONGTEXT, true );
LNB_LOF1_LONGTEXT, true )
add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT,
LNB_LOF2_LONGTEXT, true );
LNB_LOF2_LONGTEXT, true )
add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT,
LNB_SLOF_LONGTEXT, true );
LNB_SLOF_LONGTEXT, true )
add_integer( "dvb-srate", 27500, NULL, SRATE_TEXT, SRATE_LONGTEXT,
false );
false )

/* DVB-C (cable) */
add_integer( "dvb-modulation", -1, NULL, MODULATION_TEXT,
MODULATION_LONGTEXT, true );
MODULATION_LONGTEXT, true )
change_integer_list( i_mod_list, ppsz_mod_text, NULL );

/* ATSC */
add_integer( "dvb-major-channel", 0, NULL, MAJOR_CHANNEL_TEXT,
MAJOR_CHANNEL_LONGTEXT, true );
MAJOR_CHANNEL_LONGTEXT, true )
add_integer( "dvb-minor-channel", 0, NULL, MINOR_CHANNEL_TEXT,
MINOR_CHANNEL_LONGTEXT, true );
MINOR_CHANNEL_LONGTEXT, true )
add_integer( "dvb-physical-channel", 0, NULL, PHYSICAL_CHANNEL_TEXT,
PHYSICAL_CHANNEL_LONGTEXT, true );
PHYSICAL_CHANNEL_LONGTEXT, true )

/* DVB-T (terrestrial) */
add_integer( "dvb-code-rate-hp", -1, NULL, CODE_RATE_HP_TEXT,
CODE_RATE_HP_LONGTEXT, true );
CODE_RATE_HP_LONGTEXT, true )
change_integer_list( i_hp_fec_list, ppsz_hp_fec_text, NULL );
add_integer( "dvb-code-rate-lp", -1, NULL, CODE_RATE_LP_TEXT,
CODE_RATE_LP_LONGTEXT, true );
CODE_RATE_LP_LONGTEXT, true )
change_integer_list( i_lp_fec_list, ppsz_lp_fec_text, NULL );
add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT,
false );
false )
change_integer_list( i_band_list, ppsz_band_text, NULL );
add_integer( "dvb-guard", -1, NULL, GUARD_TEXT, GUARD_LONGTEXT, true )
change_integer_list( i_guard_list, ppsz_guard_text, NULL );
add_integer( "dvb-transmission", -1, NULL, TRANSMISSION_TEXT,
TRANSMISSION_LONGTEXT, true );
TRANSMISSION_LONGTEXT, true )
change_integer_list( i_transmission_list, ppsz_transmission_text, NULL );
add_integer( "dvb-hierarchy", -1, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT,
true );
true )
change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, NULL );

set_capability( "access", 0 )
Expand Down
6 changes: 3 additions & 3 deletions modules/access/cdda.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ vlc_module_begin ()

add_usage_hint( N_("[cdda:][device][@[track]]") )
add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
CACHING_LONGTEXT, true );
CACHING_LONGTEXT, true )

add_integer( "cdda-track", -1 , NULL, NULL, NULL, true )
change_internal ()
Expand All @@ -86,10 +86,10 @@ vlc_module_begin ()

add_string( "cddb-server", "freedb.freedb.org", NULL,
N_( "CDDB Server" ), N_( "Address of the CDDB server to use." ),
true );
true )
add_integer( "cddb-port", 8880, NULL,
N_( "CDDB port" ), N_( "CDDB Server port to use." ),
true );
true )
add_shortcut( "cdda" )
add_shortcut( "cddasimple" )
vlc_module_end ()
Expand Down
36 changes: 18 additions & 18 deletions modules/access/cdda/cdda.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,34 +123,34 @@ vlc_module_begin ()
/* Configuration options */
add_integer ( MODULE_STRING "-debug", 0, CDDADebugCB,
N_("Additional debug"),
DEBUG_LONGTEXT, true );
DEBUG_LONGTEXT, true )

add_integer( MODULE_STRING "-caching",
DEFAULT_PTS_DELAY / MILLISECONDS_PER_SEC, NULL,
N_("Caching value in microseconds"),
CACHING_LONGTEXT, 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, 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, true );
TITLE_FMT_LONGTEXT, true )

#if LIBCDIO_VERSION_NUM >= 73
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"),
false );
false )
#endif

add_bool( MODULE_STRING "-cdtext-enabled", true, CDTextEnabledCB,
N_("Do CD-Text lookups?"),
N_("If set, get CD-Text information"),
false );
false )

add_bool( MODULE_STRING "-navigation-mode", true,
#if FIXED
Expand All @@ -161,13 +161,13 @@ vlc_module_begin ()
N_("Use Navigation-style playback?"),
N_("Tracks are navigated via Navagation rather than "
"a playlist entries"),
false );
false )

#if LIBCDIO_VERSION_NUM >= 72
add_string( MODULE_STRING "-paranoia", NULL, NULL,
PARANOIA_TEXT,
PARANOIA_LONGTEXT,
false );
false )
change_string_list( psz_paranoia_list, psz_paranoia_list_text, 0 );
#endif /* LIBCDIO_VERSION_NUM >= 72 */

Expand All @@ -176,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, true );
CDDB_TITLE_FMT_LONGTEXT, true )

add_bool( MODULE_STRING "-cddb-enabled", true, CDDBEnabledCB,
N_("CDDB lookups"),
N_("If set, lookup CD-DA track information using the CDDB "
"protocol"),
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"),
true );
true )

add_integer( MODULE_STRING "-cddb-port", 8880, NULL,
N_("CDDB server port"),
N_("CDDB server uses this port number to communicate on"),
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"),
true );
true )

add_bool( MODULE_STRING "-cddb-enable-cache", true, NULL,
N_("Cache CDDB lookups?"),
N_("If set cache CDDB information about this CD"),
false );
false )

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"),
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"),
false );
false )

add_string( MODULE_STRING "-cddb-cachedir", "~/.cddbslave", NULL,
N_("Directory to cache CDDB requests"),
N_("Directory to cache CDDB requests"),
true );
true )

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"),
false );
false )
#endif /*HAVE_LIBCDDB*/

vlc_module_end ()
6 changes: 3 additions & 3 deletions modules/access/directory.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ vlc_module_begin ()
add_shortcut( "dir" )
add_shortcut( "file" )
add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT,
RECURSIVE_LONGTEXT, false );
change_string_list( psz_recursive_list, psz_recursive_list_text, 0 );
RECURSIVE_LONGTEXT, false )
change_string_list( psz_recursive_list, psz_recursive_list_text, 0 )
add_string( "ignore-filetypes", "m3u,db,nfo,jpg,jpeg,ljpg,gif,png,pgm,pgmyuv,pbm,pam,tga,bmp,pnm,xpm,xcf,pcx,tif,tiff,lbm,sfv,txt,sub,idx,srt,cue,ssa",
NULL, IGNORE_TEXT, IGNORE_LONGTEXT, false );
NULL, IGNORE_TEXT, IGNORE_LONGTEXT, false )
set_callbacks( Open, Close )
vlc_module_end ()

Expand Down
8 changes: 4 additions & 4 deletions modules/access/dshow/dshow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,16 +203,16 @@ vlc_module_begin ()
add_string( "dshow-size", NULL, NULL, SIZE_TEXT, SIZE_LONGTEXT, false)

add_string( "dshow-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
true );
true )

add_float( "dshow-fps", 0.0f, NULL, FPS_TEXT, FPS_LONGTEXT,
true );
true )

add_bool( "dshow-config", false, NULL, CONFIG_TEXT, CONFIG_LONGTEXT,
true );
true )

add_bool( "dshow-tuner", false, NULL, TUNER_TEXT, TUNER_LONGTEXT,
true );
true )

add_integer( "dshow-tuner-channel", 0, NULL, CHANNEL_TEXT,
CHANNEL_LONGTEXT, true );
Expand Down
Loading

0 comments on commit fa4bde0

Please sign in to comment.