samples change to find in constructor (nw)

src/mame/drivers/8080bw.c

@@ -2384,7 +2384,6 @@ MACHINE_START_MEMBER(_8080bw_state,darthvdr)
 {
 	/* do nothing for now - different interrupt system */
 	m_fleet_step = 3;
-	m_samples = machine().device<samples_device>("samples");
 	m_sn = machine().device("snsnd");
 }
 

src/mame/drivers/aristmk4.c

@@ -276,12 +276,13 @@ class aristmk4_state : public driver_device
 public:
 	aristmk4_state(const machine_config &mconfig, device_type type, const char *tag)
 	: driver_device(mconfig, type, tag),
+		m_samples(*this, "samples"),
 		m_mkiv_vram(*this, "mkiv_vram"),
 		m_maincpu(*this, "maincpu") { }
 
 	int m_rtc_address_strobe;
 	int m_rtc_data_strobe;
-	samples_device *m_samples;
+	required_device<samples_device> m_samples;
 	UINT8 *m_shapeRomPtr;
 	UINT8 m_shapeRom[0xc000];
 	required_shared_ptr<UINT8> m_mkiv_vram;
@@ -1641,7 +1642,6 @@ DRIVER_INIT_MEMBER(aristmk4_state,aristmk4)
 
 void aristmk4_state::machine_start()
 {
-	m_samples = machine().device<samples_device>("samples");
 	state_save_register_global_pointer(machine(), m_nvram, 0x1000); // m_nvram
 }
 

src/mame/drivers/astinvad.c

@@ -49,7 +49,8 @@ public:
 		m_maincpu(*this, "maincpu"),
 		m_ppi8255_0(*this, "ppi8255_0"),
 		m_ppi8255_1(*this, "ppi8255_1"),
-		m_videoram(*this, "videoram"){ }
+		m_videoram(*this, "videoram"),
+		m_samples(*this, "samples"){ }
 
 	required_device<cpu_device> m_maincpu;
 	optional_device<i8255_device>  m_ppi8255_0;
@@ -64,7 +65,7 @@ public:
 	UINT8      m_flip_yoffs;
 	UINT8      m_color_latch;
 
-	samples_device *m_samples;
+	required_device<samples_device> m_samples;
 	DECLARE_WRITE8_MEMBER(color_latch_w);
 	DECLARE_WRITE8_MEMBER(spaceint_videoram_w);
 	DECLARE_READ8_MEMBER(kamikaze_ppi_r);
@@ -250,8 +251,6 @@ TIMER_CALLBACK_MEMBER(astinvad_state::kamizake_int_gen)
 
 MACHINE_START_MEMBER(astinvad_state,kamikaze)
 {
-	m_samples = machine().device<samples_device>("samples");
-
 	m_int_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(astinvad_state::kamizake_int_gen),this));
 	m_int_timer->adjust(machine().primary_screen->time_until_pos(128), 128);
 
@@ -271,8 +270,6 @@ MACHINE_RESET_MEMBER(astinvad_state,kamikaze)
 
 MACHINE_START_MEMBER(astinvad_state,spaceint)
 {
-	m_samples = machine().device<samples_device>("samples");
-
 	save_item(NAME(m_screen_flip));
 	save_item(NAME(m_sound_state));
 }

src/mame/drivers/astrof.c

@@ -467,8 +467,6 @@ MACHINE_START_MEMBER(astrof_state,astrof)
 	/* the 74175 outputs all HI's if not otherwise set */
 	astrof_set_video_control_2(0xff);
 
-	m_samples = machine().device<samples_device>("samples");
-
 	/* register for state saving */
 	save_item(NAME(m_red_on));
 	save_item(NAME(m_flipscreen));

src/mame/drivers/circus.c

