diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/chips/common/ptr.hpp | 110 | ||||
| -rw-r--r-- | src/chips/dosbox/dbopl.cpp | 11 |
2 files changed, 114 insertions, 7 deletions
diff --git a/src/chips/common/ptr.hpp b/src/chips/common/ptr.hpp new file mode 100644 index 0000000..af37a67 --- /dev/null +++ b/src/chips/common/ptr.hpp @@ -0,0 +1,110 @@ +/* + * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation + * + * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> + * + * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: + * http://iki.fi/bisqwit/source/adlmidi.html + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef MY_PTR_HPP_THING +#define MY_PTR_HPP_THING + +#include <stddef.h> +#include <stdlib.h> + +/* + Generic deleters for smart pointers + */ +template <class T> +struct My_DefaultDelete +{ + void operator()(T *x) { delete x; } +}; + +template <class T> +struct My_DefaultArrayDelete +{ + void operator()(T *x) { delete[] x; } +}; + +struct My_CDelete +{ + void operator()(void *x) { free(x); } +}; + +/* + Safe unique pointer for C++98, non-copyable but swappable. +*/ +template< class T, class Deleter = My_DefaultDelete<T> > +class My_UPtr +{ + T *m_p; +public: + explicit My_UPtr(T *p = NULL) + : m_p(p) {} + ~My_UPtr() + { + reset(); + } + + void reset(T *p = NULL) + { + if(p != m_p) + { + if(m_p) + { + Deleter del; + del(m_p); + } + m_p = p; + } + } + + T *get() const + { + return m_p; + } + + T *release() + { + T *ret = m_p; + m_p = NULL; + return ret; + } + + T &operator*() const + { + return *m_p; + } + + T *operator->() const + { + return m_p; + } + + T &operator[](size_t index) const + { + return m_p[index]; + } + +private: + My_UPtr(const My_UPtr &); + My_UPtr &operator=(const My_UPtr &); +}; + +#endif // MY_PTR_HPP_THING diff --git a/src/chips/dosbox/dbopl.cpp b/src/chips/dosbox/dbopl.cpp index 5b4bf53..c5a7024 100644 --- a/src/chips/dosbox/dbopl.cpp +++ b/src/chips/dosbox/dbopl.cpp @@ -41,6 +41,7 @@ #include <memory> #include "dbopl.h" #include "../common/mutex.hpp" +#include "../common/ptr.hpp" #if defined(__GNUC__) && __GNUC__ > 3 #define INLINE inline __attribute__((__always_inline__)) @@ -1353,11 +1354,7 @@ static const CacheEntry &ComputeRateDependent( Bit32u rate ) double original = OPLRATE; double scale = original / (double)rate; -#if __cplusplus >= 201103L - std::unique_ptr<CacheEntry> entry(new CacheEntry); -#else - std::auto_ptr<CacheEntry> entry(new CacheEntry); -#endif + My_UPtr<CacheEntry> entry(new CacheEntry); entry->rate = rate; Bit32u *freqMul = entry->freqMul; Bit32u *linearRates = entry->linearRates; @@ -1438,8 +1435,8 @@ static const CacheEntry &ComputeRateDependent( Bit32u rate ) } MutexHolder lock( cache.mutex ); - if (const CacheEntry *entry = CacheLookupRateDependent( rate )) - return *entry; + if (const CacheEntry *e = CacheLookupRateDependent( rate )) + return *e; cache.entries.push_back(entry.get()); return *entry.release(); |