diff --git a/src/emu/machine/s2636.c b/src/emu/machine/s2636.c
index 95691c60666..01a01e9038f 100644
--- a/src/emu/machine/s2636.c
+++ b/src/emu/machine/s2636.c
@@ -120,7 +120,7 @@ void s2636_device::device_start()
 	save_item(NAME(m_bitmap));
 	save_item(NAME(m_collision_bitmap));
 
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate(), this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate());
 	save_item(NAME(m_size));
 	save_item(NAME(m_pos));
 	save_item(NAME(m_level));
diff --git a/src/emu/sound/asc.c b/src/emu/sound/asc.c
index 71047ca9270..8dc9f9d43de 100644
--- a/src/emu/sound/asc.c
+++ b/src/emu/sound/asc.c
@@ -70,7 +70,7 @@ void asc_device::static_set_type(device_t &device, int type)
 void asc_device::device_start()
 {
 	// create the stream
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, 22257, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, 22257);
 
 	memset(m_regs, 0, sizeof(m_regs));
 
diff --git a/src/emu/sound/awacs.c b/src/emu/sound/awacs.c
index 8aa20ee8901..fd93f77b479 100644
--- a/src/emu/sound/awacs.c
+++ b/src/emu/sound/awacs.c
@@ -35,7 +35,7 @@ awacs_device::awacs_device(const machine_config &mconfig, const char *tag, devic
 void awacs_device::device_start()
 {
 	// create the stream
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, 22050, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, 22050);
 
 	memset(m_regs, 0, sizeof(m_regs));
 
diff --git a/src/emu/sound/c352.c b/src/emu/sound/c352.c
index 21a0f74a21f..1e19c844b0a 100644
--- a/src/emu/sound/c352.c
+++ b/src/emu/sound/c352.c
@@ -465,7 +465,7 @@ void c352_device::device_start()
 
 	m_sample_rate_base = clock() / 288;
 
-	m_stream = machine().sound().stream_alloc(*this, 0, 4, m_sample_rate_base, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 4, m_sample_rate_base);
 
 	// generate mulaw table for mulaw format samples
 	for (i = 0; i < 256; i++)
diff --git a/src/emu/sound/c6280.c b/src/emu/sound/c6280.c
index 7c1e25eb5eb..72c4ae7924a 100644
--- a/src/emu/sound/c6280.c
+++ b/src/emu/sound/c6280.c
@@ -262,7 +262,7 @@ void c6280_device::device_start()
 	int rate = clock() / 16;
 
 	/* Create stereo stream */
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, rate, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, rate);
 
 	/* Loudest volume level for table */
 	double level = 65535.0 / 6.0 / 32.0;
diff --git a/src/emu/sound/dmadac.c b/src/emu/sound/dmadac.c
index 7dab612ea64..622b566f1ee 100644
--- a/src/emu/sound/dmadac.c
+++ b/src/emu/sound/dmadac.c
@@ -53,7 +53,7 @@ void dmadac_sound_device::device_start()
 	m_volume = 0x100;
 
 	/* allocate a stream channel */
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, DEFAULT_SAMPLE_RATE, this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, DEFAULT_SAMPLE_RATE);
 
 	/* register with the save state system */
 	save_item(NAME(m_bufin));
diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c
index 5b1433fdfd2..09f9bf2cc3e 100644
--- a/src/emu/sound/es5503.c
+++ b/src/emu/sound/es5503.c
@@ -253,7 +253,7 @@ void es5503_device::device_start()
 	}
 
 	output_rate = (clock()/8)/34;   // (input clock / 8) / # of oscs. enabled + 2
-	m_stream = machine().sound().stream_alloc(*this, 0, output_channels, output_rate, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, output_channels, output_rate);
 
 	m_timer = timer_alloc(0, NULL);
 	m_timer->adjust(attotime::from_hz(output_rate), 0, attotime::from_hz(output_rate));
diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c
index 6cc2a466c88..0510036d476 100644
--- a/src/emu/sound/es5506.c
+++ b/src/emu/sound/es5506.c
@@ -192,7 +192,7 @@ void es5506_device::device_start()
 		m_eslog = fopen("es.log", "w");
 
 	/* create the stream */
-	m_stream = machine().sound().stream_alloc(*this, 0, 2 * channels, clock() / (16*32), this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2 * channels, clock() / (16*32));
 
 	/* initialize the regions */
 	m_region_base[0] = m_region0 ? (UINT16 *)machine().root_device().memregion(m_region0)->base() : NULL;
@@ -334,7 +334,7 @@ void es5505_device::device_start()
 		m_eslog = fopen("es.log", "w");
 
 	/* create the stream */
-	m_stream = machine().sound().stream_alloc(*this, 0, 2 * channels, clock() / (16*32), this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2 * channels, clock() / (16*32));
 
 	/* initialize the regions */
 	m_region_base[0] = m_region0 ? (UINT16 *)machine().root_device().memregion(m_region0)->base() : NULL;
