← Back to branch summary

~ubuntu-branches/ubuntu/lucid/sdlmame/lucid

« back to all changes in this revision

Viewing changes to src/emu/streams.c

  • Committer: Bazaar Package Importer
  • Author(s): Cesare Falco
  • Date: 2009-11-03 17:10:15 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20091103171015-6hop4ory5lxnumpn
Tags: 0.135-0ubuntu1
https://launchpad.net/bugs/403212
* New upstream release - Closes (LP: #403212)
* debian/watch: unstable releases are no longer detected
* mame.ini: added the cheat subdirectories to cheatpath so zipped
  cheatfiles will be searched too
* renamed crsshair subdirectory to crosshair to reflect upstream change
* mame.ini: renamed references to crosshair subdirectory (see above)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/emu/streams.c
222
222
 
223
223
        /* reset globals */
224
224
        strdata->stream_tailptr = &strdata->stream_head;
225
 
        strdata->update_attoseconds = STREAMS_UPDATE_FREQUENCY.attoseconds;
 
225
        strdata->update_attoseconds = STREAMS_UPDATE_ATTOTIME.attoseconds;
226
226
 
227
227
        /* set the global pointer */
228
228
        machine->streams_data = strdata;
507
507
        INT32 update_sampindex = time_to_sampindex(strdata, stream, timer_get_time(machine));
508
508
 
509
509
        /* generate samples to get us up to the appropriate time */
510
 
        profiler_mark(PROFILER_SOUND);
 
510
        profiler_mark_start(PROFILER_SOUND);
511
511
        assert(stream->output_sampindex - stream->output_base_sampindex >= 0);
512
512
        assert(update_sampindex - stream->output_base_sampindex <= stream->output_bufalloc);
513
513
        generate_samples(stream, update_sampindex - stream->output_sampindex);
514
 
        profiler_mark(PROFILER_END);
 
514
        profiler_mark_end();
515
515
 
516
516
        /* remember this info for next time */
517
517
        stream->output_sampindex = update_sampindex;