diff options
| -rw-r--r-- | src/menu/background_image.cpp | 2 | ||||
| -rw-r--r-- | src/menu/software_mouse_pointer.cpp | 2 | ||||
| -rw-r--r-- | src/utils/activator.cpp | 43 | ||||
| -rw-r--r-- | src/utils/activator.hpp | 22 |
4 files changed, 51 insertions, 18 deletions
diff --git a/src/menu/background_image.cpp b/src/menu/background_image.cpp index e80d82cf..87ca4c36 100644 --- a/src/menu/background_image.cpp +++ b/src/menu/background_image.cpp @@ -63,7 +63,7 @@ namespace usdx size = get_parent().get_size(); } - Activator<Texture> t(texture->get()); + Activator t(texture->get()); glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY); diff --git a/src/menu/software_mouse_pointer.cpp b/src/menu/software_mouse_pointer.cpp index 349dc6e1..a532379d 100644 --- a/src/menu/software_mouse_pointer.cpp +++ b/src/menu/software_mouse_pointer.cpp @@ -94,7 +94,7 @@ namespace usdx return; } - Activator<Texture> a(get_current_texture()); + Activator a(get_current_texture()); glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_TEXTURE_COORD_ARRAY); diff --git a/src/utils/activator.cpp b/src/utils/activator.cpp new file mode 100644 index 00000000..19cf257e --- /dev/null +++ b/src/utils/activator.cpp @@ -0,0 +1,43 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * 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 2 + * of the License, or (at your option) 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; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + */ + +#include "activator.hpp" + +namespace usdx +{ + Activator::Activator(Activatable* activatable) + : activatable(activatable) + { + if (activatable) { + activatable->enable(); + } + } + + Activator::~Activator() + { + if (activatable) { + activatable->disable(); + } + } +}; diff --git a/src/utils/activator.hpp b/src/utils/activator.hpp index 7384b2a8..681fcbf7 100644 --- a/src/utils/activator.hpp +++ b/src/utils/activator.hpp @@ -27,28 +27,18 @@ #include <boost/noncopyable.hpp> +#include "activatable.hpp" + namespace usdx { - template<typename Activatable> - class Activator : public boost::noncopyable + class Activator : public boost::noncopyable { private: Activatable* activatable; - public: - Activator(Activatable* activatable) - : activatable(activatable) - { - if (activatable) { - activatable->enable(); - } - } - virtual ~Activator() - { - if (activatable) { - activatable->disable(); - } - } + public: + Activator(Activatable* activatable); + virtual ~Activator(); }; }; |