Previous 15994 Revisions Next

r9523 Thursday 4th November, 2010 at 18:36:56 UTC by Michael Zapf
Replaced NULL with 0 in timer_adjust_oneshot to cure compiler warnings
[src/mess/machine]pce.c

src/mess/machine/pce.c
r9522r9523
13061306   {
13071307      pce_cd.cdda_volume = 0.0;
13081308      cdda_set_volume(machine->device("cdda"), 0.0);
1309      timer_adjust_oneshot(pce_cd.cdda_fadeout_timer, attotime_never, NULL);
1309      timer_adjust_oneshot(pce_cd.cdda_fadeout_timer, attotime_never, 0);
13101310   }
13111311   else
13121312   {
r9522r9523
13231323   {
13241324      pce_cd.cdda_volume = 100.0;
13251325      cdda_set_volume(machine->device("cdda"), 100.0);
1326      timer_adjust_oneshot(pce_cd.cdda_fadein_timer, attotime_never, NULL);
1326      timer_adjust_oneshot(pce_cd.cdda_fadein_timer, attotime_never, 0);
13271327   }
13281328   else
13291329   {
r9522r9523
13401340   {
13411341      pce_cd.adpcm_volume = 0.0;
13421342      msm5205_set_volume(machine->device("msm5205"), 0.0);
1343      timer_adjust_oneshot(pce_cd.adpcm_fadeout_timer, attotime_never, NULL);
1343      timer_adjust_oneshot(pce_cd.adpcm_fadeout_timer, attotime_never, 0);
13441344   }
13451345   else
13461346   {
r9522r9523
13571357   {
13581358      pce_cd.adpcm_volume = 100.0;
13591359      msm5205_set_volume(machine->device("msm5205"), 100.0);
1360      timer_adjust_oneshot(pce_cd.adpcm_fadein_timer, attotime_never, NULL);
1360      timer_adjust_oneshot(pce_cd.adpcm_fadein_timer, attotime_never, 0);
13611361   }
13621362   else
13631363   {
r9522r9523
14961496               timer_adjust_oneshot(pce_cd.cdda_fadein_timer, ATTOTIME_IN_USEC(100), 100);
14971497               pce_cd.adpcm_volume = 0.0;
14981498               timer_adjust_oneshot(pce_cd.adpcm_fadein_timer, ATTOTIME_IN_USEC(100), 100);
1499               timer_adjust_oneshot(pce_cd.cdda_fadeout_timer, attotime_never, NULL);
1500               timer_adjust_oneshot(pce_cd.adpcm_fadeout_timer, attotime_never, NULL);
1499               timer_adjust_oneshot(pce_cd.cdda_fadeout_timer, attotime_never, 0);
1500               timer_adjust_oneshot(pce_cd.adpcm_fadeout_timer, attotime_never, 0);
15011501               break;
15021502            case 0x01: //CD-DA enable (100 msecs)
15031503               pce_cd.cdda_volume = 0.0;
15041504               timer_adjust_oneshot(pce_cd.cdda_fadein_timer, ATTOTIME_IN_USEC(100), 100);
1505               timer_adjust_oneshot(pce_cd.cdda_fadeout_timer, attotime_never, NULL);
1505               timer_adjust_oneshot(pce_cd.cdda_fadeout_timer, attotime_never, 0);
15061506               break;
15071507            case 0x08: //CD-DA short (1500 msecs) fade out / ADPCM enable
15081508               pce_cd.cdda_volume = 100.0;
15091509               timer_adjust_oneshot(pce_cd.cdda_fadeout_timer, ATTOTIME_IN_USEC(1500), 1500);
15101510               pce_cd.adpcm_volume = 0.0;
15111511               timer_adjust_oneshot(pce_cd.adpcm_fadein_timer, ATTOTIME_IN_USEC(100), 100);
1512               timer_adjust_oneshot(pce_cd.cdda_fadein_timer, attotime_never, NULL);
1513               timer_adjust_oneshot(pce_cd.adpcm_fadeout_timer, attotime_never, NULL);
1512               timer_adjust_oneshot(pce_cd.cdda_fadein_timer, attotime_never, 0);
1513               timer_adjust_oneshot(pce_cd.adpcm_fadeout_timer, attotime_never, 0);
15141514               break;
15151515            case 0x09: //CD-DA long (5000 msecs) fade out
15161516               pce_cd.cdda_volume = 100.0;
15171517               timer_adjust_oneshot(pce_cd.cdda_fadeout_timer, ATTOTIME_IN_USEC(5000), 5000);
1518               timer_adjust_oneshot(pce_cd.cdda_fadein_timer, attotime_never, NULL);
1518               timer_adjust_oneshot(pce_cd.cdda_fadein_timer, attotime_never, 0);
15191519               break;
15201520            case 0x0a: //ADPCM long (5000 msecs) fade out
15211521               pce_cd.adpcm_volume = 100.0;
15221522               timer_adjust_oneshot(pce_cd.adpcm_fadeout_timer, ATTOTIME_IN_USEC(5000), 5000);
1523               timer_adjust_oneshot(pce_cd.adpcm_fadein_timer, attotime_never, NULL);
1523               timer_adjust_oneshot(pce_cd.adpcm_fadein_timer, attotime_never, 0);
15241524               break;
15251525            case 0x0c: //CD-DA short (1500 msecs) fade out / ADPCM enable
15261526               pce_cd.cdda_volume = 100.0;
15271527               timer_adjust_oneshot(pce_cd.cdda_fadeout_timer, ATTOTIME_IN_USEC(1500), 1500);
15281528               pce_cd.adpcm_volume = 0.0;
15291529               timer_adjust_oneshot(pce_cd.adpcm_fadein_timer, ATTOTIME_IN_USEC(100), 100);
1530               timer_adjust_oneshot(pce_cd.cdda_fadein_timer, attotime_never, NULL);
1531               timer_adjust_oneshot(pce_cd.adpcm_fadeout_timer, attotime_never, NULL);
1530               timer_adjust_oneshot(pce_cd.cdda_fadein_timer, attotime_never, 0);
1531               timer_adjust_oneshot(pce_cd.adpcm_fadeout_timer, attotime_never, 0);
15321532               break;
15331533            case 0x0d: //CD-DA short (1500 msecs) fade out
15341534               pce_cd.cdda_volume = 100.0;
15351535               timer_adjust_oneshot(pce_cd.cdda_fadeout_timer, ATTOTIME_IN_USEC(1500), 1500);
1536               timer_adjust_oneshot(pce_cd.cdda_fadein_timer, attotime_never, NULL);
1536               timer_adjust_oneshot(pce_cd.cdda_fadein_timer, attotime_never, 0);
15371537               break;
15381538            case 0x0e: //ADPCM short (1500 msecs) fade out
15391539               pce_cd.adpcm_volume = 100.0;
15401540               timer_adjust_oneshot(pce_cd.adpcm_fadeout_timer, ATTOTIME_IN_USEC(1500), 1500);
1541               timer_adjust_oneshot(pce_cd.adpcm_fadein_timer, attotime_never, NULL);
1541               timer_adjust_oneshot(pce_cd.adpcm_fadein_timer, attotime_never, 0);
15421542               break;
15431543            default:
15441544               popmessage("CD-DA / ADPCM Fade effect mode %02x, contact MESSdev",data & 0x0f);

Previous 15994 Revisions Next


© 1998-2018 The MESS Team