← Back to branch summary

~ubuntu-branches/debian/sid/mame/sid

« back to all changes in this revision

Viewing changes to src/emu/sound/msm5232.c

  • Committer: Bazaar Package Importer
  • Author(s): Jordi Mallach, Emmanuel Kasper, Félix Arreola Rodríguez, Jordi Mallach
  • Date: 2011-05-11 21:06:50 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110511210650-jizvh8a6x117y9hr
Tags: 0.142-1
[ Emmanuel Kasper ]
* New upstream release
* Set NOWERROR=1 to allow compiling with gcc-4.6
* Remove fix_powerpc_build.patch, as upstream has taken it in this release
* Add gnome-video-arcade front end as a suggested package

[ Félix Arreola Rodríguez ]
* Add kfreebsd-build.patch to quilt series, to fix build on kfreebsd

[ Jordi Mallach ]
* Remove unneeded and bogus addition of --with-quilt to the dh invocation.
* Add Cesare Falco (long time Ubuntu maintainer) to Uploaders, and wrap
  them into multiple lines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/emu/sound/msm5232.c
1
1
#include "emu.h"
2
 
#include "streams.h"
3
2
 
4
3
#include "msm5232.h"
5
4
 
345
344
        if (offset > 0x0d)
346
345
                return;
347
346
 
348
 
        stream_update (chip->stream);
 
347
        chip->stream->update ();
349
348
 
350
349
        if (offset < 0x08) /* pitch */
351
350
        {
797
796
 
798
797
        msm5232_init(chip, intf, device->clock(), rate);
799
798
 
800
 
        chip->stream = stream_create(device, 0, 11, rate, chip, MSM5232_update_one);
 
799
        chip->stream = device->machine().sound().stream_alloc(*device, 0, 11, rate, chip, MSM5232_update_one);
801
800
 
802
801
        /* register with the save state system */
803
 
        state_save_register_postload(device->machine, msm5232_postload, chip);
804
 
        state_save_register_device_item_array(device, 0, chip->EN_out16);
805
 
        state_save_register_device_item_array(device, 0, chip->EN_out8);
806
 
        state_save_register_device_item_array(device, 0, chip->EN_out4);
807
 
        state_save_register_device_item_array(device, 0, chip->EN_out2);
808
 
        state_save_register_device_item(device, 0, chip->noise_cnt);
809
 
        state_save_register_device_item(device, 0, chip->noise_rng);
810
 
        state_save_register_device_item(device, 0, chip->noise_clocks);
811
 
        state_save_register_device_item(device, 0, chip->control1);
812
 
        state_save_register_device_item(device, 0, chip->control2);
813
 
        state_save_register_device_item(device, 0, chip->gate);
814
 
        state_save_register_device_item(device, 0, chip->clock);
815
 
        state_save_register_device_item(device, 0, chip->rate);
 
802
        device->machine().state().register_postload(msm5232_postload, chip);
 
803
        device->save_item(NAME(chip->EN_out16));
 
804
        device->save_item(NAME(chip->EN_out8));
 
805
        device->save_item(NAME(chip->EN_out4));
 
806
        device->save_item(NAME(chip->EN_out2));
 
807
        device->save_item(NAME(chip->noise_cnt));
 
808
        device->save_item(NAME(chip->noise_rng));
 
809
        device->save_item(NAME(chip->noise_clocks));
 
810
        device->save_item(NAME(chip->control1));
 
811
        device->save_item(NAME(chip->control2));
 
812
        device->save_item(NAME(chip->gate));
 
813
        device->save_item(NAME(chip->clock));
 
814
        device->save_item(NAME(chip->rate));
816
815
 
817
816
        /* register voice-specific data for save states */
818
817
        for (voicenum = 0; voicenum < 8; voicenum++)
819
818
        {
820
819
                VOICE *voice = &chip->voi[voicenum];
821
820
 
822
 
                state_save_register_device_item(device, voicenum, voice->mode);
823
 
                state_save_register_device_item(device, voicenum, voice->TG_count_period);
824
 
                state_save_register_device_item(device, voicenum, voice->TG_cnt);
825
 
                state_save_register_device_item(device, voicenum, voice->TG_out16);
826
 
                state_save_register_device_item(device, voicenum, voice->TG_out8);
827
 
                state_save_register_device_item(device, voicenum, voice->TG_out4);
828
 
                state_save_register_device_item(device, voicenum, voice->TG_out2);
829
 
                state_save_register_device_item(device, voicenum, voice->egvol);
830
 
                state_save_register_device_item(device, voicenum, voice->eg_sect);
831
 
                state_save_register_device_item(device, voicenum, voice->counter);
832
 
                state_save_register_device_item(device, voicenum, voice->eg);
833
 
                state_save_register_device_item(device, voicenum, voice->eg_arm);
834
 
                state_save_register_device_item(device, voicenum, voice->ar_rate);
835
 
                state_save_register_device_item(device, voicenum, voice->dr_rate);
836
 
                state_save_register_device_item(device, voicenum, voice->pitch);
837
 
                state_save_register_device_item(device, voicenum, voice->GF);
 
821
                device->save_item(NAME(voice->mode), voicenum);
 
822
                device->save_item(NAME(voice->TG_count_period), voicenum);
 
823
                device->save_item(NAME(voice->TG_cnt), voicenum);
 
824
                device->save_item(NAME(voice->TG_out16), voicenum);
 
825
                device->save_item(NAME(voice->TG_out8), voicenum);
 
826
                device->save_item(NAME(voice->TG_out4), voicenum);
 
827
                device->save_item(NAME(voice->TG_out2), voicenum);
 
828
                device->save_item(NAME(voice->egvol), voicenum);
 
829
                device->save_item(NAME(voice->eg_sect), voicenum);
 
830
                device->save_item(NAME(voice->counter), voicenum);
 
831
                device->save_item(NAME(voice->eg), voicenum);
 
832
                device->save_item(NAME(voice->eg_arm), voicenum);
 
833
                device->save_item(NAME(voice->ar_rate), voicenum);
 
834
                device->save_item(NAME(voice->dr_rate), voicenum);
 
835
                device->save_item(NAME(voice->pitch), voicenum);
 
836
                device->save_item(NAME(voice->GF), voicenum);
838
837
        }
839
838
}
840
839
 
844
843
 
845
844
        if (chip->clock != clock)
846
845
        {
847
 
                stream_update (chip->stream);
 
846
                chip->stream->update ();
848
847
                chip->clock = clock;
849
848
                chip->rate = clock/CLOCK_RATE_DIVIDER;
850
849
                msm5232_init_tables( chip );
851
 
                stream_set_sample_rate(chip->stream, chip->rate);
 
850
                chip->stream->set_sample_rate(chip->rate);
852
851
        }
853
852
}
854
853