diff options
author | 2015-12-13 11:23:55 +0100 | |
---|---|---|
committer | 2015-12-13 11:23:55 +0100 | |
commit | 4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch) | |
tree | df0e1d28daa79b9151088498a933cd1fc37c9c07 /src/lib/formats/ace_tap.cpp | |
parent | 1cda42b22e591965ee69561fcf52272bd991b3b2 (diff) | |
parent | 14d5966a379e9783ba724750a5f84a72af62cadc (diff) |
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/lib/formats/ace_tap.cpp')
-rw-r--r-- | src/lib/formats/ace_tap.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/formats/ace_tap.cpp b/src/lib/formats/ace_tap.cpp index 3479d6ba1f5..e247b0803d6 100644 --- a/src/lib/formats/ace_tap.cpp +++ b/src/lib/formats/ace_tap.cpp @@ -26,7 +26,7 @@ static int cas_size; /******************************************************************* Generate one high-low cycle of sample data ********************************************************************/ -INLINE int ace_tap_cycle(INT16 *buffer, int sample_pos, int high, int low) +static inline int ace_tap_cycle(INT16 *buffer, int sample_pos, int high, int low) { int i = 0; @@ -48,7 +48,7 @@ INLINE int ace_tap_cycle(INT16 *buffer, int sample_pos, int high, int low) } -INLINE int ace_tap_silence(INT16 *buffer, int sample_pos, int samples) +static inline int ace_tap_silence(INT16 *buffer, int sample_pos, int samples) { int i = 0; @@ -64,7 +64,7 @@ INLINE int ace_tap_silence(INT16 *buffer, int sample_pos, int samples) } -INLINE int ace_tap_byte(INT16 *buffer, int sample_pos, UINT8 data) +static inline int ace_tap_byte(INT16 *buffer, int sample_pos, UINT8 data) { int i, samples; @@ -151,7 +151,7 @@ static int ace_tap_to_wav_size(const UINT8 *casdata, int caslen) { cas_size = caslen; - return ace_handle_tap( NULL, casdata ); + return ace_handle_tap( nullptr, casdata ); } @@ -184,7 +184,7 @@ static const struct CassetteFormat ace_tap_format = "tap", ace_tap_identify, ace_tap_load, - NULL + nullptr }; |