Changeset fdb2f80a81632eb53c1722871a6222d3c8c32bc3
- Timestamp:
- 03/22/06 23:39:51
(2 years ago)
- Author:
- Christophe Mutricy <xtophe@videolan.org>
- git-committer:
- Christophe Mutricy <xtophe@videolan.org> 1143067191 +0000
- git-parent:
[3fa37fdc847c2716a59af6a9d7be3a33ca06ba77]
- git-author:
- Christophe Mutricy <xtophe@videolan.org> 1143067191 +0000
- Message:
String Review. refs #438
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r2cb472d |
rfdb2f80 |
|
| 83 | 83 | || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') ) |
|---|
| 84 | 84 | { |
|---|
| 85 | | msg_Warn( p_filter, "Bad input or output format" ); |
|---|
| | 85 | msg_Warn( p_filter, "bad input or output format" ); |
|---|
| 86 | 86 | return VLC_EGENERIC; |
|---|
| 87 | 87 | } |
|---|
| … | … | |
| 220 | 220 | if( p_thread->p_module == NULL ) |
|---|
| 221 | 221 | { |
|---|
| 222 | | msg_Err( p_thread, "No OpenGL provider found" ); |
|---|
| | 222 | msg_Err( p_thread, "no OpenGL provider found" ); |
|---|
| 223 | 223 | vlc_object_detach( p_thread->p_opengl ); |
|---|
| 224 | 224 | vlc_object_destroy( p_thread->p_opengl ); |
|---|
| r2cb472d |
rfdb2f80 |
|
| 137 | 137 | || p_filter->output.i_format != VLC_FOURCC('f','l','3','2') ) |
|---|
| 138 | 138 | { |
|---|
| 139 | | msg_Warn( p_filter, "Bad input or output format" ); |
|---|
| | 139 | msg_Warn( p_filter, "bad input or output format" ); |
|---|
| 140 | 140 | return VLC_EGENERIC; |
|---|
| 141 | 141 | } |
|---|
| radc858d |
rfdb2f80 |
|
| 96 | 96 | if( !p_s16_buff ) |
|---|
| 97 | 97 | { |
|---|
| 98 | | msg_Err(p_aout,"Out of memory"); |
|---|
| | 98 | msg_Err(p_aout,"out of memory"); |
|---|
| 99 | 99 | return -1; |
|---|
| 100 | 100 | } |
|---|
| … | … | |
| 121 | 121 | if( !p_effect->p_data) |
|---|
| 122 | 122 | { |
|---|
| 123 | | msg_Err(p_aout,"Out of memory"); |
|---|
| | 123 | msg_Err(p_aout,"out of memory"); |
|---|
| 124 | 124 | return -1; |
|---|
| 125 | 125 | } |
|---|
| … | … | |
| 140 | 140 | if( !height) |
|---|
| 141 | 141 | { |
|---|
| 142 | | msg_Err(p_aout,"Out of memory"); |
|---|
| | 142 | msg_Err(p_aout,"out of memory"); |
|---|
| 143 | 143 | return -1; |
|---|
| 144 | 144 | } |
|---|
| … | … | |
| 158 | 158 | if( !p_state) |
|---|
| 159 | 159 | { |
|---|
| 160 | | msg_Err(p_aout,"Unable to initialize FFT transform"); |
|---|
| | 160 | msg_Err(p_aout,"unable to initialize FFT transform"); |
|---|
| 161 | 161 | return -1; |
|---|
| 162 | 162 | } |
|---|
| … | … | |
| 392 | 392 | if( !p_s16_buff ) |
|---|
| 393 | 393 | { |
|---|
| 394 | | msg_Err(p_aout,"Out of memory"); |
|---|
| | 394 | msg_Err(p_aout,"out of memory"); |
|---|
| 395 | 395 | return -1; |
|---|
| 396 | 396 | } |
|---|
| … | … | |
| 426 | 426 | if( !p_effect->p_data) |
|---|
| 427 | 427 | { |
|---|
| 428 | | msg_Err(p_aout,"Out of memory"); |
|---|
| | 428 | msg_Err(p_aout,"out of memory"); |
|---|
| 429 | 429 | return -1; |
|---|
| 430 | 430 | } |
|---|
| … | … | |
| 443 | 443 | if( !height) |
|---|
| 444 | 444 | { |
|---|
| 445 | | msg_Err(p_aout,"Out of memory"); |
|---|
| | 445 | msg_Err(p_aout,"out of memory"); |
|---|
| 446 | 446 | return -1; |
|---|
| 447 | 447 | } |
|---|
| … | … | |
| 462 | 462 | if( !p_state) |
|---|
| 463 | 463 | { |
|---|
| 464 | | msg_Err(p_aout,"Unable to initialize FFT transform"); |
|---|
| | 464 | msg_Err(p_aout,"unable to initialize FFT transform"); |
|---|
| 465 | 465 | return -1; |
|---|
| 466 | 466 | } |
|---|
| radc858d |
rfdb2f80 |
|
| 39 | 39 | #define ELIST_LONGTEXT N_( \ |
|---|
| 40 | 40 | "A list of visual effect, separated by commas.\n" \ |
|---|
| 41 | | "Current effects include: dummy, scope, spectrum" ) |
|---|
| | 41 | "Current effects include: dummy, scope, spectrum." ) |
|---|
| 42 | 42 | |
|---|
| 43 | 43 | #define WIDTH_TEXT N_( "Video width" ) |
|---|
| … | … | |
| 262 | 262 | if( ( psz_eoa = strchr( psz_parser, '}') ) == NULL ) |
|---|
| 263 | 263 | { |
|---|
| 264 | | msg_Err( p_filter, "Unable to parse effect list. Aborting"); |
|---|
| | 264 | msg_Err( p_filter, "unable to parse effect list. Aborting"); |
|---|
| 265 | 265 | break; |
|---|
| 266 | 266 | } |
|---|
| … | … | |
| 423 | 423 | aout_filter_t *p_filter = (aout_filter_t *)p_this; |
|---|
| 424 | 424 | /* restart this baby */ |
|---|
| 425 | | msg_Dbg( p_filter, "We should restart the visual filter" ); |
|---|
| | 425 | msg_Dbg( p_filter, "we should restart the visual filter" ); |
|---|
| 426 | 426 | return VLC_SUCCESS; |
|---|
| 427 | 427 | } |
|---|
| r2cb472d |
rfdb2f80 |
|
| 63 | 63 | #define POSITION_TEXT N_("Flip vertical position") |
|---|
| 64 | 64 | #define POSITION_LONGTEXT N_("Display xosd output on the bottom of the " \ |
|---|
| 65 | | "screen instead of the top") |
|---|
| | 65 | "screen instead of the top.") |
|---|
| 66 | 66 | |
|---|
| 67 | 67 | #define TXT_OFS_TEXT N_("Vertical offset") |
|---|
| 68 | | #define TXT_OFS_LONGTEXT N_("Vertical offset in pixels of the displayed text") |
|---|
| | 68 | #define TXT_OFS_LONGTEXT N_("Vertical offset in pixels of the displayed " \ |
|---|
| | 69 | "text (default 30 px).") |
|---|
| 69 | 70 | |
|---|
| 70 | 71 | #define SHD_OFS_TEXT N_("Shadow offset") |
|---|
| 71 | | #define SHD_OFS_LONGTEXT N_("Offset in pixels of the shadow") |
|---|
| | 72 | #define SHD_OFS_LONGTEXT N_("Offset in pixels of the shadow (default 2 px).") |
|---|
| 72 | 73 | |
|---|
| 73 | 74 | #define FONT_TEXT N_("Font") |
|---|
| 74 | | #define FONT_LONGTEXT N_("Font used to display text in the xosd output") |
|---|
| 75 | | /* FIXME FIXME FIXME: Gettextize */ |
|---|
| 76 | | #define COLOUR_TEXT ("Colour") |
|---|
| 77 | | #define COLOUR_LONGTEXT ("Colour used to display text in the xosd output") |
|---|
| | 75 | #define FONT_LONGTEXT N_("Font used to display text in the xosd output.") |
|---|
| | 76 | #define COLOUR_TEXT N_("Color") |
|---|
| | 77 | #define COLOUR_LONGTEXT N_("Color used to display text in the xosd output.") |
|---|
| 78 | 78 | |
|---|
| 79 | 79 | vlc_module_begin(); |
|---|
| … | … | |
| 81 | 81 | set_subcategory( SUBCAT_INTERFACE_CONTROL ); |
|---|
| 82 | 82 | set_description( _("XOSD interface") ); |
|---|
| | 83 | set_shortname( "XOSD" ); |
|---|
| 83 | 84 | add_bool( "xosd-position", 1, NULL, POSITION_TEXT, POSITION_LONGTEXT, VLC_TRUE ); |
|---|
| 84 | 85 | add_integer( "xosd-text-offset", 30, NULL, TXT_OFS_TEXT, TXT_OFS_LONGTEXT, VLC_TRUE ); |
|---|