[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.193,1.194 mplayer.c,1.673,1.674
Diego Biurrun
diego at biurrun.de
Sat Feb 8 03:18:49 CET 2003
Filip Kalinski CVS wrote:
> Modified Files:
> cfg-mplayer.h mplayer.c
> Log Message:
> - support command line parameter -fstype, eg. -fstype layer=12,above,fullscreen
>
> Index: cfg-mplayer.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
> retrieving revision 1.193
> retrieving revision 1.194
> diff -u -r1.193 -r1.194
> --- cfg-mplayer.h 7 Feb 2003 18:05:38 -0000 1.193
> +++ cfg-mplayer.h 7 Feb 2003 19:38:37 -0000 1.194
> @@ -274,6 +275,7 @@
> // start in fullscreen mode:
> {"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL},
> {"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0, NULL},
> + {"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
> // set fullscreen switch method (workaround for buggy WMs)
> {"fsmode", "option 'fsmode' is obsolete, avoid using it! if you really want it, try -fsmode-dontuse, but don't report bugs with this option used!", CONF_TYPE_PRINT, CONF_RANGE, 0, 31, NULL},
> {"fsmode-dontuse", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL},
> Index: mplayer.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/mplayer.c,v
> retrieving revision 1.673
> retrieving revision 1.674
> diff -u -r1.673 -r1.674
> --- mplayer.c 7 Feb 2003 18:09:29 -0000 1.673
> +++ mplayer.c 7 Feb 2003 19:38:37 -0000 1.674
> @@ -835,6 +835,11 @@
> printf("\n");
> exit(0);
> }
> + if(vo_fstype_list && strcmp(vo_fstype_list[0],"help")==0){
> + fstype_help();
> + printf("\n");
> + exit(0);
> + }
This broke compilation on Cygwin:
In file included from mplayer.c:497:
cfg-mplayer.h:278: `vo_fstype_list' undeclared here (not in a function)
cfg-mplayer.h:278: initializer element is not constant
cfg-mplayer.h:278: (near initialization for `mplayer_opts[33].p')
cfg-mplayer.h:278: initializer element is not constant
cfg-mplayer.h:278: (near initialization for `mplayer_opts[33]')
cfg-mplayer.h:280: initializer element is not constant
cfg-mplayer.h:280: (near initialization for `mplayer_opts[34]')
cfg-mplayer.h:281: initializer element is not constant
cfg-mplayer.h:281: (near initialization for `mplayer_opts[35]')
cfg-mplayer.h:283: initializer element is not constant
cfg-mplayer.h:283: (near initialization for `mplayer_opts[36]')
cfg-mplayer.h:285: initializer element is not constant
cfg-mplayer.h:285: (near initialization for `mplayer_opts[37]')
cfg-mplayer.h:286: initializer element is not constant
cfg-mplayer.h:286: (near initialization for `mplayer_opts[38]')
cfg-mplayer.h:288: initializer element is not constant
cfg-mplayer.h:288: (near initialization for `mplayer_opts[39]')
cfg-mplayer.h:289: initializer element is not constant
cfg-mplayer.h:289: (near initialization for `mplayer_opts[40]')
cfg-mplayer.h:290: initializer element is not constant
cfg-mplayer.h:290: (near initialization for `mplayer_opts[41]')
cfg-mplayer.h:292: initializer element is not constant
cfg-mplayer.h:292: (near initialization for `mplayer_opts[42]')
cfg-mplayer.h:293: initializer element is not constant
cfg-mplayer.h:293: (near initialization for `mplayer_opts[43]')
cfg-mplayer.h:310: initializer element is not constant
cfg-mplayer.h:310: (near initialization for `mplayer_opts[44]')
cfg-mplayer.h:311: initializer element is not constant
cfg-mplayer.h:311: (near initialization for `mplayer_opts[45]')
cfg-mplayer.h:312: initializer element is not constant
cfg-mplayer.h:312: (near initialization for `mplayer_opts[46]')
cfg-mplayer.h:313: initializer element is not constant
cfg-mplayer.h:313: (near initialization for `mplayer_opts[47]')
cfg-mplayer.h:316: initializer element is not constant
cfg-mplayer.h:316: (near initialization for `mplayer_opts[48]')
cfg-mplayer.h:317: initializer element is not constant
cfg-mplayer.h:317: (near initialization for `mplayer_opts[49]')
cfg-mplayer.h:318: initializer element is not constant
cfg-mplayer.h:318: (near initialization for `mplayer_opts[50]')
cfg-mplayer.h:319: initializer element is not constant
cfg-mplayer.h:319: (near initialization for `mplayer_opts[51]')
cfg-mplayer.h:322: initializer element is not constant
cfg-mplayer.h:322: (near initialization for `mplayer_opts[52]')
cfg-mplayer.h:323: initializer element is not constant
cfg-mplayer.h:323: (near initialization for `mplayer_opts[53]')
cfg-mplayer.h:345: initializer element is not constant
cfg-mplayer.h:345: (near initialization for `mplayer_opts[54]')
cfg-mplayer.h:346: initializer element is not constant
cfg-mplayer.h:346: (near initialization for `mplayer_opts[55]')
cfg-mplayer.h:351: initializer element is not constant
cfg-mplayer.h:351: (near initialization for `mplayer_opts[56]')
cfg-mplayer.h:353: initializer element is not constant
cfg-mplayer.h:353: (near initialization for `mplayer_opts[57]')
cfg-mplayer.h:354: initializer element is not constant
cfg-mplayer.h:354: (near initialization for `mplayer_opts[58]')
cfg-mplayer.h:355: initializer element is not constant
cfg-mplayer.h:355: (near initialization for `mplayer_opts[59]')
cfg-mplayer.h:356: initializer element is not constant
cfg-mplayer.h:356: (near initialization for `mplayer_opts[60]')
cfg-mplayer.h:362: initializer element is not constant
cfg-mplayer.h:362: (near initialization for `mplayer_opts[61]')
cfg-mplayer.h:363: initializer element is not constant
cfg-mplayer.h:363: (near initialization for `mplayer_opts[62]')
cfg-mplayer.h:365: initializer element is not constant
cfg-mplayer.h:365: (near initialization for `mplayer_opts[63]')
cfg-mplayer.h:368: initializer element is not constant
cfg-mplayer.h:368: (near initialization for `mplayer_opts[64]')
cfg-mplayer.h:370: initializer element is not constant
cfg-mplayer.h:370: (near initialization for `mplayer_opts[65]')
cfg-mplayer.h:372: initializer element is not constant
cfg-mplayer.h:372: (near initialization for `mplayer_opts[66]')
cfg-mplayer.h:373: initializer element is not constant
cfg-mplayer.h:373: (near initialization for `mplayer_opts[67]')
cfg-mplayer.h:374: initializer element is not constant
cfg-mplayer.h:374: (near initialization for `mplayer_opts[68]')
cfg-mplayer.h:376: initializer element is not constant
cfg-mplayer.h:376: (near initialization for `mplayer_opts[69]')
cfg-mplayer.h:378: initializer element is not constant
cfg-mplayer.h:378: (near initialization for `mplayer_opts[70]')
cfg-mplayer.h:382: initializer element is not constant
cfg-mplayer.h:382: (near initialization for `mplayer_opts[71]')
cfg-mplayer.h:383: initializer element is not constant
cfg-mplayer.h:383: (near initialization for `mplayer_opts[72]')
cfg-mplayer.h:384: initializer element is not constant
cfg-mplayer.h:384: (near initialization for `mplayer_opts[73]')
cfg-mplayer.h:385: initializer element is not constant
cfg-mplayer.h:385: (near initialization for `mplayer_opts[74]')
cfg-mplayer.h:386: initializer element is not constant
cfg-mplayer.h:386: (near initialization for `mplayer_opts[75]')
cfg-mplayer.h:387: initializer element is not constant
cfg-mplayer.h:387: (near initialization for `mplayer_opts[76]')
cfg-mplayer.h:388: initializer element is not constant
cfg-mplayer.h:388: (near initialization for `mplayer_opts[77]')
cfg-mplayer.h:389: initializer element is not constant
cfg-mplayer.h:389: (near initialization for `mplayer_opts[78]')
cfg-mplayer.h:390: initializer element is not constant
cfg-mplayer.h:390: (near initialization for `mplayer_opts[79]')
cfg-mplayer.h:391: initializer element is not constant
cfg-mplayer.h:391: (near initialization for `mplayer_opts[80]')
cfg-mplayer.h:397: initializer element is not constant
cfg-mplayer.h:397: (near initialization for `mplayer_opts[81]')
cfg-mplayer.h:407: initializer element is not constant
cfg-mplayer.h:407: (near initialization for `mplayer_opts[82]')
cfg-mplayer.h:408: initializer element is not constant
cfg-mplayer.h:408: (near initialization for `mplayer_opts[83]')
cfg-mplayer.h:409: initializer element is not constant
cfg-mplayer.h:409: (near initialization for `mplayer_opts[84]')
cfg-mplayer.h:412: initializer element is not constant
cfg-mplayer.h:412: (near initialization for `mplayer_opts[85]')
cfg-mplayer.h:413: initializer element is not constant
cfg-mplayer.h:413: (near initialization for `mplayer_opts[86]')
cfg-mplayer.h:417: initializer element is not constant
cfg-mplayer.h:417: (near initialization for `mplayer_opts[87]')
cfg-mplayer.h:422: initializer element is not constant
cfg-mplayer.h:422: (near initialization for `mplayer_opts[88]')
cfg-mplayer.h:423: initializer element is not constant
cfg-mplayer.h:423: (near initialization for `mplayer_opts[89]')
In file included from cfg-mplayer.h:426,
from mplayer.c:497:
cfg-common.h:6: initializer element is not constant
cfg-common.h:6: (near initialization for `mplayer_opts[90]')
cfg-common.h:7: initializer element is not constant
cfg-common.h:7: (near initialization for `mplayer_opts[91]')
cfg-common.h:11: initializer element is not constant
cfg-common.h:11: (near initialization for `mplayer_opts[92]')
cfg-common.h:12: initializer element is not constant
cfg-common.h:12: (near initialization for `mplayer_opts[93]')
cfg-common.h:13: initializer element is not constant
cfg-common.h:13: (near initialization for `mplayer_opts[94]')
cfg-common.h:26: initializer element is not constant
cfg-common.h:26: (near initialization for `mplayer_opts[95]')
cfg-common.h:34: initializer element is not constant
cfg-common.h:34: (near initialization for `mplayer_opts[96]')
cfg-common.h:35: initializer element is not constant
cfg-common.h:35: (near initialization for `mplayer_opts[97]')
cfg-common.h:36: initializer element is not constant
cfg-common.h:36: (near initialization for `mplayer_opts[98]')
cfg-common.h:40: initializer element is not constant
cfg-common.h:40: (near initialization for `mplayer_opts[99]')
cfg-common.h:41: initializer element is not constant
cfg-common.h:41: (near initialization for `mplayer_opts[100]')
cfg-common.h:42: initializer element is not constant
cfg-common.h:42: (near initialization for `mplayer_opts[101]')
cfg-common.h:51: initializer element is not constant
cfg-common.h:51: (near initialization for `mplayer_opts[102]')
cfg-common.h:54: initializer element is not constant
cfg-common.h:54: (near initialization for `mplayer_opts[103]')
cfg-common.h:55: initializer element is not constant
cfg-common.h:55: (near initialization for `mplayer_opts[104]')
cfg-common.h:58: initializer element is not constant
cfg-common.h:58: (near initialization for `mplayer_opts[105]')
cfg-common.h:59: initializer element is not constant
cfg-common.h:59: (near initialization for `mplayer_opts[106]')
cfg-common.h:62: initializer element is not constant
cfg-common.h:62: (near initialization for `mplayer_opts[107]')
cfg-common.h:63: initializer element is not constant
cfg-common.h:63: (near initialization for `mplayer_opts[108]')
cfg-common.h:64: initializer element is not constant
cfg-common.h:64: (near initialization for `mplayer_opts[109]')
cfg-common.h:67: initializer element is not constant
cfg-common.h:67: (near initialization for `mplayer_opts[110]')
cfg-common.h:68: initializer element is not constant
cfg-common.h:68: (near initialization for `mplayer_opts[111]')
cfg-common.h:69: initializer element is not constant
cfg-common.h:69: (near initialization for `mplayer_opts[112]')
cfg-common.h:71: initializer element is not constant
cfg-common.h:71: (near initialization for `mplayer_opts[113]')
cfg-common.h:72: initializer element is not constant
cfg-common.h:72: (near initialization for `mplayer_opts[114]')
cfg-common.h:74: initializer element is not constant
cfg-common.h:74: (near initialization for `mplayer_opts[115]')
cfg-common.h:75: initializer element is not constant
cfg-common.h:75: (near initialization for `mplayer_opts[116]')
cfg-common.h:82: initializer element is not constant
cfg-common.h:82: (near initialization for `mplayer_opts[117]')
cfg-common.h:83: initializer element is not constant
cfg-common.h:83: (near initialization for `mplayer_opts[118]')
cfg-common.h:84: initializer element is not constant
cfg-common.h:84: (near initialization for `mplayer_opts[119]')
cfg-common.h:85: initializer element is not constant
cfg-common.h:85: (near initialization for `mplayer_opts[120]')
cfg-common.h:86: initializer element is not constant
cfg-common.h:86: (near initialization for `mplayer_opts[121]')
cfg-common.h:87: initializer element is not constant
cfg-common.h:87: (near initialization for `mplayer_opts[122]')
cfg-common.h:88: initializer element is not constant
cfg-common.h:88: (near initialization for `mplayer_opts[123]')
cfg-common.h:90: initializer element is not constant
cfg-common.h:90: (near initialization for `mplayer_opts[124]')
cfg-common.h:94: initializer element is not constant
cfg-common.h:94: (near initialization for `mplayer_opts[125]')
cfg-common.h:96: initializer element is not constant
cfg-common.h:96: (near initialization for `mplayer_opts[126]')
cfg-common.h:101: initializer element is not constant
cfg-common.h:101: (near initialization for `mplayer_opts[127]')
cfg-common.h:102: initializer element is not constant
cfg-common.h:102: (near initialization for `mplayer_opts[128]')
cfg-common.h:105: initializer element is not constant
cfg-common.h:105: (near initialization for `mplayer_opts[129]')
cfg-common.h:108: initializer element is not constant
cfg-common.h:108: (near initialization for `mplayer_opts[130]')
cfg-common.h:109: initializer element is not constant
cfg-common.h:109: (near initialization for `mplayer_opts[131]')
cfg-common.h:110: initializer element is not constant
cfg-common.h:110: (near initialization for `mplayer_opts[132]')
cfg-common.h:111: initializer element is not constant
cfg-common.h:111: (near initialization for `mplayer_opts[133]')
cfg-common.h:117: initializer element is not constant
cfg-common.h:117: (near initialization for `mplayer_opts[134]')
cfg-common.h:121: initializer element is not constant
cfg-common.h:121: (near initialization for `mplayer_opts[135]')
cfg-common.h:122: initializer element is not constant
cfg-common.h:122: (near initialization for `mplayer_opts[136]')
cfg-common.h:128: initializer element is not constant
cfg-common.h:128: (near initialization for `mplayer_opts[137]')
cfg-common.h:129: initializer element is not constant
cfg-common.h:129: (near initialization for `mplayer_opts[138]')
cfg-common.h:131: initializer element is not constant
cfg-common.h:131: (near initialization for `mplayer_opts[139]')
cfg-common.h:132: initializer element is not constant
cfg-common.h:132: (near initialization for `mplayer_opts[140]')
cfg-common.h:136: initializer element is not constant
cfg-common.h:136: (near initialization for `mplayer_opts[141]')
cfg-common.h:137: initializer element is not constant
cfg-common.h:137: (near initialization for `mplayer_opts[142]')
cfg-common.h:141: initializer element is not constant
cfg-common.h:141: (near initialization for `mplayer_opts[143]')
cfg-common.h:143: initializer element is not constant
cfg-common.h:143: (near initialization for `mplayer_opts[144]')
cfg-common.h:144: initializer element is not constant
cfg-common.h:144: (near initialization for `mplayer_opts[145]')
cfg-common.h:146: initializer element is not constant
cfg-common.h:146: (near initialization for `mplayer_opts[146]')
cfg-common.h:149: initializer element is not constant
cfg-common.h:149: (near initialization for `mplayer_opts[147]')
cfg-common.h:150: initializer element is not constant
cfg-common.h:150: (near initialization for `mplayer_opts[148]')
cfg-common.h:151: initializer element is not constant
cfg-common.h:151: (near initialization for `mplayer_opts[149]')
cfg-common.h:152: initializer element is not constant
cfg-common.h:152: (near initialization for `mplayer_opts[150]')
cfg-common.h:153: initializer element is not constant
cfg-common.h:153: (near initialization for `mplayer_opts[151]')
cfg-common.h:154: initializer element is not constant
cfg-common.h:154: (near initialization for `mplayer_opts[152]')
cfg-common.h:155: initializer element is not constant
cfg-common.h:155: (near initialization for `mplayer_opts[153]')
cfg-common.h:157: initializer element is not constant
cfg-common.h:157: (near initialization for `mplayer_opts[154]')
cfg-common.h:158: initializer element is not constant
cfg-common.h:158: (near initialization for `mplayer_opts[155]')
cfg-common.h:161: initializer element is not constant
cfg-common.h:161: (near initialization for `mplayer_opts[156]')
cfg-common.h:169: initializer element is not constant
cfg-common.h:169: (near initialization for `mplayer_opts[157]')
cfg-common.h:173: initializer element is not constant
cfg-common.h:173: (near initialization for `mplayer_opts[158]')
cfg-common.h:174: initializer element is not constant
cfg-common.h:174: (near initialization for `mplayer_opts[159]')
cfg-common.h:175: initializer element is not constant
cfg-common.h:175: (near initialization for `mplayer_opts[160]')
cfg-common.h:176: initializer element is not constant
cfg-common.h:176: (near initialization for `mplayer_opts[161]')
cfg-common.h:177: initializer element is not constant
cfg-common.h:177: (near initialization for `mplayer_opts[162]')
cfg-common.h:178: initializer element is not constant
cfg-common.h:178: (near initialization for `mplayer_opts[163]')
cfg-common.h:179: initializer element is not constant
cfg-common.h:179: (near initialization for `mplayer_opts[164]')
cfg-common.h:181: initializer element is not constant
cfg-common.h:181: (near initialization for `mplayer_opts[165]')
cfg-common.h:183: initializer element is not constant
cfg-common.h:183: (near initialization for `mplayer_opts[166]')
cfg-common.h:184: initializer element is not constant
cfg-common.h:184: (near initialization for `mplayer_opts[167]')
cfg-common.h:185: initializer element is not constant
cfg-common.h:185: (near initialization for `mplayer_opts[168]')
cfg-common.h:186: initializer element is not constant
cfg-common.h:186: (near initialization for `mplayer_opts[169]')
cfg-common.h:187: initializer element is not constant
cfg-common.h:187: (near initialization for `mplayer_opts[170]')
cfg-common.h:188: initializer element is not constant
cfg-common.h:188: (near initialization for `mplayer_opts[171]')
cfg-common.h:191: initializer element is not constant
cfg-common.h:191: (near initialization for `mplayer_opts[172]')
cfg-common.h:192: initializer element is not constant
cfg-common.h:192: (near initialization for `mplayer_opts[173]')
cfg-common.h:193: initializer element is not constant
cfg-common.h:193: (near initialization for `mplayer_opts[174]')
cfg-common.h:194: initializer element is not constant
cfg-common.h:194: (near initialization for `mplayer_opts[175]')
cfg-common.h:195: initializer element is not constant
cfg-common.h:195: (near initialization for `mplayer_opts[176]')
cfg-common.h:196: initializer element is not constant
cfg-common.h:196: (near initialization for `mplayer_opts[177]')
cfg-common.h:197: initializer element is not constant
cfg-common.h:197: (near initialization for `mplayer_opts[178]')
cfg-common.h:198: initializer element is not constant
cfg-common.h:198: (near initialization for `mplayer_opts[179]')
In file included from mplayer.c:497:
cfg-mplayer.h:429: initializer element is not constant
cfg-mplayer.h:429: (near initialization for `mplayer_opts[180]')
cfg-mplayer.h:430: initializer element is not constant
cfg-mplayer.h:430: (near initialization for `mplayer_opts[181]')
cfg-mplayer.h:431: initializer element is not constant
cfg-mplayer.h:431: (near initialization for `mplayer_opts[182]')
cfg-mplayer.h:432: initializer element is not constant
cfg-mplayer.h:432: (near initialization for `mplayer_opts[183]')
cfg-mplayer.h:433: initializer element is not constant
cfg-mplayer.h:433: (near initialization for `mplayer_opts[184]')
cfg-mplayer.h:434: initializer element is not constant
cfg-mplayer.h:434: (near initialization for `mplayer_opts[185]')
cfg-mplayer.h:435: initializer element is not constant
cfg-mplayer.h:435: (near initialization for `mplayer_opts[186]')
cfg-mplayer.h:436: initializer element is not constant
cfg-mplayer.h:436: (near initialization for `mplayer_opts[187]')
cfg-mplayer.h:437: initializer element is not constant
cfg-mplayer.h:437: (near initialization for `mplayer_opts[188]')
cfg-mplayer.h:438: initializer element is not constant
cfg-mplayer.h:438: (near initialization for `mplayer_opts[189]')
mplayer.c: In function `main':
mplayer.c:722: warning: passing arg 2 of `m_config_register_options'
from incompatible pointer type
mplayer.c:839: `vo_fstype_list' undeclared (first use in this function)
mplayer.c:839: (Each undeclared identifier is reported only once
mplayer.c:839: for each function it appears in.)
make: *** [mplayer.o] Error 1
Administrator at silver ~/tree
$
More information about the MPlayer-cvslog
mailing list