diff --git a/src/emu/sound/esqpump.c b/src/emu/sound/esqpump.c
index 5d8da22111f..73f325bceae 100644
--- a/src/emu/sound/esqpump.c
+++ b/src/emu/sound/esqpump.c
@@ -21,7 +21,7 @@ void esq_5505_5510_pump::device_start()
 {
 	logerror("Clock = %d\n", clock());
 
-	m_stream = machine().sound().stream_alloc(*this, 8, 2, clock(), this);
+	m_stream = machine().sound().stream_alloc(*this, 8, 2, clock());
 	m_timer = timer_alloc(0);
 	m_timer->enable(false);
 
diff --git a/src/emu/sound/hc55516.c b/src/emu/sound/hc55516.c
index 2b24254cdaa..2fbd4d2c0fe 100644
--- a/src/emu/sound/hc55516.c
+++ b/src/emu/sound/hc55516.c
@@ -140,7 +140,7 @@ void hc55516_device::start_common(UINT8 _shiftreg_mask, int _active_clock_hi)
 	m_last_clock_state = 0;
 
 	/* create the stream */
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, SAMPLE_RATE, this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, SAMPLE_RATE);
 
 	save_item(NAME(m_last_clock_state));
 	save_item(NAME(m_digit));
diff --git a/src/emu/sound/i5000.c b/src/emu/sound/i5000.c
index 5cfab056e2f..df86311904e 100644
--- a/src/emu/sound/i5000.c
+++ b/src/emu/sound/i5000.c
@@ -43,7 +43,7 @@ void i5000snd_device::device_start()
 	m_lut_volume[0xff] = 0;
 
 	// create the stream
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, clock() / 0x400, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, clock() / 0x400);
 
 	m_rom_base = (UINT16 *)device().machine().root_device().memregion(":i5000snd")->base();
 	m_rom_mask = device().machine().root_device().memregion(":i5000snd")->bytes() / 2 - 1;
diff --git a/src/emu/sound/k007232.c b/src/emu/sound/k007232.c
index 7eb956ac4a6..52d13ac2095 100644
--- a/src/emu/sound/k007232.c
+++ b/src/emu/sound/k007232.c
@@ -181,7 +181,7 @@ void k007232_device::device_start()
 	for (int i = 0; i < 0x10; i++)
 		m_wreg[i] = 0;
 
-	m_stream = machine().sound().stream_alloc(*this, 0 , 2, clock()/128, this);
+	m_stream = machine().sound().stream_alloc(*this, 0 , 2, clock()/128);
 
 	KDAC_A_make_fncode();
 
diff --git a/src/emu/sound/msm5205.c b/src/emu/sound/msm5205.c
index e5569eccad4..25cf4468119 100644
--- a/src/emu/sound/msm5205.c
+++ b/src/emu/sound/msm5205.c
@@ -96,7 +96,7 @@ void msm5205_device::device_start()
 	compute_tables();
 
 	/* stream system initialize */
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock(), this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock());
 	m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(msm5205_device::vclk_callback), this));
 
 	/* register for save states */
diff --git a/src/emu/sound/msm5232.c b/src/emu/sound/msm5232.c
index f7dc2f58642..e682e7fc081 100644
--- a/src/emu/sound/msm5232.c
+++ b/src/emu/sound/msm5232.c
@@ -31,7 +31,7 @@ void msm5232_device::device_start()
 
 	init(clock(), rate);
 
-	m_stream = machine().sound().stream_alloc(*this, 0, 11, rate, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 11, rate);
 
 	/* register with the save state system */
 	machine().save().register_postload(save_prepost_delegate(FUNC(msm5232_device::postload), this));
diff --git a/src/emu/sound/multipcm.c b/src/emu/sound/multipcm.c
index b5524f12653..20ee7e0b779 100644
--- a/src/emu/sound/multipcm.c
+++ b/src/emu/sound/multipcm.c
@@ -439,7 +439,7 @@ void multipcm_device::device_start()
 
 	m_Rate=(float) clock() / MULTIPCM_CLOCKDIV;
 
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, m_Rate, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, m_Rate);
 
 	//Volume+pan table
 	for(i=0;i<0x800;++i)
diff --git a/src/emu/sound/namco.c b/src/emu/sound/namco.c
index 8977afad66f..837978933c5 100644
--- a/src/emu/sound/namco.c
+++ b/src/emu/sound/namco.c
@@ -97,9 +97,9 @@ void namco_audio_device::device_start()
 
 	/* get stream channels */
 	if (m_stereo)
-		m_stream = machine().sound().stream_alloc(*this, 0, 2, m_sample_rate, this);
+		m_stream = machine().sound().stream_alloc(*this, 0, 2, m_sample_rate);
 	else
-		m_stream = machine().sound().stream_alloc(*this, 0, 1, m_sample_rate, this);
+		m_stream = machine().sound().stream_alloc(*this, 0, 1, m_sample_rate);
 
 	/* start with sound enabled, many games don't have a sound enable register */
 	m_sound_enable = 1;
