diff options
author | Oystein Eftevaag | 2009-02-21 10:23:36 +0000 |
---|---|---|
committer | Oystein Eftevaag | 2009-02-21 10:23:36 +0000 |
commit | 25f7c371718f74eb26fed5bd66a803f220c89c3b (patch) | |
tree | e78250ba07d5d28ffecf1621421ab33061edf1e4 /engines/sci/sfx/device | |
parent | 44ea7966108cf56df4a4eb3fd0b2b7df31d937e1 (diff) | |
download | scummvm-rg350-25f7c371718f74eb26fed5bd66a803f220c89c3b.tar.gz scummvm-rg350-25f7c371718f74eb26fed5bd66a803f220c89c3b.tar.bz2 scummvm-rg350-25f7c371718f74eb26fed5bd66a803f220c89c3b.zip |
Wrapped the SCI engine in the Sci namespace.
svn-id: r38676
Diffstat (limited to 'engines/sci/sfx/device')
-rw-r--r-- | engines/sci/sfx/device/alsa-midi.cpp | 4 | ||||
-rw-r--r-- | engines/sci/sfx/device/camd-midi.cpp | 3 | ||||
-rw-r--r-- | engines/sci/sfx/device/devices.cpp | 4 | ||||
-rw-r--r-- | engines/sci/sfx/device/unixraw-midi.cpp | 4 |
4 files changed, 15 insertions, 0 deletions
diff --git a/engines/sci/sfx/device/alsa-midi.cpp b/engines/sci/sfx/device/alsa-midi.cpp index 22f9fbc8d2..2528ed1aa3 100644 --- a/engines/sci/sfx/device/alsa-midi.cpp +++ b/engines/sci/sfx/device/alsa-midi.cpp @@ -29,6 +29,8 @@ #include <alsa/asoundlib.h> +namespace Sci { + #define SCI_ALSA_MIDI_VERSION "0.1" static snd_midi_event_t *parser = NULL; @@ -214,4 +216,6 @@ midi_writer_t sfx_device_midi_alsa = { amclose, }; +} // End of namespace Sci + #endif diff --git a/engines/sci/sfx/device/camd-midi.cpp b/engines/sci/sfx/device/camd-midi.cpp index c4205414cb..307e215a50 100644 --- a/engines/sci/sfx/device/camd-midi.cpp +++ b/engines/sci/sfx/device/camd-midi.cpp @@ -37,6 +37,7 @@ #include <proto/intuition.h> #include <stdio.h> +namespace Sci { #define SWAP_BYTES #define FILL_BYTES @@ -150,4 +151,6 @@ midi_writer_t sfx_device_midi_camd = { &camd_close }; +} // End of namespace Sci + #endif /* HAVE_PROTO_CAMD_H */ diff --git a/engines/sci/sfx/device/devices.cpp b/engines/sci/sfx/device/devices.cpp index 42f5a89dbb..6c4da7e50a 100644 --- a/engines/sci/sfx/device/devices.cpp +++ b/engines/sci/sfx/device/devices.cpp @@ -33,6 +33,8 @@ #include "sci/include/resource.h" +namespace Sci { + static struct _midi_device *devices_midi[] = { NULL }; @@ -84,3 +86,5 @@ sfx_find_device(int type, char *name) { return NULL; } + +} // End of namespace Sci diff --git a/engines/sci/sfx/device/unixraw-midi.cpp b/engines/sci/sfx/device/unixraw-midi.cpp index bd158622bd..501e154cb1 100644 --- a/engines/sci/sfx/device/unixraw-midi.cpp +++ b/engines/sci/sfx/device/unixraw-midi.cpp @@ -30,6 +30,8 @@ #include <sys/stat.h> #include <fcntl.h> +namespace Sci { + #define SCI_UNIXRAW_MIDI_VERSION "0.1" #ifndef O_SYNC @@ -90,3 +92,5 @@ midi_writer_t sfx_device_midi_unixraw = { &unixraw_reset_timer, &unixraw_close }; + +} // End of namespace Sci |