← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mame/audio/senjyo.c

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach, Emmanuel Kasper, Jordi Mallach
  • Date: 2012-06-05 20:02:23 UTC
  • mfrom: (0.3.1) (0.1.4)
  • Revision ID: package-import@ubuntu.com-20120605200223-gnlpogjrg6oqe9md
Tags: 0.146-1
[ Emmanuel Kasper ]
* New upstream release
* Drop patch to fix man pages section and patches to link with flac 
  and jpeg system lib: all this has been pushed upstream by Cesare Falco
* Add DM-Upload-Allowed: yes field.

[ Jordi Mallach ]
* Create a "gnu" TARGETOS stanza that defines NO_AFFINITY_NP.
* Stop setting TARGETOS to "unix" in d/rules. It should be autodetected,
  and set to the appropriate value.
* mame_manpage_section.patch: Change mame's manpage section to 6 (games),
  in the TH declaration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mame/audio/senjyo.c
46
46
};
47
47
 
48
48
 
49
 
WRITE8_HANDLER( senjyo_volume_w )
 
49
WRITE8_MEMBER(senjyo_state::senjyo_volume_w)
50
50
{
51
 
        senjyo_state *state = space->machine().driver_data<senjyo_state>();
52
 
        samples_device *samples = space->machine().device<samples_device>("samples");
 
51
        samples_device *samples = machine().device<samples_device>("samples");
53
52
 
54
 
        state->m_single_volume = data & 0x0f;
55
 
        sample_set_volume(samples, 0, state->m_single_volume / 15.0);
 
53
        m_single_volume = data & 0x0f;
 
54
        samples->set_volume(0, m_single_volume / 15.0);
56
55
}
57
56
 
58
57
 
59
58
static TIMER_CALLBACK( senjyo_sh_update )
60
59
{
61
 
        device_t *samples = machine.device("samples");
 
60
        samples_device *samples = machine.device<samples_device>("samples");
62
61
        senjyo_state *state = machine.driver_data<senjyo_state>();
63
62
 
64
63
        /* ctc2 timer single tone generator frequency */
69
68
        else
70
69
                state->m_single_rate = 0;
71
70
 
72
 
        sample_set_freq(samples, 0, state->m_single_rate);
 
71
        samples->set_frequency(0, state->m_single_rate);
73
72
}
74
73
 
75
74
 
76
75
SAMPLES_START( senjyo_sh_start )
77
76
{
78
 
        running_machine &machine = device->machine();
 
77
        running_machine &machine = device.machine();
79
78
        senjyo_state *state = machine.driver_data<senjyo_state>();
80
79
        int i;
81
80
 
87
86
        /* CTC2 single tone generator */
88
87
        state->m_single_rate = 1000;
89
88
        state->m_single_volume = 0;
90
 
        sample_set_volume(device, 0, state->m_single_volume / 15.0);
91
 
        sample_start_raw(device, 0, state->m_single_data, SINGLE_LENGTH, state->m_single_rate, 1);
 
89
        device.set_volume(0, state->m_single_volume / 15.0);
 
90
        device.start_raw(0, state->m_single_data, SINGLE_LENGTH, state->m_single_rate, true);
92
91
 
93
92
        machine.scheduler().timer_pulse(machine.primary_screen->frame_period(), FUNC(senjyo_sh_update));
94
93
}