diff --git a/src/emu/sound/nes_apu.c b/src/emu/sound/nes_apu.c
index 44f9ad4503f..0188e1a39b4 100644
--- a/src/emu/sound/nes_apu.c
+++ b/src/emu/sound/nes_apu.c
@@ -157,7 +157,7 @@ void nesapu_device::device_start()
 	/* Initialize individual chips */
 	(m_APU.dpcm).memory = &machine().device(m_cpu_tag)->memory().space(AS_PROGRAM);
 
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, rate, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, rate);
 
 	/* register for save */
 	for (int i = 0; i < 2; i++)
diff --git a/src/emu/sound/okim6376.c b/src/emu/sound/okim6376.c
index ed7c7b524ae..b2b7cfd35f3 100644
--- a/src/emu/sound/okim6376.c
+++ b/src/emu/sound/okim6376.c
@@ -168,7 +168,7 @@ void okim6376_device::device_start()
 	m_ch2_update = 0;
 	m_st_pulses = 0;
 	/* generate the name and create the stream */
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() / m_divisor, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() / m_divisor);
 
 	/* initialize the voices */
 	for (voice = 0; voice < OKIM6376_VOICES; voice++)
diff --git a/src/emu/sound/s14001a.c b/src/emu/sound/s14001a.c
index 7de2fb009b7..46765c38652 100644
--- a/src/emu/sound/s14001a.c
+++ b/src/emu/sound/s14001a.c
@@ -630,7 +630,7 @@ void s14001a_device::device_start()
 
 	m_SpeechRom = *region();
 
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() ? clock() : machine().sample_rate(), this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() ? clock() : machine().sample_rate());
 }
 
 //-------------------------------------------------
diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c
index 12553092b23..45ecea1e7e5 100644
--- a/src/emu/sound/scsp.c
+++ b/src/emu/sound/scsp.c
@@ -207,7 +207,7 @@ void scsp_device::device_start()
 	m_irq_cb.resolve_safe();
 	m_main_irq_cb.resolve_safe();
 
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, 44100, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, 44100);
 }
 
 //-------------------------------------------------
diff --git a/src/emu/sound/sn76477.c b/src/emu/sound/sn76477.c
index ba4f85b9cf5..2fdbb996cdc 100644
--- a/src/emu/sound/sn76477.c
+++ b/src/emu/sound/sn76477.c
@@ -289,7 +289,7 @@ void sn76477_device::device_config_complete()
 
 void sn76477_device::device_start()
 {
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate(), this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate());
 
 	if (clock() > 0)
 	{
diff --git a/src/emu/sound/sn76496.c b/src/emu/sound/sn76496.c
index 6e285ac7e0d..03541b372b8 100644
--- a/src/emu/sound/sn76496.c
+++ b/src/emu/sound/sn76496.c
@@ -149,7 +149,7 @@ void sn76496_base_device::device_start()
 
 	m_ready_handler.resolve_safe();
 
-	m_sound = machine().sound().stream_alloc(*this, 0, (m_stereo? 2:1), sample_rate, this);
+	m_sound = machine().sound().stream_alloc(*this, 0, (m_stereo? 2:1), sample_rate);
 
 	for (i = 0; i < 4; i++) m_volume[i] = 0;
 
diff --git a/src/emu/sound/sp0250.c b/src/emu/sound/sp0250.c
index 2de7cc2b8dd..d03e3391f9b 100644
--- a/src/emu/sound/sp0250.c
+++ b/src/emu/sound/sp0250.c
@@ -77,7 +77,7 @@ void sp0250_device::device_start()
 		machine().scheduler().timer_pulse(attotime::from_hz(clock()) * CLOCK_DIVIDER, timer_expired_delegate(FUNC(sp0250_device::timer_tick), this));
 	}
 
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() / CLOCK_DIVIDER, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() / CLOCK_DIVIDER);
 
 	save_item(NAME(m_amp));
 	save_item(NAME(m_pitch));
diff --git a/src/emu/sound/sp0256.c b/src/emu/sound/sp0256.c
index 61ae023e4b8..e29054c326a 100644
--- a/src/emu/sound/sp0256.c
+++ b/src/emu/sound/sp0256.c
@@ -112,7 +112,7 @@ void sp0256_device::device_start()
 	m_drq_cb(1);
 	m_sby_cb(1);
 
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() / CLOCK_DIVIDER, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() / CLOCK_DIVIDER);
 
 	/* -------------------------------------------------------------------- */
 	/*  Configure our internal variables.                                   */
diff --git a/src/emu/sound/speaker.c b/src/emu/sound/speaker.c
index 7b497e8360a..86d2dfb3de0 100644
--- a/src/emu/sound/speaker.c
+++ b/src/emu/sound/speaker.c
@@ -117,7 +117,7 @@ void speaker_sound_device::device_start()
 	int i;
 	double x;
 
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate(), this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate());
 
 	m_level = 0;
 	for (i = 0; i < FILTER_LENGTH; i++)
