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/trs_cas.cpp | |
parent | 1cda42b22e591965ee69561fcf52272bd991b3b2 (diff) | |
parent | 14d5966a379e9783ba724750a5f84a72af62cadc (diff) |
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/lib/formats/trs_cas.cpp')
-rw-r--r-- | src/lib/formats/trs_cas.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/formats/trs_cas.cpp b/src/lib/formats/trs_cas.cpp index a4f748dea05..ec8bea116a7 100644 --- a/src/lib/formats/trs_cas.cpp +++ b/src/lib/formats/trs_cas.cpp @@ -21,7 +21,7 @@ static int cas_size; /******************************************************************* Generate one high-low cycle of sample data ********************************************************************/ -INLINE int trs80l2_cas_cycle(INT16 *buffer, int sample_pos, int silence, int high, int low) +static inline int trs80l2_cas_cycle(INT16 *buffer, int sample_pos, int silence, int high, int low) { int i = 0; @@ -96,7 +96,7 @@ static int trs80l2_cas_to_wav_size(const UINT8 *casdata, int caslen) { cas_size = caslen; - return trs80l2_handle_cas( NULL, casdata ); + return trs80l2_handle_cas( nullptr, casdata ); } static const struct CassetteLegacyWaveFiller trs80l2_cas_legacy_fill_wave = @@ -128,7 +128,7 @@ static const struct CassetteFormat trs80l2_cas_format = "cas", trs80l2_cas_identify, trs80l2_cas_load, - NULL + nullptr }; |