summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/speaker.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu/speaker.h')
-rw-r--r--src/emu/speaker.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/emu/speaker.h b/src/emu/speaker.h
index 13ea7c08958..bbd55ac66f1 100644
--- a/src/emu/speaker.h
+++ b/src/emu/speaker.h
@@ -7,16 +7,11 @@
Speaker output sound device.
***************************************************************************/
-
-#pragma once
-
-#ifndef __EMU_H__
-#error Dont include this file directly; include emu.h instead.
-#endif
-
#ifndef MAME_EMU_SPEAKER_H
#define MAME_EMU_SPEAKER_H
+#pragma once
+
//**************************************************************************
// GLOBAL VARIABLES
@@ -50,8 +45,7 @@ extern const device_type SPEAKER;
// ======================> speaker_device
-class speaker_device : public device_t,
- public device_mixer_interface
+class speaker_device : public device_t, public device_mixer_interface
{
public:
// construction/destruction
@@ -83,7 +77,10 @@ protected:
// speaker device iterator
-typedef device_type_iterator<&device_creator<speaker_device>, speaker_device> speaker_device_iterator;
+typedef device_type_iterator<SPEAKER, speaker_device> speaker_device_iterator;
+
+extern template class device_finder<speaker_device, false>;
+extern template class device_finder<speaker_device, true>;
#endif /* MAME_EMU_SPEAKER_H */