diff --git a/src/emu/sound/t6w28.c b/src/emu/sound/t6w28.c
index 7ed58e09669..bd71d210aa9 100644
--- a/src/emu/sound/t6w28.c
+++ b/src/emu/sound/t6w28.c
@@ -294,7 +294,7 @@ void t6w28_device::device_start()
 	int i;
 
 	m_sample_rate = clock() / 16;
-	m_channel = machine().sound().stream_alloc(*this, 0, 2, m_sample_rate, this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 2, m_sample_rate);
 
 	for (i = 0;i < 8;i++) m_volume[i] = 0;
 
diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c
index 2d76b33f225..bb55cbfbb23 100644
--- a/src/emu/sound/upd7759.c
+++ b/src/emu/sound/upd7759.c
@@ -225,7 +225,7 @@ void upd7759_device::device_start()
 	m_sample_offset_shift = (type() == UPD7759) ? 1 : 0;
 
 	/* allocate a stream channel */
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, clock()/4, this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, clock()/4);
 
 	/* compute the stepping rate based on the chip's clock speed */
 	m_step = 4 * FRAC_ONE;
@@ -300,7 +300,7 @@ void upd7756_device::device_start()
 	m_sample_offset_shift = (type() == UPD7759) ? 1 : 0;
 
 	/* allocate a stream channel */
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, clock()/4, this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, clock()/4);
 
 	/* compute the stepping rate based on the chip's clock speed */
 	m_step = 4 * FRAC_ONE;
diff --git a/src/emu/sound/vlm5030.c b/src/emu/sound/vlm5030.c
index 646c95a18d6..ab5f3b10055 100644
--- a/src/emu/sound/vlm5030.c
+++ b/src/emu/sound/vlm5030.c
@@ -216,7 +216,7 @@ void vlm5030_device::device_start()
 	m_rom = region()->base();
 	m_address_mask = (region()->bytes() - 1) & 0xffff;
 
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, clock() / 440, this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, clock() / 440);
 
 	/* don't restore "UINT8 *m_rom" when use vlm5030_set_rom() */
 
diff --git a/src/emu/sound/vrc6.c b/src/emu/sound/vrc6.c
index 715ce688a08..58be80a0bae 100644
--- a/src/emu/sound/vrc6.c
+++ b/src/emu/sound/vrc6.c
@@ -39,7 +39,7 @@ vrc6snd_device::vrc6snd_device(const machine_config &mconfig, const char *tag, d
 
 void vrc6snd_device::device_start()
 {
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock(), this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock());
 
 	m_freqctrl = m_pulsectrl[0] = m_pulsectrl[1] = 0;
 	m_pulsefrql[0] = m_pulsefrql[1] = m_pulsefrqh[0] = m_pulsefrqh[1] = 0;
diff --git a/src/emu/sound/wave.c b/src/emu/sound/wave.c
index 99aa76f2f63..f4fe828fe12 100644
--- a/src/emu/sound/wave.c
+++ b/src/emu/sound/wave.c
@@ -55,9 +55,9 @@ void wave_device::device_start()
 	speaker_device_iterator spkiter(machine().root_device());
 	int speakers = spkiter.count();
 	if (speakers > 1)
-		machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate(), this);
+		machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate());
 	else
-		machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate(), this);
+		machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate());
 }
 
 //-------------------------------------------------
diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c
index 1ebdb232f84..7f73b937a2a 100644
--- a/src/emu/sound/x1_010.c
+++ b/src/emu/sound/x1_010.c
@@ -118,7 +118,7 @@ void x1_010_device::device_start()
 	LOG_SOUND(("masterclock = %d rate = %d\n", clock(), m_rate ));
 
 	/* get stream channels */
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, m_rate, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, m_rate);
 
 	save_item(NAME(m_rate));
 	save_item(NAME(m_sound_enable));
diff --git a/src/emu/sound/ymz770.c b/src/emu/sound/ymz770.c
index 3bc23445285..16ef376d4c7 100644
--- a/src/emu/sound/ymz770.c
+++ b/src/emu/sound/ymz770.c
@@ -48,7 +48,7 @@ ymz770_device::ymz770_device(const machine_config &mconfig, const char *tag, dev
 void ymz770_device::device_start()
 {
 	// create the stream
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, 16000, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, 16000);
 	m_rom_base = *region();
 	m_rom_limit = region()->bytes() * 8;
 
diff --git a/src/mame/audio/amiga.c b/src/mame/audio/amiga.c
index 2c65f602b6e..22e5e0ef2a6 100644
--- a/src/mame/audio/amiga.c
+++ b/src/mame/audio/amiga.c
@@ -71,7 +71,7 @@ void amiga_sound_device::device_start()
 	}
 
 	/* create the stream */
-	m_stream = machine().sound().stream_alloc(*this, 0, 4, clock() / CLOCK_DIVIDER, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 4, clock() / CLOCK_DIVIDER);
 }
 
 
