Previous 199869 Revisions Next

r37137 Sunday 12th April, 2015 at 13:36:44 UTC by Miodrag Milanović
string -> str part 1 (nw)
[src/emu]audit.c
[src/emu/ui]ui.c ui.h
[src/osd/modules/render/d3d]d3dhlsl.c

trunk/src/emu/audit.c
r245648r245649
320320//  string format
321321//-------------------------------------------------
322322
323media_auditor::summary media_auditor::summarize(const char *name, astring *string)
323media_auditor::summary media_auditor::summarize(const char *name, astring *output)
324324{
325325   if (m_record_list.count() == 0)
326326   {
r245648r245649
338338         continue;
339339
340340      // output the game name, file name, and length (if applicable)
341      if (string != NULL)
341      if (output != NULL)
342342      {
343         string->catprintf("%-12s: %s", name, record->name());
343         output->catprintf("%-12s: %s", name, record->name());
344344         if (record->expected_length() > 0)
345            string->catprintf(" (%" I64FMT "d bytes)", record->expected_length());
346         string->catprintf(" - ");
345            output->catprintf(" (%" I64FMT "d bytes)", record->expected_length());
346         output->catprintf(" - ");
347347      }
348348
349349      // use the substatus for finer details
350350      switch (record->substatus())
351351      {
352352         case audit_record::SUBSTATUS_GOOD_NEEDS_REDUMP:
353            if (string != NULL) string->catprintf("NEEDS REDUMP\n");
353            if (output != NULL) output->catprintf("NEEDS REDUMP\n");
354354            best_new_status = BEST_AVAILABLE;
355355            break;
356356
357357         case audit_record::SUBSTATUS_FOUND_NODUMP:
358            if (string != NULL) string->catprintf("NO GOOD DUMP KNOWN\n");
358            if (output != NULL) output->catprintf("NO GOOD DUMP KNOWN\n");
359359            best_new_status = BEST_AVAILABLE;
360360            break;
361361
362362         case audit_record::SUBSTATUS_FOUND_BAD_CHECKSUM:
363            if (string != NULL)
363            if (output != NULL)
364364            {
365365               astring tempstr;
366               string->catprintf("INCORRECT CHECKSUM:\n");
367               string->catprintf("EXPECTED: %s\n", record->expected_hashes().macro_string(tempstr));
368               string->catprintf("   FOUND: %s\n", record->actual_hashes().macro_string(tempstr));
366               output->catprintf("INCORRECT CHECKSUM:\n");
367               output->catprintf("EXPECTED: %s\n", record->expected_hashes().macro_string(tempstr));
368               output->catprintf("   FOUND: %s\n", record->actual_hashes().macro_string(tempstr));
369369            }
370370            break;
371371
372372         case audit_record::SUBSTATUS_FOUND_WRONG_LENGTH:
373            if (string != NULL) string->catprintf("INCORRECT LENGTH: %" I64FMT "d bytes\n", record->actual_length());
373            if (output != NULL) output->catprintf("INCORRECT LENGTH: %" I64FMT "d bytes\n", record->actual_length());
374374            break;
375375
376376         case audit_record::SUBSTATUS_NOT_FOUND:
377            if (string != NULL)
377            if (output != NULL)
378378            {
379379               device_t *shared_device = record->shared_device();
380380               if (shared_device == NULL)
381                  string->catprintf("NOT FOUND\n");
381                  output->catprintf("NOT FOUND\n");
382382               else
383                  string->catprintf("NOT FOUND (%s)\n", shared_device->shortname());
383                  output->catprintf("NOT FOUND (%s)\n", shared_device->shortname());
384384            }
385385            best_new_status = NOTFOUND;
386386            break;
387387
388388         case audit_record::SUBSTATUS_NOT_FOUND_NODUMP:
389            if (string != NULL) string->catprintf("NOT FOUND - NO GOOD DUMP KNOWN\n");
389            if (output != NULL) output->catprintf("NOT FOUND - NO GOOD DUMP KNOWN\n");
390390            best_new_status = BEST_AVAILABLE;
391391            break;
392392
393393         case audit_record::SUBSTATUS_NOT_FOUND_OPTIONAL:
394            if (string != NULL) string->catprintf("NOT FOUND BUT OPTIONAL\n");
394            if (output != NULL) output->catprintf("NOT FOUND BUT OPTIONAL\n");
395395            best_new_status = BEST_AVAILABLE;
396396            break;
397397
trunk/src/emu/ui/ui.c
r245648r245649
107107// slider controls
108108static slider_state *slider_alloc(running_machine &machine, const char *title, INT32 minval, INT32 defval, INT32 maxval, INT32 incval, slider_update update, void *arg);
109109static slider_state *slider_init(running_machine &machine);
110static INT32 slider_volume(running_machine &machine, void *arg, astring *string, INT32 newval);
111static INT32 slider_mixervol(running_machine &machine, void *arg, astring *string, INT32 newval);
112static INT32 slider_adjuster(running_machine &machine, void *arg, astring *string, INT32 newval);
113static INT32 slider_overclock(running_machine &machine, void *arg, astring *string, INT32 newval);
114static INT32 slider_refresh(running_machine &machine, void *arg, astring *string, INT32 newval);
115static INT32 slider_brightness(running_machine &machine, void *arg, astring *string, INT32 newval);
116static INT32 slider_contrast(running_machine &machine, void *arg, astring *string, INT32 newval);
117static INT32 slider_gamma(running_machine &machine, void *arg, astring *string, INT32 newval);
118static INT32 slider_xscale(running_machine &machine, void *arg, astring *string, INT32 newval);
119static INT32 slider_yscale(running_machine &machine, void *arg, astring *string, INT32 newval);
120static INT32 slider_xoffset(running_machine &machine, void *arg, astring *string, INT32 newval);
121static INT32 slider_yoffset(running_machine &machine, void *arg, astring *string, INT32 newval);
122static INT32 slider_overxscale(running_machine &machine, void *arg, astring *string, INT32 newval);
123static INT32 slider_overyscale(running_machine &machine, void *arg, astring *string, INT32 newval);
124static INT32 slider_overxoffset(running_machine &machine, void *arg, astring *string, INT32 newval);
125static INT32 slider_overyoffset(running_machine &machine, void *arg, astring *string, INT32 newval);
126static INT32 slider_flicker(running_machine &machine, void *arg, astring *string, INT32 newval);
127static INT32 slider_beam(running_machine &machine, void *arg, astring *string, INT32 newval);
110static INT32 slider_volume(running_machine &machine, void *arg, astring *str, INT32 newval);
111static INT32 slider_mixervol(running_machine &machine, void *arg, astring *str, INT32 newval);
112static INT32 slider_adjuster(running_machine &machine, void *arg, astring *str, INT32 newval);
113static INT32 slider_overclock(running_machine &machine, void *arg, astring *str, INT32 newval);
114static INT32 slider_refresh(running_machine &machine, void *arg, astring *str, INT32 newval);
115static INT32 slider_brightness(running_machine &machine, void *arg, astring *str, INT32 newval);
116static INT32 slider_contrast(running_machine &machine, void *arg, astring *str, INT32 newval);
117static INT32 slider_gamma(running_machine &machine, void *arg, astring *str, INT32 newval);
118static INT32 slider_xscale(running_machine &machine, void *arg, astring *str, INT32 newval);
119static INT32 slider_yscale(running_machine &machine, void *arg, astring *str, INT32 newval);
120static INT32 slider_xoffset(running_machine &machine, void *arg, astring *str, INT32 newval);
121static INT32 slider_yoffset(running_machine &machine, void *arg, astring *str, INT32 newval);
122static INT32 slider_overxscale(running_machine &machine, void *arg, astring *str, INT32 newval);
123static INT32 slider_overyscale(running_machine &machine, void *arg, astring *str, INT32 newval);
124static INT32 slider_overxoffset(running_machine &machine, void *arg, astring *str, INT32 newval);
125static INT32 slider_overyoffset(running_machine &machine, void *arg, astring *str, INT32 newval);
126static INT32 slider_flicker(running_machine &machine, void *arg, astring *str, INT32 newval);
127static INT32 slider_beam(running_machine &machine, void *arg, astring *str, INT32 newval);
128128static char *slider_get_screen_desc(screen_device &screen);
129129#ifdef MAME_DEBUG
130static INT32 slider_crossscale(running_machine &machine, void *arg, astring *string, INT32 newval);
131static INT32 slider_crossoffset(running_machine &machine, void *arg, astring *string, INT32 newval);
130static INT32 slider_crossscale(running_machine &machine, void *arg, astring *str, INT32 newval);
131static INT32 slider_crossoffset(running_machine &machine, void *arg, astring *str, INT32 newval);
132132#endif
133133
134134
r245648r245649
19771977//  slider_volume - global volume slider callback
19781978//-------------------------------------------------
19791979
1980static INT32 slider_volume(running_machine &machine, void *arg, astring *string, INT32 newval)
1980static INT32 slider_volume(running_machine &machine, void *arg, astring *str, INT32 newval)
19811981{
19821982   if (newval != SLIDER_NOCHANGE)
19831983      machine.sound().set_attenuation(newval);
1984   if (string != NULL)
1985      string->printf("%3ddB", machine.sound().attenuation());
1984   if (str != NULL)
1985      str->printf("%3ddB", machine.sound().attenuation());
19861986   return machine.sound().attenuation();
19871987}
19881988
r245648r245649
19921992//  slider callback
19931993//-------------------------------------------------
19941994
1995static INT32 slider_mixervol(running_machine &machine, void *arg, astring *string, INT32 newval)
1995static INT32 slider_mixervol(running_machine &machine, void *arg, astring *str, INT32 newval)
19961996{
19971997   mixer_input info;
19981998   if (!machine.sound().indexed_mixer_input((FPTR)arg, info))
r245648r245649
20032003      if (newval > curval && (newval - curval) <= 4) newval += 4; // round up on increment
20042004      info.stream->set_user_gain(info.inputnum, (float)newval * 0.001f);
20052005   }
2006   if (string != NULL)
2007      string->printf("%4.2f", info.stream->user_gain(info.inputnum));
2006   if (str != NULL)
2007      str->printf("%4.2f", info.stream->user_gain(info.inputnum));
20082008   return floor(info.stream->user_gain(info.inputnum) * 1000.0f + 0.5f);
20092009}
20102010
r245648r245649
20142014//  callback
20152015//-------------------------------------------------
20162016
2017static INT32 slider_adjuster(running_machine &machine, void *arg, astring *string, INT32 newval)
2017static INT32 slider_adjuster(running_machine &machine, void *arg, astring *str, INT32 newval)
20182018{
20192019   ioport_field *field = (ioport_field *)arg;
20202020   ioport_field::user_settings settings;
r245648r245649
20252025      settings.value = newval;
20262026      field->set_user_settings(settings);
20272027   }
2028   if (string != NULL)
2029      string->printf("%d%%", settings.value);
2028   if (str != NULL)
2029      str->printf("%d%%", settings.value);
20302030   return settings.value;
20312031}
20322032
r245648r245649
20362036//  callback
20372037//-------------------------------------------------
20382038
2039static INT32 slider_overclock(running_machine &machine, void *arg, astring *string, INT32 newval)
2039static INT32 slider_overclock(running_machine &machine, void *arg, astring *str, INT32 newval)
20402040{
20412041   device_t *cpu = (device_t *)arg;
20422042   if (newval != SLIDER_NOCHANGE)
20432043      cpu->set_clock_scale((float)newval * 0.001f);
2044   if (string != NULL)
2045      string->printf("%3.0f%%", floor(cpu->clock_scale() * 100.0f + 0.5f));
2044   if (str != NULL)
2045      str->printf("%3.0f%%", floor(cpu->clock_scale() * 100.0f + 0.5f));
20462046   return floor(cpu->clock_scale() * 1000.0f + 0.5f);
20472047}
20482048
r245648r245649
20512051//  slider_refresh - refresh rate slider callback
20522052//-------------------------------------------------
20532053
2054static INT32 slider_refresh(running_machine &machine, void *arg, astring *string, INT32 newval)
2054static INT32 slider_refresh(running_machine &machine, void *arg, astring *str, INT32 newval)
20552055{
20562056   screen_device *screen = reinterpret_cast<screen_device *>(arg);
20572057   double defrefresh = ATTOSECONDS_TO_HZ(screen->refresh_attoseconds());
r245648r245649
20642064      const rectangle &visarea = screen->visible_area();
20652065      screen->configure(width, height, visarea, HZ_TO_ATTOSECONDS(defrefresh + (double)newval * 0.001));
20662066   }
2067   if (string != NULL)
2068      string->printf("%.3ffps", ATTOSECONDS_TO_HZ(machine.first_screen()->frame_period().attoseconds));
2067   if (str != NULL)
2068      str->printf("%.3ffps", ATTOSECONDS_TO_HZ(machine.first_screen()->frame_period().attoseconds));
20692069   refresh = ATTOSECONDS_TO_HZ(machine.first_screen()->frame_period().attoseconds);
20702070   return floor((refresh - defrefresh) * 1000.0f + 0.5f);
20712071}
r245648r245649
20762076//  callback
20772077//-------------------------------------------------
20782078
2079static INT32 slider_brightness(running_machine &machine, void *arg, astring *string, INT32 newval)
2079static INT32 slider_brightness(running_machine &machine, void *arg, astring *str, INT32 newval)
20802080{
20812081   screen_device *screen = reinterpret_cast<screen_device *>(arg);
20822082   render_container::user_settings settings;
r245648r245649
20872087      settings.m_brightness = (float)newval * 0.001f;
20882088      screen->container().set_user_settings(settings);
20892089   }
2090   if (string != NULL)
2091      string->printf("%.3f", settings.m_brightness);
2090   if (str != NULL)
2091      str->printf("%.3f", settings.m_brightness);
20922092   return floor(settings.m_brightness * 1000.0f + 0.5f);
20932093}
20942094
r245648r245649
20982098//  callback
20992099//-------------------------------------------------
21002100
2101static INT32 slider_contrast(running_machine &machine, void *arg, astring *string, INT32 newval)
2101static INT32 slider_contrast(running_machine &machine, void *arg, astring *str, INT32 newval)
21022102{
21032103   screen_device *screen = reinterpret_cast<screen_device *>(arg);
21042104   render_container::user_settings settings;
r245648r245649
21092109      settings.m_contrast = (float)newval * 0.001f;
21102110      screen->container().set_user_settings(settings);
21112111   }
2112   if (string != NULL)
2113      string->printf("%.3f", settings.m_contrast);
2112   if (str != NULL)
2113      str->printf("%.3f", settings.m_contrast);
21142114   return floor(settings.m_contrast * 1000.0f + 0.5f);
21152115}
21162116
r245648r245649
21192119//  slider_gamma - screen gamma slider callback
21202120//-------------------------------------------------
21212121
2122static INT32 slider_gamma(running_machine &machine, void *arg, astring *string, INT32 newval)
2122static INT32 slider_gamma(running_machine &machine, void *arg, astring *str, INT32 newval)
21232123{
21242124   screen_device *screen = reinterpret_cast<screen_device *>(arg);
21252125   render_container::user_settings settings;
r245648r245649
21302130      settings.m_gamma = (float)newval * 0.001f;
21312131      screen->container().set_user_settings(settings);
21322132   }
2133   if (string != NULL)
2134      string->printf("%.3f", settings.m_gamma);
2133   if (str != NULL)
2134      str->printf("%.3f", settings.m_gamma);
21352135   return floor(settings.m_gamma * 1000.0f + 0.5f);
21362136}
21372137
r245648r245649
21412141//  callback
21422142//-------------------------------------------------
21432143
2144static INT32 slider_xscale(running_machine &machine, void *arg, astring *string, INT32 newval)
2144static INT32 slider_xscale(running_machine &machine, void *arg, astring *str, INT32 newval)
21452145{
21462146   screen_device *screen = reinterpret_cast<screen_device *>(arg);
21472147   render_container::user_settings settings;
r245648r245649
21522152      settings.m_xscale = (float)newval * 0.001f;
21532153      screen->container().set_user_settings(settings);
21542154   }
2155   if (string != NULL)
2156      string->printf("%.3f", settings.m_xscale);
2155   if (str != NULL)
2156      str->printf("%.3f", settings.m_xscale);
21572157   return floor(settings.m_xscale * 1000.0f + 0.5f);
21582158}
21592159
r245648r245649
21632163//  callback
21642164//-------------------------------------------------
21652165
2166static INT32 slider_yscale(running_machine &machine, void *arg, astring *string, INT32 newval)
2166static INT32 slider_yscale(running_machine &machine, void *arg, astring *str, INT32 newval)
21672167{
21682168   screen_device *screen = reinterpret_cast<screen_device *>(arg);
21692169   render_container::user_settings settings;
r245648r245649
21742174      settings.m_yscale = (float)newval * 0.001f;
21752175      screen->container().set_user_settings(settings);
21762176   }
2177   if (string != NULL)
2178      string->printf("%.3f", settings.m_yscale);
2177   if (str != NULL)
2178      str->printf("%.3f", settings.m_yscale);
21792179   return floor(settings.m_yscale * 1000.0f + 0.5f);
21802180}
21812181
r245648r245649
21852185//  slider callback
21862186//-------------------------------------------------
21872187
2188static INT32 slider_xoffset(running_machine &machine, void *arg, astring *string, INT32 newval)
2188static INT32 slider_xoffset(running_machine &machine, void *arg, astring *str, INT32 newval)
21892189{
21902190   screen_device *screen = reinterpret_cast<screen_device *>(arg);
21912191   render_container::user_settings settings;
r245648r245649
21962196      settings.m_xoffset = (float)newval * 0.001f;
21972197      screen->container().set_user_settings(settings);
21982198   }
2199   if (string != NULL)
2200      string->printf("%.3f", settings.m_xoffset);
2199   if (str != NULL)
2200      str->printf("%.3f", settings.m_xoffset);
22012201   return floor(settings.m_xoffset * 1000.0f + 0.5f);
22022202}
22032203
r245648r245649
22072207//  slider callback
22082208//-------------------------------------------------
22092209
2210static INT32 slider_yoffset(running_machine &machine, void *arg, astring *string, INT32 newval)
2210static INT32 slider_yoffset(running_machine &machine, void *arg, astring *str, INT32 newval)
22112211{
22122212   screen_device *screen = reinterpret_cast<screen_device *>(arg);
22132213   render_container::user_settings settings;
r245648r245649
22182218      settings.m_yoffset = (float)newval * 0.001f;
22192219      screen->container().set_user_settings(settings);
22202220   }
2221   if (string != NULL)
2222      string->printf("%.3f", settings.m_yoffset);
2221   if (str != NULL)
2222      str->printf("%.3f", settings.m_yoffset);
22232223   return floor(settings.m_yoffset * 1000.0f + 0.5f);
22242224}
22252225
r245648r245649
22292229//  callback
22302230//-------------------------------------------------
22312231
2232static INT32 slider_overxscale(running_machine &machine, void *arg, astring *string, INT32 newval)
2232static INT32 slider_overxscale(running_machine &machine, void *arg, astring *str, INT32 newval)
22332233{
22342234   laserdisc_device *laserdisc = (laserdisc_device *)arg;
22352235   laserdisc_overlay_config settings;
r245648r245649
22402240      settings.m_overscalex = (float)newval * 0.001f;
22412241      laserdisc->set_overlay_config(settings);
22422242   }
2243   if (string != NULL)
2244      string->printf("%.3f", settings.m_overscalex);
2243   if (str != NULL)
2244      str->printf("%.3f", settings.m_overscalex);
22452245   return floor(settings.m_overscalex * 1000.0f + 0.5f);
22462246}
22472247
r245648r245649
22512251//  callback
22522252//-------------------------------------------------
22532253
2254static INT32 slider_overyscale(running_machine &machine, void *arg, astring *string, INT32 newval)
2254static INT32 slider_overyscale(running_machine &machine, void *arg, astring *str, INT32 newval)
22552255{
22562256   laserdisc_device *laserdisc = (laserdisc_device *)arg;
22572257   laserdisc_overlay_config settings;
r245648r245649
22622262      settings.m_overscaley = (float)newval * 0.001f;
22632263      laserdisc->set_overlay_config(settings);
22642264   }
2265   if (string != NULL)
2266      string->printf("%.3f", settings.m_overscaley);
2265   if (str != NULL)
2266      str->printf("%.3f", settings.m_overscaley);
22672267   return floor(settings.m_overscaley * 1000.0f + 0.5f);
22682268}
22692269
r245648r245649
22732273//  slider callback
22742274//-------------------------------------------------
22752275
2276static INT32 slider_overxoffset(running_machine &machine, void *arg, astring *string, INT32 newval)
2276static INT32 slider_overxoffset(running_machine &machine, void *arg, astring *str, INT32 newval)
22772277{
22782278   laserdisc_device *laserdisc = (laserdisc_device *)arg;
22792279   laserdisc_overlay_config settings;
r245648r245649
22842284      settings.m_overposx = (float)newval * 0.001f;
22852285      laserdisc->set_overlay_config(settings);
22862286   }
2287   if (string != NULL)
2288      string->printf("%.3f", settings.m_overposx);
2287   if (str != NULL)
2288      str->printf("%.3f", settings.m_overposx);
22892289   return floor(settings.m_overposx * 1000.0f + 0.5f);
22902290}
22912291
r245648r245649
22952295//  slider callback
22962296//-------------------------------------------------
22972297
2298static INT32 slider_overyoffset(running_machine &machine, void *arg, astring *string, INT32 newval)
2298static INT32 slider_overyoffset(running_machine &machine, void *arg, astring *str, INT32 newval)
22992299{
23002300   laserdisc_device *laserdisc = (laserdisc_device *)arg;
23012301   laserdisc_overlay_config settings;
r245648r245649
23062306      settings.m_overposy = (float)newval * 0.001f;
23072307      laserdisc->set_overlay_config(settings);
23082308   }
2309   if (string != NULL)
2310      string->printf("%.3f", settings.m_overposy);
2309   if (str != NULL)
2310      str->printf("%.3f", settings.m_overposy);
23112311   return floor(settings.m_overposy * 1000.0f + 0.5f);
23122312}
23132313
r245648r245649
23172317//  callback
23182318//-------------------------------------------------
23192319
2320static INT32 slider_flicker(running_machine &machine, void *arg, astring *string, INT32 newval)
2320static INT32 slider_flicker(running_machine &machine, void *arg, astring *str, INT32 newval)
23212321{
23222322   vector_device *vector = NULL;
23232323   if (newval != SLIDER_NOCHANGE)
23242324      vector->set_flicker((float)newval * 0.1f);
2325   if (string != NULL)
2326      string->printf("%1.2f", vector->get_flicker());
2325   if (str != NULL)
2326      str->printf("%1.2f", vector->get_flicker());
23272327   return floor(vector->get_flicker() * 10.0f + 0.5f);
23282328}
23292329
r245648r245649
23332333//  callback
23342334//-------------------------------------------------
23352335
2336static INT32 slider_beam(running_machine &machine, void *arg, astring *string, INT32 newval)
2336static INT32 slider_beam(running_machine &machine, void *arg, astring *str, INT32 newval)
23372337{
23382338   vector_device *vector = NULL;
23392339   if (newval != SLIDER_NOCHANGE)
23402340      vector->set_beam((float)newval * 0.01f);
2341   if (string != NULL)
2342      string->printf("%1.2f", vector->get_beam());
2341   if (str != NULL)
2342      str->printf("%1.2f", vector->get_beam());
23432343   return floor(vector->get_beam() * 100.0f + 0.5f);
23442344}
23452345
r245648r245649
23692369//-------------------------------------------------
23702370
23712371#ifdef MAME_DEBUG
2372static INT32 slider_crossscale(running_machine &machine, void *arg, astring *string, INT32 newval)
2372static INT32 slider_crossscale(running_machine &machine, void *arg, astring *str, INT32 newval)
23732373{
23742374   ioport_field *field = (ioport_field *)arg;
23752375
23762376   if (newval != SLIDER_NOCHANGE)
23772377      field->set_crosshair_scale(float(newval) * 0.001);
2378   if (string != NULL)
2379      string->printf("%s %s %1.3f", "Crosshair Scale", (field->crosshair_axis() == CROSSHAIR_AXIS_X) ? "X" : "Y", float(newval) * 0.001f);
2378   if (str != NULL)
2379      str->printf("%s %s %1.3f", "Crosshair Scale", (field->crosshair_axis() == CROSSHAIR_AXIS_X) ? "X" : "Y", float(newval) * 0.001f);
23802380   return floor(field->crosshair_scale() * 1000.0f + 0.5f);
23812381}
23822382#endif
r245648r245649
23882388//-------------------------------------------------
23892389
23902390#ifdef MAME_DEBUG
2391static INT32 slider_crossoffset(running_machine &machine, void *arg, astring *string, INT32 newval)
2391static INT32 slider_crossoffset(running_machine &machine, void *arg, astring *str, INT32 newval)
23922392{
23932393   ioport_field *field = (ioport_field *)arg;
23942394
23952395   if (newval != SLIDER_NOCHANGE)
23962396      field->set_crosshair_offset(float(newval) * 0.001f);
2397   if (string != NULL)
2398      string->printf("%s %s %1.3f", "Crosshair Offset", (field->crosshair_axis() == CROSSHAIR_AXIS_X) ? "X" : "Y", float(newval) * 0.001f);
2397   if (str != NULL)
2398      str->printf("%s %s %1.3f", "Crosshair Offset", (field->crosshair_axis() == CROSSHAIR_AXIS_X) ? "X" : "Y", float(newval) * 0.001f);
23992399   return field->crosshair_offset();
24002400}
24012401#endif
trunk/src/emu/ui/ui.h
r245648r245649
9393
9494typedef UINT32 (*ui_callback)(running_machine &, render_container *, UINT32);
9595
96typedef INT32 (*slider_update)(running_machine &machine, void *arg, astring *string, INT32 newval);
96typedef INT32 (*slider_update)(running_machine &machine, void *arg, astring *str, INT32 newval);
9797
9898struct slider_state
9999{
trunk/src/osd/modules/render/d3d/d3dhlsl.c
r245648r245649
23942394//  assorted global slider accessors
23952395//============================================================
23962396
2397static INT32 slider_set(float *option, float scale, const char *fmt, astring *string, INT32 newval)
2397static INT32 slider_set(float *option, float scale, const char *fmt, astring *str, INT32 newval)
23982398{
23992399   if (option != NULL && newval != SLIDER_NOCHANGE) *option = (float)newval * scale;
2400   if (string != NULL) string->printf(fmt, *option);
2400   if (str != NULL) str->printf(fmt, *option);
24012401   return floor(*option / scale + 0.5f);
24022402}
24032403
2404static INT32 slider_shadow_mask_alpha(running_machine &machine, void *arg, astring *string, INT32 newval)
2404static INT32 slider_shadow_mask_alpha(running_machine &machine, void *arg, astring *str, INT32 newval)
24052405{
2406   return slider_set(&(((hlsl_options*)arg)->shadow_mask_alpha), 0.01f, "%2.2f", string, newval);
2406   return slider_set(&(((hlsl_options*)arg)->shadow_mask_alpha), 0.01f, "%2.2f", str, newval);
24072407}
24082408
2409static INT32 slider_shadow_mask_x_count(running_machine &machine, void *arg, astring *string, INT32 newval)
2409static INT32 slider_shadow_mask_x_count(running_machine &machine, void *arg, astring *str, INT32 newval)
24102410{
24112411   hlsl_options *options = (hlsl_options*)arg;
24122412   if (newval != SLIDER_NOCHANGE) options->shadow_mask_count_x = newval;
2413   if (string != NULL) string->printf("%d", options->shadow_mask_count_x);
2413   if (str != NULL) str->printf("%d", options->shadow_mask_count_x);
24142414   options->params_dirty = true;
24152415   return options->shadow_mask_count_x;
24162416}
24172417
2418static INT32 slider_shadow_mask_y_count(running_machine &machine, void *arg, astring *string, INT32 newval)
2418static INT32 slider_shadow_mask_y_count(running_machine &machine, void *arg, astring *str, INT32 newval)
24192419{
24202420   hlsl_options *options = (hlsl_options*)arg;
24212421   if (newval != SLIDER_NOCHANGE) options->shadow_mask_count_y = newval;
2422   if (string != NULL) string->printf("%d", options->shadow_mask_count_y);
2422   if (str != NULL) str->printf("%d", options->shadow_mask_count_y);
24232423   options->params_dirty = true;
24242424   return options->shadow_mask_count_y;
24252425}
24262426
2427static INT32 slider_shadow_mask_usize(running_machine &machine, void *arg, astring *string, INT32 newval)
2427static INT32 slider_shadow_mask_usize(running_machine &machine, void *arg, astring *str, INT32 newval)
24282428{
24292429   ((hlsl_options*)arg)->params_dirty = true;
2430   return slider_set(&(((hlsl_options*)arg)->shadow_mask_u_size), 1.0f / 32.0f, "%2.5f", string, newval);
2430   return slider_set(&(((hlsl_options*)arg)->shadow_mask_u_size), 1.0f / 32.0f, "%2.5f", str, newval);
24312431}
24322432
2433static INT32 slider_shadow_mask_vsize(running_machine &machine, void *arg, astring *string, INT32 newval)
2433static INT32 slider_shadow_mask_vsize(running_machine &machine, void *arg, astring *str, INT32 newval)
24342434{
24352435   ((hlsl_options*)arg)->params_dirty = true;
2436   return slider_set(&(((hlsl_options*)arg)->shadow_mask_v_size), 1.0f / 32.0f, "%2.5f", string, newval);
2436   return slider_set(&(((hlsl_options*)arg)->shadow_mask_v_size), 1.0f / 32.0f, "%2.5f", str, newval);
24372437}
24382438
2439static INT32 slider_curvature(running_machine &machine, void *arg, astring *string, INT32 newval)
2439static INT32 slider_curvature(running_machine &machine, void *arg, astring *str, INT32 newval)
24402440{
24412441   ((hlsl_options*)arg)->params_dirty = true;
2442   return slider_set(&(((hlsl_options*)arg)->curvature), 0.01f, "%2.2f", string, newval);
2442   return slider_set(&(((hlsl_options*)arg)->curvature), 0.01f, "%2.2f", str, newval);
24432443}
24442444
2445static INT32 slider_pincushion(running_machine &machine, void *arg, astring *string, INT32 newval)
2445static INT32 slider_pincushion(running_machine &machine, void *arg, astring *str, INT32 newval)
24462446{
24472447   ((hlsl_options*)arg)->params_dirty = true;
2448   return slider_set(&(((hlsl_options*)arg)->pincushion), 0.01f, "%2.2f", string, newval);
2448   return slider_set(&(((hlsl_options*)arg)->pincushion), 0.01f, "%2.2f", str, newval);
24492449}
24502450
2451static INT32 slider_scanline_alpha(running_machine &machine, void *arg, astring *string, INT32 newval)
2451static INT32 slider_scanline_alpha(running_machine &machine, void *arg, astring *str, INT32 newval)
24522452{
24532453   ((hlsl_options*)arg)->params_dirty = true;
2454   return slider_set(&(((hlsl_options*)arg)->scanline_alpha), 0.01f, "%2.2f", string, newval);
2454   return slider_set(&(((hlsl_options*)arg)->scanline_alpha), 0.01f, "%2.2f", str, newval);
24552455}
24562456
2457static INT32 slider_scanline_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2457static INT32 slider_scanline_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
24582458{
24592459   ((hlsl_options*)arg)->params_dirty = true;
2460   return slider_set(&(((hlsl_options*)arg)->scanline_scale), 0.05f, "%2.2f", string, newval);
2460   return slider_set(&(((hlsl_options*)arg)->scanline_scale), 0.05f, "%2.2f", str, newval);
24612461}
24622462
2463static INT32 slider_scanline_height(running_machine &machine, void *arg, astring *string, INT32 newval)
2463static INT32 slider_scanline_height(running_machine &machine, void *arg, astring *str, INT32 newval)
24642464{
24652465   ((hlsl_options*)arg)->params_dirty = true;
2466   return slider_set(&(((hlsl_options*)arg)->scanline_height), 0.05f, "%2.2f", string, newval);
2466   return slider_set(&(((hlsl_options*)arg)->scanline_height), 0.05f, "%2.2f", str, newval);
24672467}
24682468
2469static INT32 slider_scanline_bright_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2469static INT32 slider_scanline_bright_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
24702470{
24712471   ((hlsl_options*)arg)->params_dirty = true;
2472   return slider_set(&(((hlsl_options*)arg)->scanline_bright_scale), 0.05f, "%2.2f", string, newval);
2472   return slider_set(&(((hlsl_options*)arg)->scanline_bright_scale), 0.05f, "%2.2f", str, newval);
24732473}
24742474
2475static INT32 slider_scanline_bright_offset(running_machine &machine, void *arg, astring *string, INT32 newval)
2475static INT32 slider_scanline_bright_offset(running_machine &machine, void *arg, astring *str, INT32 newval)
24762476{
24772477   ((hlsl_options*)arg)->params_dirty = true;
2478   return slider_set(&(((hlsl_options*)arg)->scanline_bright_offset), 0.05f, "%2.2f", string, newval);
2478   return slider_set(&(((hlsl_options*)arg)->scanline_bright_offset), 0.05f, "%2.2f", str, newval);
24792479}
24802480
2481static INT32 slider_scanline_offset(running_machine &machine, void *arg, astring *string, INT32 newval)
2481static INT32 slider_scanline_offset(running_machine &machine, void *arg, astring *str, INT32 newval)
24822482{
24832483   ((hlsl_options*)arg)->params_dirty = true;
2484   return slider_set(&(((hlsl_options*)arg)->scanline_offset), 0.05f, "%2.2f", string, newval);
2484   return slider_set(&(((hlsl_options*)arg)->scanline_offset), 0.05f, "%2.2f", str, newval);
24852485}
24862486
2487static INT32 slider_defocus_x(running_machine &machine, void *arg, astring *string, INT32 newval)
2487static INT32 slider_defocus_x(running_machine &machine, void *arg, astring *str, INT32 newval)
24882488{
24892489   ((hlsl_options*)arg)->params_dirty = true;
2490   return slider_set(&(((hlsl_options*)arg)->defocus[0]), 0.5f, "%2.1f", string, newval);
2490   return slider_set(&(((hlsl_options*)arg)->defocus[0]), 0.5f, "%2.1f", str, newval);
24912491}
24922492
2493static INT32 slider_defocus_y(running_machine &machine, void *arg, astring *string, INT32 newval)
2493static INT32 slider_defocus_y(running_machine &machine, void *arg, astring *str, INT32 newval)
24942494{
24952495   ((hlsl_options*)arg)->params_dirty = true;
2496   return slider_set(&(((hlsl_options*)arg)->defocus[1]), 0.5f, "%2.1f", string, newval);
2496   return slider_set(&(((hlsl_options*)arg)->defocus[1]), 0.5f, "%2.1f", str, newval);
24972497}
24982498
2499static INT32 slider_red_converge_x(running_machine &machine, void *arg, astring *string, INT32 newval)
2499static INT32 slider_red_converge_x(running_machine &machine, void *arg, astring *str, INT32 newval)
25002500{
25012501   ((hlsl_options*)arg)->params_dirty = true;
2502   return slider_set(&(((hlsl_options*)arg)->converge_x[0]), 0.1f, "%3.1f", string, newval);
2502   return slider_set(&(((hlsl_options*)arg)->converge_x[0]), 0.1f, "%3.1f", str, newval);
25032503}
25042504
2505static INT32 slider_red_converge_y(running_machine &machine, void *arg, astring *string, INT32 newval)
2505static INT32 slider_red_converge_y(running_machine &machine, void *arg, astring *str, INT32 newval)
25062506{
25072507   ((hlsl_options*)arg)->params_dirty = true;
2508   return slider_set(&(((hlsl_options*)arg)->converge_y[0]), 0.1f, "%3.1f", string, newval);
2508   return slider_set(&(((hlsl_options*)arg)->converge_y[0]), 0.1f, "%3.1f", str, newval);
25092509}
25102510
2511static INT32 slider_green_converge_x(running_machine &machine, void *arg, astring *string, INT32 newval)
2511static INT32 slider_green_converge_x(running_machine &machine, void *arg, astring *str, INT32 newval)
25122512{
25132513   ((hlsl_options*)arg)->params_dirty = true;
2514   return slider_set(&(((hlsl_options*)arg)->converge_x[1]), 0.1f, "%3.1f", string, newval);
2514   return slider_set(&(((hlsl_options*)arg)->converge_x[1]), 0.1f, "%3.1f", str, newval);
25152515}
25162516
2517static INT32 slider_green_converge_y(running_machine &machine, void *arg, astring *string, INT32 newval)
2517static INT32 slider_green_converge_y(running_machine &machine, void *arg, astring *str, INT32 newval)
25182518{
25192519   ((hlsl_options*)arg)->params_dirty = true;
2520   return slider_set(&(((hlsl_options*)arg)->converge_y[1]), 0.1f, "%3.1f", string, newval);
2520   return slider_set(&(((hlsl_options*)arg)->converge_y[1]), 0.1f, "%3.1f", str, newval);
25212521}
25222522
2523static INT32 slider_blue_converge_x(running_machine &machine, void *arg, astring *string, INT32 newval)
2523static INT32 slider_blue_converge_x(running_machine &machine, void *arg, astring *str, INT32 newval)
25242524{
25252525   ((hlsl_options*)arg)->params_dirty = true;
2526   return slider_set(&(((hlsl_options*)arg)->converge_x[2]), 0.1f, "%3.1f", string, newval);
2526   return slider_set(&(((hlsl_options*)arg)->converge_x[2]), 0.1f, "%3.1f", str, newval);
25272527}
25282528
2529static INT32 slider_blue_converge_y(running_machine &machine, void *arg, astring *string, INT32 newval)
2529static INT32 slider_blue_converge_y(running_machine &machine, void *arg, astring *str, INT32 newval)
25302530{
25312531   ((hlsl_options*)arg)->params_dirty = true;
2532   return slider_set(&(((hlsl_options*)arg)->converge_y[2]), 0.1f, "%3.1f", string, newval);
2532   return slider_set(&(((hlsl_options*)arg)->converge_y[2]), 0.1f, "%3.1f", str, newval);
25332533}
25342534
2535static INT32 slider_red_radial_converge_x(running_machine &machine, void *arg, astring *string, INT32 newval)
2535static INT32 slider_red_radial_converge_x(running_machine &machine, void *arg, astring *str, INT32 newval)
25362536{
25372537   ((hlsl_options*)arg)->params_dirty = true;
2538   return slider_set(&(((hlsl_options*)arg)->radial_converge_x[0]), 0.1f, "%3.1f", string, newval);
2538   return slider_set(&(((hlsl_options*)arg)->radial_converge_x[0]), 0.1f, "%3.1f", str, newval);
25392539}
25402540
2541static INT32 slider_red_radial_converge_y(running_machine &machine, void *arg, astring *string, INT32 newval)
2541static INT32 slider_red_radial_converge_y(running_machine &machine, void *arg, astring *str, INT32 newval)
25422542{
25432543   ((hlsl_options*)arg)->params_dirty = true;
2544   return slider_set(&(((hlsl_options*)arg)->radial_converge_y[0]), 0.1f, "%3.1f", string, newval);
2544   return slider_set(&(((hlsl_options*)arg)->radial_converge_y[0]), 0.1f, "%3.1f", str, newval);
25452545}
25462546
2547static INT32 slider_green_radial_converge_x(running_machine &machine, void *arg, astring *string, INT32 newval)
2547static INT32 slider_green_radial_converge_x(running_machine &machine, void *arg, astring *str, INT32 newval)
25482548{
25492549   ((hlsl_options*)arg)->params_dirty = true;
2550   return slider_set(&(((hlsl_options*)arg)->radial_converge_x[1]), 0.1f, "%3.1f", string, newval);
2550   return slider_set(&(((hlsl_options*)arg)->radial_converge_x[1]), 0.1f, "%3.1f", str, newval);
25512551}
25522552
2553static INT32 slider_green_radial_converge_y(running_machine &machine, void *arg, astring *string, INT32 newval)
2553static INT32 slider_green_radial_converge_y(running_machine &machine, void *arg, astring *str, INT32 newval)
25542554{
25552555   ((hlsl_options*)arg)->params_dirty = true;
2556   return slider_set(&(((hlsl_options*)arg)->radial_converge_y[1]), 0.1f, "%3.1f", string, newval);
2556   return slider_set(&(((hlsl_options*)arg)->radial_converge_y[1]), 0.1f, "%3.1f", str, newval);
25572557}
25582558
2559static INT32 slider_blue_radial_converge_x(running_machine &machine, void *arg, astring *string, INT32 newval)
2559static INT32 slider_blue_radial_converge_x(running_machine &machine, void *arg, astring *str, INT32 newval)
25602560{
25612561   ((hlsl_options*)arg)->params_dirty = true;
2562   return slider_set(&(((hlsl_options*)arg)->radial_converge_x[2]), 0.1f, "%3.1f", string, newval);
2562   return slider_set(&(((hlsl_options*)arg)->radial_converge_x[2]), 0.1f, "%3.1f", str, newval);
25632563}
25642564
2565static INT32 slider_blue_radial_converge_y(running_machine &machine, void *arg, astring *string, INT32 newval)
2565static INT32 slider_blue_radial_converge_y(running_machine &machine, void *arg, astring *str, INT32 newval)
25662566{
25672567   ((hlsl_options*)arg)->params_dirty = true;
2568   return slider_set(&(((hlsl_options*)arg)->radial_converge_y[2]), 0.1f, "%3.1f", string, newval);
2568   return slider_set(&(((hlsl_options*)arg)->radial_converge_y[2]), 0.1f, "%3.1f", str, newval);
25692569}
25702570
2571static INT32 slider_red_from_r(running_machine &machine, void *arg, astring *string, INT32 newval)
2571static INT32 slider_red_from_r(running_machine &machine, void *arg, astring *str, INT32 newval)
25722572{
25732573   ((hlsl_options*)arg)->params_dirty = true;
2574   return slider_set(&(((hlsl_options*)arg)->red_ratio[0]), 0.005f, "%2.3f", string, newval);
2574   return slider_set(&(((hlsl_options*)arg)->red_ratio[0]), 0.005f, "%2.3f", str, newval);
25752575}
25762576
2577static INT32 slider_red_from_g(running_machine &machine, void *arg, astring *string, INT32 newval)
2577static INT32 slider_red_from_g(running_machine &machine, void *arg, astring *str, INT32 newval)
25782578{
25792579   ((hlsl_options*)arg)->params_dirty = true;
2580   return slider_set(&(((hlsl_options*)arg)->red_ratio[1]), 0.005f, "%2.3f", string, newval);
2580   return slider_set(&(((hlsl_options*)arg)->red_ratio[1]), 0.005f, "%2.3f", str, newval);
25812581}
25822582
2583static INT32 slider_red_from_b(running_machine &machine, void *arg, astring *string, INT32 newval)
2583static INT32 slider_red_from_b(running_machine &machine, void *arg, astring *str, INT32 newval)
25842584{
25852585   ((hlsl_options*)arg)->params_dirty = true;
2586   return slider_set(&(((hlsl_options*)arg)->red_ratio[2]), 0.005f, "%2.3f", string, newval);
2586   return slider_set(&(((hlsl_options*)arg)->red_ratio[2]), 0.005f, "%2.3f", str, newval);
25872587}
25882588
2589static INT32 slider_green_from_r(running_machine &machine, void *arg, astring *string, INT32 newval)
2589static INT32 slider_green_from_r(running_machine &machine, void *arg, astring *str, INT32 newval)
25902590{
25912591   ((hlsl_options*)arg)->params_dirty = true;
2592   return slider_set(&(((hlsl_options*)arg)->grn_ratio[0]), 0.005f, "%2.3f", string, newval);
2592   return slider_set(&(((hlsl_options*)arg)->grn_ratio[0]), 0.005f, "%2.3f", str, newval);
25932593}
25942594
2595static INT32 slider_green_from_g(running_machine &machine, void *arg, astring *string, INT32 newval)
2595static INT32 slider_green_from_g(running_machine &machine, void *arg, astring *str, INT32 newval)
25962596{
25972597   ((hlsl_options*)arg)->params_dirty = true;
2598   return slider_set(&(((hlsl_options*)arg)->grn_ratio[1]), 0.005f, "%2.3f", string, newval);
2598   return slider_set(&(((hlsl_options*)arg)->grn_ratio[1]), 0.005f, "%2.3f", str, newval);
25992599}
26002600
2601static INT32 slider_green_from_b(running_machine &machine, void *arg, astring *string, INT32 newval)
2601static INT32 slider_green_from_b(running_machine &machine, void *arg, astring *str, INT32 newval)
26022602{
26032603   ((hlsl_options*)arg)->params_dirty = true;
2604   return slider_set(&(((hlsl_options*)arg)->grn_ratio[2]), 0.005f, "%2.3f", string, newval);
2604   return slider_set(&(((hlsl_options*)arg)->grn_ratio[2]), 0.005f, "%2.3f", str, newval);
26052605}
26062606
2607static INT32 slider_blue_from_r(running_machine &machine, void *arg, astring *string, INT32 newval)
2607static INT32 slider_blue_from_r(running_machine &machine, void *arg, astring *str, INT32 newval)
26082608{
26092609   ((hlsl_options*)arg)->params_dirty = true;
2610   return slider_set(&(((hlsl_options*)arg)->blu_ratio[0]), 0.005f, "%2.3f", string, newval);
2610   return slider_set(&(((hlsl_options*)arg)->blu_ratio[0]), 0.005f, "%2.3f", str, newval);
26112611}
26122612
2613static INT32 slider_blue_from_g(running_machine &machine, void *arg, astring *string, INT32 newval)
2613static INT32 slider_blue_from_g(running_machine &machine, void *arg, astring *str, INT32 newval)
26142614{
26152615   ((hlsl_options*)arg)->params_dirty = true;
2616   return slider_set(&(((hlsl_options*)arg)->blu_ratio[1]), 0.005f, "%2.3f", string, newval);
2616   return slider_set(&(((hlsl_options*)arg)->blu_ratio[1]), 0.005f, "%2.3f", str, newval);
26172617}
26182618
2619static INT32 slider_blue_from_b(running_machine &machine, void *arg, astring *string, INT32 newval)
2619static INT32 slider_blue_from_b(running_machine &machine, void *arg, astring *str, INT32 newval)
26202620{
26212621   ((hlsl_options*)arg)->params_dirty = true;
2622   return slider_set(&(((hlsl_options*)arg)->blu_ratio[2]), 0.005f, "%2.3f", string, newval);
2622   return slider_set(&(((hlsl_options*)arg)->blu_ratio[2]), 0.005f, "%2.3f", str, newval);
26232623}
26242624
2625static INT32 slider_red_offset(running_machine &machine, void *arg, astring *string, INT32 newval)
2625static INT32 slider_red_offset(running_machine &machine, void *arg, astring *str, INT32 newval)
26262626{
26272627   ((hlsl_options*)arg)->params_dirty = true;
2628   return slider_set(&(((hlsl_options*)arg)->offset[0]), 0.01f, "%2.2f", string, newval);
2628   return slider_set(&(((hlsl_options*)arg)->offset[0]), 0.01f, "%2.2f", str, newval);
26292629}
26302630
2631static INT32 slider_green_offset(running_machine &machine, void *arg, astring *string, INT32 newval)
2631static INT32 slider_green_offset(running_machine &machine, void *arg, astring *str, INT32 newval)
26322632{
26332633   ((hlsl_options*)arg)->params_dirty = true;
2634   return slider_set(&(((hlsl_options*)arg)->offset[1]), 0.01f, "%2.2f", string, newval);
2634   return slider_set(&(((hlsl_options*)arg)->offset[1]), 0.01f, "%2.2f", str, newval);
26352635}
26362636
2637static INT32 slider_blue_offset(running_machine &machine, void *arg, astring *string, INT32 newval)
2637static INT32 slider_blue_offset(running_machine &machine, void *arg, astring *str, INT32 newval)
26382638{
26392639   ((hlsl_options*)arg)->params_dirty = true;
2640   return slider_set(&(((hlsl_options*)arg)->offset[2]), 0.01f, "%2.2f", string, newval);
2640   return slider_set(&(((hlsl_options*)arg)->offset[2]), 0.01f, "%2.2f", str, newval);
26412641}
26422642
2643static INT32 slider_red_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2643static INT32 slider_red_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
26442644{
26452645   ((hlsl_options*)arg)->params_dirty = true;
2646   return slider_set(&(((hlsl_options*)arg)->scale[0]), 0.01f, "%2.2f", string, newval);
2646   return slider_set(&(((hlsl_options*)arg)->scale[0]), 0.01f, "%2.2f", str, newval);
26472647}
26482648
2649static INT32 slider_green_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2649static INT32 slider_green_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
26502650{
26512651   ((hlsl_options*)arg)->params_dirty = true;
2652   return slider_set(&(((hlsl_options*)arg)->scale[1]), 0.01f, "%2.2f", string, newval);
2652   return slider_set(&(((hlsl_options*)arg)->scale[1]), 0.01f, "%2.2f", str, newval);
26532653}
26542654
2655static INT32 slider_blue_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2655static INT32 slider_blue_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
26562656{
26572657   ((hlsl_options*)arg)->params_dirty = true;
2658   return slider_set(&(((hlsl_options*)arg)->scale[2]), 0.01f, "%2.2f", string, newval);
2658   return slider_set(&(((hlsl_options*)arg)->scale[2]), 0.01f, "%2.2f", str, newval);
26592659}
26602660
2661static INT32 slider_red_power(running_machine &machine, void *arg, astring *string, INT32 newval)
2661static INT32 slider_red_power(running_machine &machine, void *arg, astring *str, INT32 newval)
26622662{
26632663   ((hlsl_options*)arg)->params_dirty = true;
2664   return slider_set(&(((hlsl_options*)arg)->power[0]), 0.05f, "%2.2f", string, newval);
2664   return slider_set(&(((hlsl_options*)arg)->power[0]), 0.05f, "%2.2f", str, newval);
26652665}
26662666
2667static INT32 slider_green_power(running_machine &machine, void *arg, astring *string, INT32 newval)
2667static INT32 slider_green_power(running_machine &machine, void *arg, astring *str, INT32 newval)
26682668{
26692669   ((hlsl_options*)arg)->params_dirty = true;
2670   return slider_set(&(((hlsl_options*)arg)->power[1]), 0.05f, "%2.2f", string, newval);
2670   return slider_set(&(((hlsl_options*)arg)->power[1]), 0.05f, "%2.2f", str, newval);
26712671}
26722672
2673static INT32 slider_blue_power(running_machine &machine, void *arg, astring *string, INT32 newval)
2673static INT32 slider_blue_power(running_machine &machine, void *arg, astring *str, INT32 newval)
26742674{
26752675   ((hlsl_options*)arg)->params_dirty = true;
2676   return slider_set(&(((hlsl_options*)arg)->power[2]), 0.05f, "%2.2f", string, newval);
2676   return slider_set(&(((hlsl_options*)arg)->power[2]), 0.05f, "%2.2f", str, newval);
26772677}
26782678
2679static INT32 slider_red_floor(running_machine &machine, void *arg, astring *string, INT32 newval)
2679static INT32 slider_red_floor(running_machine &machine, void *arg, astring *str, INT32 newval)
26802680{
26812681   ((hlsl_options*)arg)->params_dirty = true;
2682   return slider_set(&(((hlsl_options*)arg)->floor[0]), 0.01f, "%2.2f", string, newval);
2682   return slider_set(&(((hlsl_options*)arg)->floor[0]), 0.01f, "%2.2f", str, newval);
26832683}
26842684
2685static INT32 slider_green_floor(running_machine &machine, void *arg, astring *string, INT32 newval)
2685static INT32 slider_green_floor(running_machine &machine, void *arg, astring *str, INT32 newval)
26862686{
26872687   ((hlsl_options*)arg)->params_dirty = true;
2688   return slider_set(&(((hlsl_options*)arg)->floor[1]), 0.01f, "%2.2f", string, newval);
2688   return slider_set(&(((hlsl_options*)arg)->floor[1]), 0.01f, "%2.2f", str, newval);
26892689}
26902690
2691static INT32 slider_blue_floor(running_machine &machine, void *arg, astring *string, INT32 newval)
2691static INT32 slider_blue_floor(running_machine &machine, void *arg, astring *str, INT32 newval)
26922692{
26932693   ((hlsl_options*)arg)->params_dirty = true;
2694   return slider_set(&(((hlsl_options*)arg)->floor[2]), 0.01f, "%2.2f", string, newval);
2694   return slider_set(&(((hlsl_options*)arg)->floor[2]), 0.01f, "%2.2f", str, newval);
26952695}
26962696
2697static INT32 slider_red_phosphor_life(running_machine &machine, void *arg, astring *string, INT32 newval)
2697static INT32 slider_red_phosphor_life(running_machine &machine, void *arg, astring *str, INT32 newval)
26982698{
26992699   ((hlsl_options*)arg)->params_dirty = true;
2700   return slider_set(&(((hlsl_options*)arg)->phosphor[0]), 0.01f, "%2.2f", string, newval);
2700   return slider_set(&(((hlsl_options*)arg)->phosphor[0]), 0.01f, "%2.2f", str, newval);
27012701}
27022702
2703static INT32 slider_green_phosphor_life(running_machine &machine, void *arg, astring *string, INT32 newval)
2703static INT32 slider_green_phosphor_life(running_machine &machine, void *arg, astring *str, INT32 newval)
27042704{
27052705   ((hlsl_options*)arg)->params_dirty = true;
2706   return slider_set(&(((hlsl_options*)arg)->phosphor[1]), 0.01f, "%2.2f", string, newval);
2706   return slider_set(&(((hlsl_options*)arg)->phosphor[1]), 0.01f, "%2.2f", str, newval);
27072707}
27082708
2709static INT32 slider_blue_phosphor_life(running_machine &machine, void *arg, astring *string, INT32 newval)
2709static INT32 slider_blue_phosphor_life(running_machine &machine, void *arg, astring *str, INT32 newval)
27102710{
27112711   ((hlsl_options*)arg)->params_dirty = true;
2712   return slider_set(&(((hlsl_options*)arg)->phosphor[2]), 0.01f, "%2.2f", string, newval);
2712   return slider_set(&(((hlsl_options*)arg)->phosphor[2]), 0.01f, "%2.2f", str, newval);
27132713}
27142714
2715static INT32 slider_saturation(running_machine &machine, void *arg, astring *string, INT32 newval)
2715static INT32 slider_saturation(running_machine &machine, void *arg, astring *str, INT32 newval)
27162716{
27172717   ((hlsl_options*)arg)->params_dirty = true;
2718   return slider_set(&(((hlsl_options*)arg)->saturation), 0.01f, "%2.2f", string, newval);
2718   return slider_set(&(((hlsl_options*)arg)->saturation), 0.01f, "%2.2f", str, newval);
27192719}
27202720
2721static INT32 slider_vector_attenuation(running_machine &machine, void *arg, astring *string, INT32 newval)
2721static INT32 slider_vector_attenuation(running_machine &machine, void *arg, astring *str, INT32 newval)
27222722{
27232723   ((hlsl_options*)arg)->params_dirty = true;
2724   return slider_set(&(((hlsl_options*)arg)->vector_length_scale), 0.01f, "%1.2f", string, newval);
2724   return slider_set(&(((hlsl_options*)arg)->vector_length_scale), 0.01f, "%1.2f", str, newval);
27252725}
27262726
2727static INT32 slider_vector_length_max(running_machine &machine, void *arg, astring *string, INT32 newval)
2727static INT32 slider_vector_length_max(running_machine &machine, void *arg, astring *str, INT32 newval)
27282728{
27292729   ((hlsl_options*)arg)->params_dirty = true;
2730   return slider_set(&(((hlsl_options*)arg)->vector_length_ratio), 1.0f, "%4f", string, newval);
2730   return slider_set(&(((hlsl_options*)arg)->vector_length_ratio), 1.0f, "%4f", str, newval);
27312731}
27322732
2733static INT32 slider_vector_bloom_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2733static INT32 slider_vector_bloom_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
27342734{
27352735   ((hlsl_options*)arg)->params_dirty = true;
2736   return slider_set(&(((hlsl_options*)arg)->vector_bloom_scale), 0.001f, "%1.3f", string, newval);
2736   return slider_set(&(((hlsl_options*)arg)->vector_bloom_scale), 0.001f, "%1.3f", str, newval);
27372737}
27382738
2739static INT32 slider_raster_bloom_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2739static INT32 slider_raster_bloom_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
27402740{
27412741   ((hlsl_options*)arg)->params_dirty = true;
2742   return slider_set(&(((hlsl_options*)arg)->raster_bloom_scale), 0.001f, "%1.3f", string, newval);
2742   return slider_set(&(((hlsl_options*)arg)->raster_bloom_scale), 0.001f, "%1.3f", str, newval);
27432743}
27442744
2745static INT32 slider_bloom_lvl0_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2745static INT32 slider_bloom_lvl0_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
27462746{
27472747   ((hlsl_options*)arg)->params_dirty = true;
2748   return slider_set(&(((hlsl_options*)arg)->bloom_level0_weight), 0.01f, "%1.2f", string, newval);
2748   return slider_set(&(((hlsl_options*)arg)->bloom_level0_weight), 0.01f, "%1.2f", str, newval);
27492749}
27502750
2751static INT32 slider_bloom_lvl1_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2751static INT32 slider_bloom_lvl1_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
27522752{
27532753   ((hlsl_options*)arg)->params_dirty = true;
2754   return slider_set(&(((hlsl_options*)arg)->bloom_level1_weight), 0.01f, "%1.2f", string, newval);
2754   return slider_set(&(((hlsl_options*)arg)->bloom_level1_weight), 0.01f, "%1.2f", str, newval);
27552755}
27562756
2757static INT32 slider_bloom_lvl2_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2757static INT32 slider_bloom_lvl2_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
27582758{
27592759   ((hlsl_options*)arg)->params_dirty = true;
2760   return slider_set(&(((hlsl_options*)arg)->bloom_level2_weight), 0.01f, "%1.2f", string, newval);
2760   return slider_set(&(((hlsl_options*)arg)->bloom_level2_weight), 0.01f, "%1.2f", str, newval);
27612761}
27622762
2763static INT32 slider_bloom_lvl3_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2763static INT32 slider_bloom_lvl3_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
27642764{
27652765   ((hlsl_options*)arg)->params_dirty = true;
2766   return slider_set(&(((hlsl_options*)arg)->bloom_level3_weight), 0.01f, "%1.2f", string, newval);
2766   return slider_set(&(((hlsl_options*)arg)->bloom_level3_weight), 0.01f, "%1.2f", str, newval);
27672767}
27682768
2769static INT32 slider_bloom_lvl4_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2769static INT32 slider_bloom_lvl4_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
27702770{
27712771   ((hlsl_options*)arg)->params_dirty = true;
2772   return slider_set(&(((hlsl_options*)arg)->bloom_level4_weight), 0.01f, "%1.2f", string, newval);
2772   return slider_set(&(((hlsl_options*)arg)->bloom_level4_weight), 0.01f, "%1.2f", str, newval);
27732773}
27742774
2775static INT32 slider_bloom_lvl5_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2775static INT32 slider_bloom_lvl5_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
27762776{
27772777   ((hlsl_options*)arg)->params_dirty = true;
2778   return slider_set(&(((hlsl_options*)arg)->bloom_level5_weight), 0.01f, "%1.2f", string, newval);
2778   return slider_set(&(((hlsl_options*)arg)->bloom_level5_weight), 0.01f, "%1.2f", str, newval);
27792779}
27802780
2781static INT32 slider_bloom_lvl6_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2781static INT32 slider_bloom_lvl6_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
27822782{
27832783   ((hlsl_options*)arg)->params_dirty = true;
2784   return slider_set(&(((hlsl_options*)arg)->bloom_level6_weight), 0.01f, "%1.2f", string, newval);
2784   return slider_set(&(((hlsl_options*)arg)->bloom_level6_weight), 0.01f, "%1.2f", str, newval);
27852785}
27862786
2787static INT32 slider_bloom_lvl7_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2787static INT32 slider_bloom_lvl7_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
27882788{
27892789   ((hlsl_options*)arg)->params_dirty = true;
2790   return slider_set(&(((hlsl_options*)arg)->bloom_level7_weight), 0.01f, "%1.2f", string, newval);
2790   return slider_set(&(((hlsl_options*)arg)->bloom_level7_weight), 0.01f, "%1.2f", str, newval);
27912791}
27922792
2793static INT32 slider_bloom_lvl8_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2793static INT32 slider_bloom_lvl8_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
27942794{
27952795   ((hlsl_options*)arg)->params_dirty = true;
2796   return slider_set(&(((hlsl_options*)arg)->bloom_level8_weight), 0.01f, "%1.2f", string, newval);
2796   return slider_set(&(((hlsl_options*)arg)->bloom_level8_weight), 0.01f, "%1.2f", str, newval);
27972797}
27982798
2799static INT32 slider_bloom_lvl9_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2799static INT32 slider_bloom_lvl9_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
28002800{
28012801   ((hlsl_options*)arg)->params_dirty = true;
2802   return slider_set(&(((hlsl_options*)arg)->bloom_level9_weight), 0.01f, "%1.2f", string, newval);
2802   return slider_set(&(((hlsl_options*)arg)->bloom_level9_weight), 0.01f, "%1.2f", str, newval);
28032803}
28042804
2805static INT32 slider_bloom_lvl10_scale(running_machine &machine, void *arg, astring *string, INT32 newval)
2805static INT32 slider_bloom_lvl10_scale(running_machine &machine, void *arg, astring *str, INT32 newval)
28062806{
28072807   ((hlsl_options*)arg)->params_dirty = true;
2808   return slider_set(&(((hlsl_options*)arg)->bloom_level10_weight), 0.01f, "%1.2f", string, newval);
2808   return slider_set(&(((hlsl_options*)arg)->bloom_level10_weight), 0.01f, "%1.2f", str, newval);
28092809}
28102810
28112811//============================================================

https://github.com/mamedev/mame/commit/f2243d602081b2f5ccf5b1dfe0e9530e30567a2a

Previous 199869 Revisions Next

© 1997-2024 The MAME Team