@@ -263,8 +263,6 @@ GFXDECODE_END
 ***************************************************************************/
 void circus_state::machine_start()
 {
-	m_samples = machine().device<samples_device>("samples");
-
 	save_item(NAME(m_clown_x));
 	save_item(NAME(m_clown_y));
 	save_item(NAME(m_clown_z));

src/mame/drivers/cosmic.c

@@ -957,8 +957,6 @@ static const samples_interface cosmicg_samples_interface =
 
 MACHINE_START_MEMBER(cosmic_state,cosmic)
 {
-	m_samples = machine().device<samples_device>("samples");
-
 	save_item(NAME(m_sound_enabled));
 	save_item(NAME(m_march_select));
 	save_item(NAME(m_gun_die_select));

src/mame/drivers/gotya.c

@@ -176,8 +176,6 @@ static const samples_interface gotya_samples_interface =
 
 void gotya_state::machine_start()
 {
-	m_samples = machine().device<samples_device>("samples");
-
 	save_item(NAME(m_scroll_bit_8));
 	save_item(NAME(m_theme_playing));
 }

src/mame/drivers/m10.c

@@ -193,7 +193,6 @@ MACHINE_START_MEMBER(m10_state,m10)
 {
 	m_ic8j1 = machine().device("ic8j1");
 	m_ic8j2 = machine().device("ic8j2");
-	m_samples = machine().device<samples_device>("samples");
 
 	save_item(NAME(m_bottomline));
 	save_item(NAME(m_flip));

src/mame/drivers/m63.c

@@ -132,6 +132,7 @@ public:
 		m_videoram(*this, "videoram"),
 		m_colorram(*this, "colorram"),
 		m_soundcpu(*this, "soundcpu"),
+		m_samples(*this, "samples"),
 		m_maincpu(*this, "maincpu") { }
 
 	required_shared_ptr<UINT8> m_spriteram;
@@ -160,7 +161,7 @@ public:
 	required_device<cpu_device> m_soundcpu;
 	device_t *m_ay1;
 	device_t *m_ay2;
-	samples_device *m_samples;
+	optional_device<samples_device> m_samples;
 	DECLARE_WRITE8_MEMBER(m63_videoram_w);
 	DECLARE_WRITE8_MEMBER(m63_colorram_w);
 	DECLARE_WRITE8_MEMBER(m63_videoram2_w);
@@ -718,7 +719,6 @@ MACHINE_START_MEMBER(m63_state,m63)
 {
 	m_ay1 = machine().device("ay1");
 	m_ay2 = machine().device("ay2");
-	m_samples = machine().device<samples_device>("samples");
 
 	save_item(NAME(m_pal_bank));
 	save_item(NAME(m_fg_flag));

src/mame/drivers/rallyx.c

@@ -871,8 +871,6 @@ static const samples_interface rallyx_samples_interface =
 
 MACHINE_START_MEMBER(rallyx_state,rallyx)
 {
-	m_samples = machine().device<samples_device>("samples");
-
 	save_item(NAME(m_last_bang));
 	save_item(NAME(m_stars_enable));
 }

src/mame/drivers/safarir.c

@@ -57,7 +57,8 @@ public:
 	safarir_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
 		m_bg_scroll(*this, "bg_scroll"),
-		m_ram(*this, "ram") ,
+		m_ram(*this, "ram"),
+		m_samples(*this, "samples"),
 		m_maincpu(*this, "maincpu") { }
 
 	UINT8 *m_ram_1;
@@ -69,7 +70,7 @@ public:
 	required_shared_ptr<UINT8> m_ram;
 	UINT8 m_port_last;
 	UINT8 m_port_last2;
-	samples_device *m_samples;
+	required_device<samples_device> m_samples;
 	DECLARE_WRITE8_MEMBER(ram_w);
 	DECLARE_READ8_MEMBER(ram_r);
 	DECLARE_WRITE8_MEMBER(ram_bank_w);
@@ -318,7 +319,6 @@ void safarir_state::machine_start()
 	m_ram_2 = auto_alloc_array(machine(), UINT8, m_ram.bytes());
 	m_port_last = 0;
 	m_port_last2 = 0;
-	m_samples = machine().device<samples_device>("samples");
 
 	/* setup for save states */
 	save_pointer(NAME(m_ram_1), m_ram.bytes());

src/mame/drivers/tmnt.c

@@ -2167,8 +2167,6 @@ static const k053936_interface prmrsocr_k053936_interface =
 
 MACHINE_START_MEMBER(tmnt_state,common)
 {
-	m_samples = machine().device<samples_device>("samples");
-
 	save_item(NAME(m_toggle));
 	save_item(NAME(m_last));
 	save_item(NAME(m_tmnt_soundlatch));

src/mame/includes/astrof.h

@@ -14,7 +14,8 @@ public:
 		m_videoram(*this, "videoram"),
 		m_astrof_color(*this, "astrof_color"),
 		m_tomahawk_protection(*this, "tomahawk_prot"),
-		m_maincpu(*this, "maincpu"){ }
+		m_maincpu(*this, "maincpu"),
+		m_samples(*this, "samples") { }
 
 	/* video-related */
 	required_shared_ptr<UINT8> m_videoram;
@@ -38,7 +39,7 @@ public:
 
 	/* devices */
 	required_device<cpu_device> m_maincpu;
-	samples_device *m_samples;  // astrof & abattle
+	optional_device<samples_device> m_samples;  // astrof & abattle
 	device_t *m_sn; // tomahawk
 	DECLARE_READ8_MEMBER(irq_clear_r);
 	DECLARE_WRITE8_MEMBER(astrof_videoram_w);

src/mame/includes/circus.h

@@ -7,6 +7,7 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_videoram(*this, "videoram"),
 		m_maincpu(*this, "maincpu"),
+		m_samples(*this, "samples"),
 		m_discrete(*this, "discrete"){ }
 
 	/* memory pointers */
@@ -20,7 +21,7 @@ public:
 
 	/* devices */
 	required_device<cpu_device> m_maincpu;
-	samples_device *m_samples;
+	required_device<samples_device> m_samples;
 	required_device<discrete_device> m_discrete;
 
 	/* game id */

src/mame/includes/cosmic.h

@@ -18,6 +18,7 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_videoram(*this, "videoram"),
 		m_spriteram(*this, "spriteram"),
+		m_samples(*this, "samples"),
 		m_dac(*this, "dac"),
 		m_maincpu(*this, "maincpu") { }
 
@@ -41,7 +42,7 @@ public:
 	UINT32         m_pixel_clock;
 
 	/* devices */
-	samples_device *m_samples;
+	optional_device<samples_device> m_samples;
 	required_device<dac_device> m_dac;
 	DECLARE_WRITE8_MEMBER(panic_sound_output_w);
 	DECLARE_WRITE8_MEMBER(panic_sound_output2_w);

src/mame/includes/gotya.h

@@ -10,6 +10,7 @@ public:
 		m_colorram(*this, "colorram"),
 		m_videoram2(*this, "videoram2"),
 		m_spriteram(*this, "spriteram"),
+		m_samples(*this, "samples"),
 		m_maincpu(*this, "maincpu") { }
 
 	/* memory pointers */
@@ -27,7 +28,7 @@ public:
 	int      m_theme_playing;
 
 	/* devices */
-	samples_device *m_samples;
+	required_device<samples_device> m_samples;
 	DECLARE_WRITE8_MEMBER(gotya_videoram_w);
 	DECLARE_WRITE8_MEMBER(gotya_colorram_w);
 	DECLARE_WRITE8_MEMBER(gotya_video_control_w);

src/mame/includes/m10.h

@@ -38,7 +38,8 @@ public:
 		m_videoram(*this, "videoram"),
 		m_colorram(*this, "colorram"),
 		m_chargen(*this, "chargen"),
-		m_maincpu(*this, "maincpu"){ }
+		m_maincpu(*this, "maincpu"),
+		m_samples(*this, "samples"){ }
 
 	/* memory pointers */
 	required_shared_ptr<UINT8> m_memory;
@@ -65,7 +66,7 @@ public:
 	required_device<cpu_device> m_maincpu;
 	device_t *m_ic8j1;
 	device_t *m_ic8j2;
-	samples_device *m_samples;
+	required_device<samples_device> m_samples;
 	DECLARE_WRITE8_MEMBER(m10_ctrl_w);
 	DECLARE_WRITE8_MEMBER(m11_ctrl_w);
 	DECLARE_WRITE8_MEMBER(m15_ctrl_w);

src/mame/includes/mw8080bw.h

@@ -39,7 +39,10 @@ public:
 		m_maincpu(*this,"maincpu"),
 		m_main_ram(*this, "main_ram"),
 		m_colorram(*this, "colorram"),
-		m_discrete(*this, "discrete")
+		m_discrete(*this, "discrete"),
+		m_samples(*this, "samples"),
+		m_samples1(*this, "samples1"),
+		m_samples2(*this, "samples2")
 	{ }
 
 	/* device/memory pointers */
@@ -73,9 +76,9 @@ public:
 
 	/* other devices */
 	device_t *m_mb14241;
-	samples_device *m_samples;
+	optional_device<samples_device> m_samples;
-	samples_device *m_samples1;
+	optional_device<samples_device> m_samples1;
-	samples_device *m_samples2;
+	optional_device<samples_device> m_samples2;
 	device_t *m_sn1;
 	device_t *m_sn2;
 	device_t *m_sn;

src/mame/includes/rallyx.h

@@ -14,7 +14,8 @@ public:
 		: driver_device(mconfig, type, tag),
 		m_videoram(*this, "videoram"),
 		m_radarattr(*this, "radarattr"),
-		m_maincpu(*this, "maincpu") { }
+		m_maincpu(*this, "maincpu"),
+		m_samples(*this, "samples") { }
 
 	/* memory pointers */
 	required_shared_ptr<UINT8> m_videoram;
@@ -38,7 +39,7 @@ public:
 
 	/* devices */
 	required_device<cpu_device> m_maincpu;
-	samples_device *m_samples;
+	optional_device<samples_device> m_samples;
 
 	UINT8    m_main_irq_mask;
 	DECLARE_WRITE8_MEMBER(rallyx_interrupt_vector_w);

src/mame/includes/tmnt.h

@@ -24,7 +24,8 @@ public:
 		m_k053251(*this, "k053251"),
 		m_k053936(*this, "k053936"),
 		m_k054000(*this, "k054000"),
-		m_upd7759(*this, "upd"){ }
+		m_upd7759(*this, "upd"),
+		m_samples(*this, "samples"){ }
 
 	/* memory pointers */
 	optional_shared_ptr<UINT16> m_spriteram;
@@ -75,7 +76,7 @@ public:
 	optional_device<k053936_device> m_k053936;
 	optional_device<k054000_device> m_k054000;
 	optional_device<upd7759_device> m_upd7759;
-	samples_device *m_samples;
+	optional_device<samples_device> m_samples;
 
 	/* memory buffers */
 	INT16      m_sampledata[0x40000];

src/mame/machine/mw8080bw.c

@@ -95,9 +95,6 @@ MACHINE_START_MEMBER(mw8080bw_state,mw8080bw)
 {
 	mw8080bw_create_interrupt_timer();
 
-	m_samples = machine().device<samples_device>("samples");
-	m_samples1 = machine().device<samples_device>("samples1");
-	m_samples2 = machine().device<samples_device>("samples2");
 	m_sn = machine().device("snsnd");
 	m_sn1 = machine().device("sn1");
 	m_sn2 = machine().device("sn2");