diff --git a/src/mame/audio/beezer.c b/src/mame/audio/beezer.c
index e9e3ccb4b79..62e665b2fae 100644
--- a/src/mame/audio/beezer.c
+++ b/src/mame/audio/beezer.c
@@ -112,7 +112,7 @@ void beezer_sound_device::device_start()
 	m_sh6840_clocks_per_sample = (int)(((double)SH6840_CLOCK / (double)sample_rate) * (double)(1 << 24));
 
 	/* allocate the stream */
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, sample_rate, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, sample_rate);
 	m_maincpu = machine().device<cpu_device>("maincpu");
 
 	save_item(NAME(m_sh6840_volume));
diff --git a/src/mame/audio/dsbz80.c b/src/mame/audio/dsbz80.c
index 32df7ddd955..f4a57abaca2 100644
--- a/src/mame/audio/dsbz80.c
+++ b/src/mame/audio/dsbz80.c
@@ -74,7 +74,7 @@ void dsbz80_device::device_start()
 {
 	UINT8 *rom_base = machine().root_device().memregion("mpeg")->base();
 	decoder = new mpeg_audio(rom_base, mpeg_audio::L2, false, 0);
-	machine().sound().stream_alloc(*this, 0, 2, 32000, this);
+	machine().sound().stream_alloc(*this, 0, 2, 32000);
 }
 
 //-------------------------------------------------
diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c
index 4589b39635d..3c9c1babf25 100644
--- a/src/mame/audio/exidy.c
+++ b/src/mame/audio/exidy.c
@@ -197,7 +197,7 @@ void exidy_sound_device::common_sh_start()
 	m_sh6840_clocks_per_sample = (int)((double)SH6840_CLOCK / (double)sample_rate * (double)(1 << 24));
 
 	/* allocate the stream */
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, sample_rate, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, sample_rate);
 	m_maincpu = machine().device<cpu_device>("maincpu");
 
 	sh6840_register_state_globals();
diff --git a/src/mame/audio/exidy440.c b/src/mame/audio/exidy440.c
index c3b87991f69..33d50f5ede2 100644
--- a/src/mame/audio/exidy440.c
+++ b/src/mame/audio/exidy440.c
@@ -117,7 +117,7 @@ void exidy440_sound_device::device_start()
 	m_channel_frequency[3] = clock()/2;
 
 	/* get stream channels */
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, clock(), this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, clock());
 
 	/* allocate the sample cache */
 	length = machine().root_device().memregion("cvsd")->bytes() * 16 + MAX_CACHE_ENTRIES * sizeof(sound_cache_entry);
diff --git a/src/mame/audio/flower.c b/src/mame/audio/flower.c
index 275f8e3828d..9896b556004 100644
--- a/src/mame/audio/flower.c
+++ b/src/mame/audio/flower.c
@@ -46,7 +46,7 @@ void flower_sound_device::device_start()
 	flower_sound_channel *voice;
 
 	m_effect_timer = timer_alloc(TIMER_CLOCK_EFFECT);
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, MIXER_SAMPLERATE, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, MIXER_SAMPLERATE);
 	m_mixer_buffer = auto_alloc_array(machine(), short, MIXER_SAMPLERATE);
 	make_mixer_table(8, MIXER_DEFGAIN);
 
diff --git a/src/mame/audio/geebee.c b/src/mame/audio/geebee.c
index 9dda7f678d3..f408afd010a 100644
--- a/src/mame/audio/geebee.c
+++ b/src/mame/audio/geebee.c
@@ -49,7 +49,7 @@ void geebee_sound_device::device_start()
 		m_decay[0x7fff - i] = (INT16) (0x7fff/exp(1.0*i/4096));
 
 	/* 1V = HSYNC = 18.432MHz / 3 / 2 / 384 = 8000Hz */
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, 18432000 / 3 / 2 / 384, this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, 18432000 / 3 / 2 / 384);
 	m_vcount = 0;
 
 	m_volume_timer = timer_alloc(TIMER_VOLUME_DECAY);
diff --git a/src/mame/audio/micro3d.c b/src/mame/audio/micro3d.c
index 63a1979ebad..59a9d67dedc 100644
--- a/src/mame/audio/micro3d.c
+++ b/src/mame/audio/micro3d.c
@@ -197,7 +197,7 @@ void micro3d_sound_device::device_config_complete()
 void micro3d_sound_device::device_start()
 {
 	/* Allocate the stream */
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate(), this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate());
 	filter_init(machine(), &m_filter, machine().sample_rate());
 
 	configure_filter(&m_noise_filters[0], 2.7e3 + 2.7e3, 1.0e-6);
diff --git a/src/mame/audio/phoenix.c b/src/mame/audio/phoenix.c
index b87054e9836..4f9833a2f75 100644
--- a/src/mame/audio/phoenix.c
+++ b/src/mame/audio/phoenix.c
@@ -98,7 +98,7 @@ void phoenix_sound_device::device_start()
 		m_poly18[i] = bits;
 	}
 
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate(), this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate());
 
 	save_item(NAME(m_sound_latch_a));
 	save_item(NAME(m_c24_state.counter));
