Skip to content

Commit 7bf5d96

Browse files
committed
vi.h: rename DEFAULT_CRT_MARGIN into VI_CRT_MARGIN
1 parent d95e9c0 commit 7bf5d96

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

examples/videoplayer/videoplayer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ int main(void)
6060
.aspect_ratio = (float)video_width / video_height,
6161
// Uncomment this line if you want to have some additional black
6262
// borders to fully display the video on real CRTs.
63-
// .overscan_margin = DEFAULT_CRT_MARGIN,
63+
// .overscan_margin = VI_CRT_MARGIN,
6464
},
6565
// 32-bit display mode is mandatory for video playback.
6666
DEPTH_32_BPP,

include/display.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ typedef struct {
8787
/**
8888
* @brief Add a margin to the display output to compensate for the TV overscan.
8989
*
90-
* Leave 0 for emulators, upscaler or LCD TVs. Use #DEFAULT_CRT_MARGIN for
90+
* Leave 0 for emulators, upscaler or LCD TVs. Use #VI_CRT_MARGIN for
9191
* adding some margin that will allow the picture to be fully visible on
9292
* most TV CRTs.
9393
*
@@ -99,7 +99,7 @@ typedef struct {
9999
* On TV CRTs, instead, part of the picture will be displayed by the TV
100100
* overscan. To compensate for this, you can reduce the picture size by this
101101
* specified amount (expressed in percentage of the original picture).
102-
* #DEFAULT_CRT_MARGIN (which is 0.05, aka 5%) is the suggested value you can
102+
* #VI_CRT_MARGIN (which is 0.05, aka 5%) is the suggested value you can
103103
* use for this field
104104
*/
105105
float overscan_margin;
@@ -121,7 +121,7 @@ typedef struct {
121121
///@endcond
122122

123123
/** Good default for a safe CRT overscan margin (5%) */
124-
#define DEFAULT_CRT_MARGIN 0.05f
124+
#define VI_CRT_MARGIN 0.05f
125125

126126
/** @brief 256x240 mode, stretched to 4:3, no borders */
127127
const resolution_t RESOLUTION_256x240 = {.width = 256, .height = 240, .interlaced = INTERLACE_OFF};

src/vi.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
* on all the four edges, you will get a 616x456 display output, plus
6262
* the requested 12 dots of borders on all sides; the actual display output
6363
* will thus be smaller, and possibly get fully out of overscan. The value
64-
* #DEFAULT_CRT_MARGIN is a good default you can use for overscan compensation on
64+
* #VI_CRT_MARGIN is a good default you can use for overscan compensation on
6565
* most CRT TVs.
6666
*
6767
* Notice that adding borders also affect the aspect ratio of the display output;
@@ -421,7 +421,7 @@ typedef struct vi_borders_s {
421421
*
422422
* The margin is expressed as a percentage relative to the virtual VI display
423423
* output (640x480). A good default for this margin for most CRTs is
424-
* #DEFAULT_CRT_MARGIN (5%).
424+
* #VI_CRT_MARGIN (5%).
425425
*
426426
* For instance, to create a 16:9 resolution, you can do:
427427
*
@@ -433,7 +433,7 @@ typedef struct vi_borders_s {
433433
* @param aspect_ratio Target aspect ratio
434434
* @param overscan_margin Margin to add to compensate for TV overscan. Use 0
435435
* to use full picture (eg: for emulators), and something
436-
* like #DEFAULT_CRT_MARGIN to get a good CRT default.
436+
* like #VI_CRT_MARGIN to get a good CRT default.
437437
*
438438
* @return vi_borders_t The requested border settings
439439
*/

0 commit comments

Comments
 (0)