summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2016-04-30 17:12:38 +0200
committer Ivan Vangelista <mesgnet@yahoo.it>2016-04-30 17:12:38 +0200
commit9727a393f11fe3ac5a8f8234dcb671db533f2720 (patch)
tree18edf0b734c3f4d629bdf36bdaa1e1435f3ce823
parent7f59f43e2fa439f8168852fb95ddb7927df31a16 (diff)
warpwarp.cpp: allow separate building (nw)
-rw-r--r--scripts/target/mame/arcade.lua1
-rw-r--r--src/mame/audio/geebee.cpp2
-rw-r--r--src/mame/audio/geebee.h38
-rw-r--r--src/mame/audio/warpwarp.h38
-rw-r--r--src/mame/includes/warpwarp.h2
5 files changed, 42 insertions, 39 deletions
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index ccd5600baa4..e04c5fa90da 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -2617,6 +2617,7 @@ files {
MAME_DIR .. "src/mame/drivers/warpwarp.cpp",
MAME_DIR .. "src/mame/includes/warpwarp.h",
MAME_DIR .. "src/mame/audio/geebee.cpp",
+ MAME_DIR .. "src/mame/audio/geebee.h",
MAME_DIR .. "src/mame/audio/warpwarp.cpp",
MAME_DIR .. "src/mame/audio/warpwarp.h",
MAME_DIR .. "src/mame/video/warpwarp.cpp",
diff --git a/src/mame/audio/geebee.cpp b/src/mame/audio/geebee.cpp
index d16f3c68cb5..dc19b471233 100644
--- a/src/mame/audio/geebee.cpp
+++ b/src/mame/audio/geebee.cpp
@@ -10,7 +10,7 @@
****************************************************************************/
#include "emu.h"
-#include "audio/warpwarp.h"
+#include "audio/geebee.h"
const device_type GEEBEE = &device_creator<geebee_sound_device>;
diff --git a/src/mame/audio/geebee.h b/src/mame/audio/geebee.h
new file mode 100644
index 00000000000..643d8982028
--- /dev/null
+++ b/src/mame/audio/geebee.h
@@ -0,0 +1,38 @@
+// license:GPL-2.0+
+// copyright-holders:Juergen Buchmueller
+
+class geebee_sound_device : public device_t,
+ public device_sound_interface
+{
+public:
+ geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
+ enum
+ {
+ TIMER_VOLUME_DECAY
+ };
+
+ DECLARE_WRITE8_MEMBER( sound_w );
+
+protected:
+ // device-level overrides
+ virtual void device_start() override;
+
+ // sound stream update overrides
+ virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
+
+ virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+private:
+ // internal state
+ std::unique_ptr<UINT16[]> m_decay;
+ sound_stream *m_channel;
+ int m_sound_latch;
+ int m_sound_signal;
+ int m_volume;
+ emu_timer *m_volume_timer;
+ int m_noise;
+ int m_vcount;
+};
+
+extern const device_type GEEBEE;
diff --git a/src/mame/audio/warpwarp.h b/src/mame/audio/warpwarp.h
index c14c61f63b5..2dc173ed992 100644
--- a/src/mame/audio/warpwarp.h
+++ b/src/mame/audio/warpwarp.h
@@ -1,43 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:Allard van der Bas
-class geebee_sound_device : public device_t,
- public device_sound_interface
-{
-public:
- geebee_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
-
- enum
- {
- TIMER_VOLUME_DECAY
- };
-
- DECLARE_WRITE8_MEMBER( sound_w );
-
-protected:
- // device-level overrides
- virtual void device_start() override;
-
- // sound stream update overrides
- virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-
- virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
-
-private:
- // internal state
- std::unique_ptr<UINT16[]> m_decay;
- sound_stream *m_channel;
- int m_sound_latch;
- int m_sound_signal;
- int m_volume;
- emu_timer *m_volume_timer;
- int m_noise;
- int m_vcount;
-};
-
-extern const device_type GEEBEE;
-
-
-
class warpwarp_sound_device : public device_t,
public device_sound_interface
diff --git a/src/mame/includes/warpwarp.h b/src/mame/includes/warpwarp.h
index 62e8cde7937..62fd164b27a 100644
--- a/src/mame/includes/warpwarp.h
+++ b/src/mame/includes/warpwarp.h
@@ -1,5 +1,7 @@
// license:BSD-3-Clause
// copyright-holders:Chris Hardy
+
+#include "audio/geebee.h"
#include "audio/warpwarp.h"
class warpwarp_state : public driver_device