diff --git a/src/mame/audio/pleiads.c b/src/mame/audio/pleiads.c
index 71b6b98ff03..4bbaaf5ce3a 100644
--- a/src/mame/audio/pleiads.c
+++ b/src/mame/audio/pleiads.c
@@ -668,7 +668,7 @@ void pleiads_sound_device::common_start()
 		m_poly18[i] = bits;
 	}
 
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate(), this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate());
 
 	save_item(NAME(m_sound_latch_a));
 	save_item(NAME(m_sound_latch_b));
diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c
index 5d34c98e475..b957f9888b1 100644
--- a/src/mame/audio/segag80r.c
+++ b/src/mame/audio/segag80r.c
@@ -57,7 +57,7 @@ void sega005_sound_device::device_start()
 	segag80r_state *state = machine().driver_data<segag80r_state>();
 
 	/* create the stream */
-	m_sega005_stream = machine().sound().stream_alloc(*this, 0, 1, SEGA005_COUNTER_FREQ, this);
+	m_sega005_stream = machine().sound().stream_alloc(*this, 0, 1, SEGA005_COUNTER_FREQ);
 
 	/* create a timer for the 555 */
 	m_sega005_sound_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(sega005_sound_device::sega005_auto_timer), this));
diff --git a/src/mame/audio/segasnd.c b/src/mame/audio/segasnd.c
index c52e7fd1392..4b2a2be3196 100644
--- a/src/mame/audio/segasnd.c
+++ b/src/mame/audio/segasnd.c
@@ -296,7 +296,7 @@ void usb_sound_device::device_start()
 	m_work_ram = auto_alloc_array(machine(), UINT8, 0x400);
 
 	/* create a sound stream */
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, SAMPLE_RATE, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, SAMPLE_RATE);
 
 	/* initialize state */
 	m_noise_shift = 0x15555;
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index 5b374290585..44f19f3d9b2 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -542,7 +542,7 @@ void seibu_adpcm_device::device_config_complete()
 void seibu_adpcm_device::device_start()
 {
 	m_playing = 0;
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock(), this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock());
 	m_base = machine().root_device().memregion(m_rom_region)->base();
 	m_adpcm.reset();
 }
diff --git a/src/mame/audio/snes_snd.c b/src/mame/audio/snes_snd.c
index b16b47dbd63..89f305c2bcd 100644
--- a/src/mame/audio/snes_snd.c
+++ b/src/mame/audio/snes_snd.c
@@ -175,7 +175,7 @@ void snes_sound_device::device_config_complete()
 
 void snes_sound_device::device_start()
 {
-	m_channel = machine().sound().stream_alloc(*this, 0, 2, 32000, this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 2, 32000);
 
 	m_ram = auto_alloc_array_clear(machine(), UINT8, SNES_SPCRAM_SIZE);
 
diff --git a/src/mame/audio/snk6502.c b/src/mame/audio/snk6502.c
index 273c36f9f1f..a4957a2278a 100644
--- a/src/mame/audio/snk6502.c
+++ b/src/mame/audio/snk6502.c
@@ -393,7 +393,7 @@ void snk6502_sound_device::device_start()
 	// 38.99 Hz update (according to schematic)
 	set_music_clock(M_LN2 * (RES_K(18) * 2 + RES_K(1)) * CAP_U(1));
 
-	m_tone_stream = machine().sound().stream_alloc(*this, 0, 1, SAMPLE_RATE, this);
+	m_tone_stream = machine().sound().stream_alloc(*this, 0, 1, SAMPLE_RATE);
 }
 
 inline void snk6502_sound_device::validate_tone_channel(int channel)
diff --git a/src/mame/audio/turrett.c b/src/mame/audio/turrett.c
index 00771465004..a93b2f1df52 100644
--- a/src/mame/audio/turrett.c
+++ b/src/mame/audio/turrett.c
@@ -42,7 +42,7 @@ void turrett_device::device_start()
 	m_direct = &space().direct();
 
 	// Create the sound stream
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, 44100, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, 44100);
 
 	// Create the volume table
 	for (int i = 0; i < 0x4f; ++i)
diff --git a/src/mame/audio/tx1.c b/src/mame/audio/tx1.c
index 451571d5c89..df2bfd5a061 100644
--- a/src/mame/audio/tx1.c
+++ b/src/mame/audio/tx1.c
@@ -102,7 +102,7 @@ void tx1_sound_device::device_start()
 
 
 	/* Allocate the stream */
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate(), this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate());
 	m_freq_to_step = (double)(1 << TX1_FRAC) / (double)machine().sample_rate();
 
 	/* Compute the engine resistor weights */
