Changeset da7262d76793cf824d1b6aafc472eb84b01e5612
- Timestamp:
- 11/13/06 16:43:19
(2 years ago)
- Author:
- Rémi Denis-Courmont <rem@videolan.org>
- git-committer:
- Rémi Denis-Courmont <rem@videolan.org> 1163432599 +0000
- git-parent:
[d5a9c50c28669e9a0ff725438ff142bdedd7e6e8]
- git-author:
- Rémi Denis-Courmont <rem@videolan.org> 1163432599 +0000
- Message:
Fix another bunch of warnings
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| re85a5a6 |
rda7262d |
|
| 40 | 40 | int libvlc_InternalDestroy( libvlc_int_t *, vlc_bool_t ); |
|---|
| 41 | 41 | |
|---|
| 42 | | int libvlc_InternalAddIntf( libvlc_int_t *, char const *, vlc_bool_t, |
|---|
| 43 | | vlc_bool_t, int, char ** ); |
|---|
| | 42 | int libvlc_InternalAddIntf( libvlc_int_t *, const char *, vlc_bool_t, |
|---|
| | 43 | vlc_bool_t, int, const char *const * ); |
|---|
| 44 | 44 | |
|---|
| 45 | 45 | /*************************************************************************** |
|---|
| ra06213d |
rda7262d |
|
| 115 | 115 | *****************************************************************************/ |
|---|
| 116 | 116 | #define intf_Create(a,b,c,d) __intf_Create(VLC_OBJECT(a),b,c,d) |
|---|
| 117 | | VLC_EXPORT( intf_thread_t *, __intf_Create, ( vlc_object_t *, const char *, int, char ** ) ); |
|---|
| | 117 | VLC_EXPORT( intf_thread_t *, __intf_Create, ( vlc_object_t *, const char *, int, const char *const * ) ); |
|---|
| 118 | 118 | VLC_EXPORT( int, intf_RunThread, ( intf_thread_t * ) ); |
|---|
| 119 | 119 | VLC_EXPORT( void, intf_StopThread, ( intf_thread_t * ) ); |
|---|
| r43e8fc6 |
rda7262d |
|
| 235 | 235 | void (*input_DecoderDelete_inner) (decoder_t *); |
|---|
| 236 | 236 | void (*input_DecoderDecode_inner) (decoder_t *, block_t *); |
|---|
| 237 | | intf_thread_t * (*__intf_Create_inner) (vlc_object_t *, const char *, int, char **); |
|---|
| | 237 | intf_thread_t * (*__intf_Create_inner) (vlc_object_t *, const char *, int, const char *const *); |
|---|
| 238 | 238 | int (*intf_RunThread_inner) (intf_thread_t *); |
|---|
| 239 | 239 | void (*intf_StopThread_inner) (intf_thread_t *); |
|---|
| rdc8b128 |
rda7262d |
|
| 92 | 92 | */ |
|---|
| 93 | 93 | intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module, |
|---|
| 94 | | int i_options, char **ppsz_options ) |
|---|
| | 94 | int i_options, const char *const *ppsz_options ) |
|---|
| 95 | 95 | { |
|---|
| 96 | 96 | intf_thread_t * p_intf; |
|---|
| … | … | |
| 321 | 321 | static void RunInterface( intf_thread_t *p_intf ) |
|---|
| 322 | 322 | { |
|---|
| 323 | | static char *ppsz_interfaces[] = |
|---|
| | 323 | static const char *ppsz_interfaces[] = |
|---|
| 324 | 324 | { |
|---|
| 325 | 325 | "skins2", "Skins 2", |
|---|
| … | … | |
| 329 | 329 | NULL, NULL |
|---|
| 330 | 330 | }; |
|---|
| 331 | | char **ppsz_parser; |
|---|
| | 331 | const char **ppsz_parser; |
|---|
| 332 | 332 | |
|---|
| 333 | 333 | vlc_list_t *p_list; |
|---|
| … | … | |
| 352 | 352 | if( !strcmp( p_module->psz_object_name, ppsz_parser[0] ) ) |
|---|
| 353 | 353 | { |
|---|
| 354 | | val.psz_string = ppsz_parser[0]; |
|---|
| 355 | | text.psz_string = _(ppsz_parser[1]); |
|---|
| | 354 | val.psz_string = (char *)ppsz_parser[0]; |
|---|
| | 355 | text.psz_string = (char *)_(ppsz_parser[1]); |
|---|
| 356 | 356 | var_Change( p_intf, "intf-switch", VLC_VAR_ADDCHOICE, |
|---|
| 357 | 357 | &val, &text ); |
|---|
| … | … | |
| 370 | 370 | var_Change( p_intf, "intf-add", VLC_VAR_SETTEXT, &text, NULL ); |
|---|
| 371 | 371 | |
|---|
| 372 | | val.psz_string = "rc"; text.psz_string = "Console"; |
|---|
| | 372 | val.psz_string = (char *)"rc"; text.psz_string = (char *)"Console"; |
|---|
| 373 | 373 | var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); |
|---|
| 374 | | val.psz_string = "telnet"; text.psz_string = _("Telnet Interface"); |
|---|
| | 374 | val.psz_string = (char *)"telnet"; |
|---|
| | 375 | text.psz_string = (char *)_("Telnet Interface"); |
|---|
| 375 | 376 | var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); |
|---|
| 376 | | val.psz_string = "http"; text.psz_string = _("Web Interface"); |
|---|
| | 377 | val.psz_string = (char *)"http"; |
|---|
| | 378 | text.psz_string = (char *)_("Web Interface"); |
|---|
| 377 | 379 | var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); |
|---|
| 378 | | val.psz_string = "logger"; text.psz_string = _("Debug logging"); |
|---|
| | 380 | val.psz_string = (char *)"logger"; |
|---|
| | 381 | text.psz_string = (char *)_("Debug logging"); |
|---|
| 379 | 382 | var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); |
|---|
| 380 | | val.psz_string = "gestures"; text.psz_string = _("Mouse Gestures"); |
|---|
| | 383 | val.psz_string = (char *)"gestures"; |
|---|
| | 384 | text.psz_string = (char *)_("Mouse Gestures"); |
|---|
| 381 | 385 | var_Change( p_intf, "intf-add", VLC_VAR_ADDCHOICE, &val, &text ); |
|---|
| 382 | 386 | |
|---|
| ra08afde |
rda7262d |
|
| 746 | 746 | if( config_GetInt( p_libvlc, "syslog" ) == 1 ) |
|---|
| 747 | 747 | { |
|---|
| 748 | | char *psz_logmode = "logmode=syslog"; |
|---|
| | 748 | const char *psz_logmode = "logmode=syslog"; |
|---|
| 749 | 749 | libvlc_InternalAddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE, |
|---|
| 750 | 750 | 1, &psz_logmode ); |
|---|
| … | … | |
| 921 | 921 | char const *psz_module, |
|---|
| 922 | 922 | vlc_bool_t b_block, vlc_bool_t b_play, |
|---|
| 923 | | int i_options, char **ppsz_options ) |
|---|
| | 923 | int i_options, const char *const *ppsz_options ) |
|---|
| 924 | 924 | { |
|---|
| 925 | 925 | int i_err; |
|---|
| … | … | |
| 978 | 978 | && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) ) |
|---|
| 979 | 979 | |
|---|
| 980 | | char * psz_path; |
|---|
| | 980 | const char * psz_path; |
|---|
| 981 | 981 | #if defined( __APPLE__ ) || defined ( WIN32 ) || defined( SYS_BEOS ) |
|---|
| 982 | 982 | char psz_tmp[1024]; |
|---|