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/player | |
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/player')
-rw-r--r-- | engines/sci/sfx/player/players.cpp | 4 | ||||
-rw-r--r-- | engines/sci/sfx/player/polled.cpp | 4 | ||||
-rw-r--r-- | engines/sci/sfx/player/realtime.cpp | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/engines/sci/sfx/player/players.cpp b/engines/sci/sfx/player/players.cpp index 03b6298378..b92ce930b1 100644 --- a/engines/sci/sfx/player/players.cpp +++ b/engines/sci/sfx/player/players.cpp @@ -25,6 +25,8 @@ #include "sci/include/sfx_player.h" +namespace Sci { + extern sfx_player_t sfx_player_realtime; extern sfx_player_t sfx_player_polled; @@ -49,3 +51,5 @@ sfx_find_player(char *name) { return sfx_players[n]; } } + +} // End of namespace Sci diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp index 2274b0003a..9d307940cb 100644 --- a/engines/sci/sfx/player/polled.cpp +++ b/engines/sci/sfx/player/polled.cpp @@ -32,6 +32,8 @@ #include "sci/sfx/softseq.h" #include "sci/sfx/mixer.h" +namespace Sci { + static song_iterator_t *play_it; static int play_paused = 0; static sfx_softseq_t *seq; @@ -315,3 +317,5 @@ sfx_player_t sfx_player_polled = { &pp_tell_synth, 0 /* polyphony */ }; + +} // End of namespace Sci diff --git a/engines/sci/sfx/player/realtime.cpp b/engines/sci/sfx/player/realtime.cpp index ab3abc1513..6aa53d60d3 100644 --- a/engines/sci/sfx/player/realtime.cpp +++ b/engines/sci/sfx/player/realtime.cpp @@ -31,6 +31,8 @@ #include "sci/include/sfx_player.h" #include "sci/sfx/sequencer.h" +namespace Sci { + static sfx_sequencer_t *seq; extern sfx_player_t sfx_player_realtime; @@ -310,3 +312,5 @@ sfx_player_t sfx_player_realtime = { &rt_tell_synth, 0 /* polyphony */ }; + +} // End of namespace Sci |