@@ -382,7 +382,7 @@ void buggyboy_sound_device::device_start()
 		m_eng_voltages[i] = combine_4_weights(aweights, BIT(tmp[i], 0), BIT(tmp[i], 1), BIT(tmp[i], 2), BIT(tmp[i], 3));
 
 	/* Allocate the stream */
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate(), this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate());
 	m_freq_to_step = (double)(1 << 24) / (double)machine().sample_rate();
 }
 
diff --git a/src/mame/audio/warpwarp.c b/src/mame/audio/warpwarp.c
index 40daae36915..1bf9d87f397 100644
--- a/src/mame/audio/warpwarp.c
+++ b/src/mame/audio/warpwarp.c
@@ -59,7 +59,7 @@ void warpwarp_sound_device::device_start()
 	for (int i = 0; i < 0x8000; i++)
 		m_decay[0x7fff - i] = (INT16) (0x7fff/exp(1.0*i/4096));
 
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, CLOCK_16H, this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, CLOCK_16H);
 
 	m_sound_volume_timer = timer_alloc(TIMER_SOUND_VOLUME_DECAY);
 	m_music_volume_timer = timer_alloc(TIMER_MUSIC_VOLUME_DECAY);
diff --git a/src/mame/audio/wiping.c b/src/mame/audio/wiping.c
index 1dd37427a32..842bb23f955 100644
--- a/src/mame/audio/wiping.c
+++ b/src/mame/audio/wiping.c
@@ -51,7 +51,7 @@ void wiping_sound_device::device_start()
 	sound_channel *voice;
 
 	/* get stream channels */
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, samplerate, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, samplerate);
 
 	/* allocate a pair of buffers to mix into - 1 second's worth should be more than enough */
 	m_mixer_buffer = auto_alloc_array_clear(machine(), short, 2 * samplerate);
diff --git a/src/mame/drivers/mjkjidai.c b/src/mame/drivers/mjkjidai.c
index 78c23e5d768..966685c3e9f 100644
--- a/src/mame/drivers/mjkjidai.c
+++ b/src/mame/drivers/mjkjidai.c
@@ -59,7 +59,7 @@ void mjkjidai_adpcm_device::device_config_complete()
 void mjkjidai_adpcm_device::device_start()
 {
 	m_playing = 0;
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock(), this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock());
 	m_base = machine().root_device().memregion("adpcm")->base();
 	m_adpcm.reset();
 
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index 5afb95a224e..4c662aa1bbb 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -141,7 +141,7 @@ void renegade_adpcm_device::device_config_complete()
 void renegade_adpcm_device::device_start()
 {
 	m_playing = 0;
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock(), this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock());
 	m_base = machine().root_device().memregion("adpcm")->base();
 	m_adpcm.reset();
 
diff --git a/src/mess/audio/arcadia.c b/src/mess/audio/arcadia.c
index 5023238e9f2..f6f6c08ecfb 100644
--- a/src/mess/audio/arcadia.c
+++ b/src/mess/audio/arcadia.c
@@ -56,7 +56,7 @@ arcadia_sound_device::arcadia_sound_device(const machine_config &mconfig, const
 //-------------------------------------------------
 void arcadia_sound_device::device_start()
 {
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, UVI_PAL*OSAMP, this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, UVI_PAL*OSAMP);
 	m_lfsr    = LFSR_INIT;
 	m_tval    = 1;
 	logerror("arcadia_sound start\n");
diff --git a/src/mess/audio/dai.c b/src/mess/audio/dai.c
index 3bb161a3984..a4a7ae6454e 100644
--- a/src/mess/audio/dai.c
+++ b/src/mess/audio/dai.c
@@ -31,7 +31,7 @@ dai_sound_device::dai_sound_device(const machine_config &mconfig, const char *ta
 
 void dai_sound_device::device_start()
 {
-	m_mixer_channel = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate(), this);
+	m_mixer_channel = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate());
 }
 
 //-------------------------------------------------
diff --git a/src/mess/audio/dave.c b/src/mess/audio/dave.c
index f089a9939cc..6322ef5a4f8 100644
--- a/src/mess/audio/dave.c
+++ b/src/mess/audio/dave.c
@@ -107,7 +107,7 @@ void dave_device::device_start()
 	 the volumes are mixed internally and output as left and right volume */
 
 	/* 3 tone channels + 1 noise channel */
-	m_sound_stream_var = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate(), this);
+	m_sound_stream_var = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate());
 }
 
 
diff --git a/src/mess/audio/gb.c b/src/mess/audio/gb.c
index 14d0e072bf3..83823294d25 100644
--- a/src/mess/audio/gb.c
+++ b/src/mess/audio/gb.c
@@ -125,7 +125,7 @@ void gameboy_sound_device::device_config_complete()
 
 void gameboy_sound_device::device_start()
 {
-	m_channel = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate(), this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate());
 	m_rate = machine().sample_rate();
 
 	save_item(NAME(m_snd_regs));
