diff options
| -rw-r--r-- | dxr3configdata.h | 2 | ||||
| -rw-r--r-- | dxr3singleton.h | 71 | ||||
| -rw-r--r-- | singleton.h | 75 | ||||
| -rw-r--r-- | spuencoder.h | 2 |
4 files changed, 77 insertions, 73 deletions
diff --git a/dxr3configdata.h b/dxr3configdata.h index eb0a0b3..5759ecc 100644 --- a/dxr3configdata.h +++ b/dxr3configdata.h @@ -23,7 +23,7 @@ #ifndef _DXR3_CONFIGDATA_H_ #define _DXR3_CONFIGDATA_H_ -#include "dxr3singleton.h" +#include "singleton.h" #include <linux/em8300.h> // ================================== diff --git a/dxr3singleton.h b/dxr3singleton.h deleted file mode 100644 index 0d6ce3a..0000000 --- a/dxr3singleton.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * dxr3singleton.h - * - * Copyright (C) 2004-2009 Christian Gmeiner - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifndef _DXR3_SINGLETON_H_ -#define _DXR3_SINGLETON_H_ - -#include <memory> -#include <vdr/thread.h> - -template <class T> -class Singleton -{ -public: - static T *instance() { - - // use double-checked looking - // see http://en.wikipedia.org/wiki/Double-checked_locking - if (inst.get() == 0) { - m.Lock(); - if (inst.get() == 0) { - inst = std::auto_ptr<T>(new T); - } - m.Unlock(); - } - - return inst.get(); - } - - virtual ~Singleton() { }; - -protected: - Singleton() { } - -private: - static std::auto_ptr<T> inst; - static cMutex m; -}; - -template<class T> -std::auto_ptr<T> Singleton<T>::inst(0); - -template<class T> -cMutex Singleton<T>::m; - -#endif /*_DXR3_SINGLETON_H_*/ - -// Local variables: -// mode: c++ -// c-file-style: "stroustrup" -// c-file-offsets: ((inline-open . 0)) -// tab-width: 4; -// indent-tabs-mode: nil -// End: diff --git a/singleton.h b/singleton.h new file mode 100644 index 0000000..37ccc95 --- /dev/null +++ b/singleton.h @@ -0,0 +1,75 @@ +/* + * _ _ _ _ _____ + * __ ____| |_ __ _ __ | |_ _ __ _(_)_ __ __| |_ ___ _|___ / + * \ \ / / _` | '__|____| '_ \| | | | |/ _` | | '_ \ _____ / _` \ \/ / '__||_ \ + * \ V / (_| | | |_____| |_) | | |_| | (_| | | | | |_____| (_| |> <| | ___) | + * \_/ \__,_|_| | .__/|_|\__,_|\__, |_|_| |_| \__,_/_/\_\_| |____/ + * |_| |___/ + * + * Copyright (C) 2004-2009 Christian Gmeiner + * + * This file is part of vdr-plugin-dxr3. + * + * vdr-plugin-dxr3 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 version 2. + * + * vdr-plugin-dxr3 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 dxr3-plugin. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#ifndef _SINGLETON_H_ +#define _SINGLETON_H_ + +#include <memory> +#include <vdr/thread.h> + +template <class T> +class Singleton { +public: + static T *instance() { + + // use double-checked looking + // see http://en.wikipedia.org/wiki/Double-checked_locking + if (inst.get() == 0) { + m.Lock(); + if (inst.get() == 0) { + inst = std::auto_ptr<T>(new T); + } + m.Unlock(); + } + + return inst.get(); + } + + virtual ~Singleton() { } + +protected: + Singleton() { } + +private: + static std::auto_ptr<T> inst; + static cMutex m; +}; + +template<class T> +std::auto_ptr<T> Singleton<T>::inst(0); + +template<class T> +cMutex Singleton<T>::m; + +#endif /*_SINGLETON_H_*/ + +// Local variables: +// mode: c++ +// c-file-style: "stroustrup" +// c-file-offsets: ((inline-open . 0)) +// tab-width: 4; +// indent-tabs-mode: nil +// End: diff --git a/spuencoder.h b/spuencoder.h index 05acbf0..845a23c 100644 --- a/spuencoder.h +++ b/spuencoder.h @@ -30,7 +30,7 @@ #include <stdint.h> #include <vdr/osd.h> #include <vector> -#include "dxr3singleton.h" +#include "singleton.h" #include "spuregion.h" static const int MAX_SPU_DATA = 65220; // TODO validate this value |