diff --git a/src/mess/audio/lynx.c b/src/mess/audio/lynx.c
index 74ebb659339..6a3d0e624dc 100644
--- a/src/mess/audio/lynx.c
+++ b/src/mess/audio/lynx.c
@@ -187,7 +187,7 @@ void lynx_sound_device::init()
 
 void lynx_sound_device::device_start()
 {
-	m_mixer_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate(), this);
+	m_mixer_channel = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate());
 	m_usec_per_sample = 1000000 / machine().sample_rate();
 	m_timer_delegate.bind_relative_to(*owner());
 	init();
@@ -197,7 +197,7 @@ void lynx_sound_device::device_start()
 
 void lynx2_sound_device::device_start()
 {
-	m_mixer_channel = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate(), this);
+	m_mixer_channel = machine().sound().stream_alloc(*this, 0, 2, machine().sample_rate());
 	m_usec_per_sample = 1000000 / machine().sample_rate();
 	m_timer_delegate.bind_relative_to(*owner());
 	init();
diff --git a/src/mess/audio/mac.c b/src/mess/audio/mac.c
index 2268560a635..ded5238158a 100644
--- a/src/mess/audio/mac.c
+++ b/src/mess/audio/mac.c
@@ -61,7 +61,7 @@ void mac_sound_device::device_start()
 	mac_state *mac = machine().driver_data<mac_state>();
 
 	m_snd_cache = auto_alloc_array_clear(machine(), UINT8, SND_CACHE_SIZE);
-	m_mac_stream = machine().sound().stream_alloc(*this, 0, 1, MAC_SAMPLE_RATE, this);
+	m_mac_stream = machine().sound().stream_alloc(*this, 0, 1, MAC_SAMPLE_RATE);
 
 	m_ram = machine().device<ram_device>(RAM_TAG);
 	m_mac_model = mac->m_model;
diff --git a/src/mess/audio/socrates.c b/src/mess/audio/socrates.c
index 20ffb0c77af..9c615d115b0 100644
--- a/src/mess/audio/socrates.c
+++ b/src/mess/audio/socrates.c
@@ -43,7 +43,7 @@ void socrates_snd_device::device_start()
 	m_DAC_output = 0x00; /* output */
 	m_state[0] = m_state[1] = m_state[2] = 0;
 	m_accum[0] = m_accum[1] = m_accum[2] = 0xFF;
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() ? clock() : machine().sample_rate(), this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() ? clock() : machine().sample_rate());
 }
 
 
diff --git a/src/mess/audio/tvc.c b/src/mess/audio/tvc.c
index 30b491a115b..0869cfc3f67 100644
--- a/src/mess/audio/tvc.c
+++ b/src/mess/audio/tvc.c
@@ -31,7 +31,7 @@ void tvc_sound_device::device_start()
 	// resolve callbacks
 	m_write_sndint.resolve_safe();
 
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate(), this );
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, machine().sample_rate());
 	m_sndint_timer = timer_alloc(TIMER_SNDINT);
 }
 
diff --git a/src/mess/audio/upd1771.c b/src/mess/audio/upd1771.c
index 250d6774225..cb156544686 100644
--- a/src/mess/audio/upd1771.c
+++ b/src/mess/audio/upd1771.c
@@ -239,7 +239,7 @@ void upd1771c_device::device_start()
 
 	m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(upd1771c_device::ack_callback),this));
 
-	m_channel = machine().sound().stream_alloc(*this, 0, 1, clock() / 4, this);
+	m_channel = machine().sound().stream_alloc(*this, 0, 1, clock() / 4);
 
 	save_item(NAME(m_packet));
 	save_item(NAME(m_index));
diff --git a/src/mess/audio/vboy.c b/src/mess/audio/vboy.c
index 5ecba7031c1..4f70aacf094 100644
--- a/src/mess/audio/vboy.c
+++ b/src/mess/audio/vboy.c
@@ -208,7 +208,7 @@ void vboysnd_device::device_start()
 	int i;
 
 	// create the stream
-	m_stream = machine().sound().stream_alloc(*this, 0, 2, AUDIO_FREQ, this);
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, AUDIO_FREQ);
 
 	for (i=0; i<2048; i++)
 		waveFreq2LenTbl[i] = AUDIO_FREQ / (5000000.0/(float)((2048-i) * 32));
diff --git a/src/mess/drivers/pv1000.c b/src/mess/drivers/pv1000.c
index 99489da7efd..5dfb7664fbe 100644
--- a/src/mess/drivers/pv1000.c
+++ b/src/mess/drivers/pv1000.c
@@ -65,7 +65,7 @@ void pv1000_sound_device::device_config_complete()
 
 void pv1000_sound_device::device_start()
 {
-	m_sh_channel = machine().sound().stream_alloc(*this, 0, 1, clock() / 1024, this);
+	m_sh_channel = machine().sound().stream_alloc(*this, 0, 1, clock() / 1024);
 
 	save_item(NAME(m_voice[0].count));
 	save_item(NAME(m_voice[0].period));