diff --git a/daemon/src/client/android/jni_interface.i b/daemon/src/client/android/jni_interface.i index 621258509fc12c593e88179093e1aa95f8d0f04b..3b21ac39b8626e5f273f262810b175056157a6c6 100644 --- a/daemon/src/client/android/jni_interface.i +++ b/daemon/src/client/android/jni_interface.i @@ -82,8 +82,6 @@ namespace std { //%constant struct callmanager_callback* WRAPPER_CALLBACK_STRUCT = &wrapper_callback_struct; - -%include "managerimpl.i" %include "callmanager.i" %include "configurationmanager.i" diff --git a/daemon/src/client/android/managerimpl.i b/daemon/src/client/android/managerimpl.i deleted file mode 100644 index d86c546066019368b6488640b2deeb005dac1f79..0000000000000000000000000000000000000000 --- a/daemon/src/client/android/managerimpl.i +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (C) 2004-2012 Savoir-Faire Linux Inc. - * Author: Emeric Vigier <emeric.vigier@savoirfairelinux.com> - * 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 - * (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; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Additional permission under GNU GPL version 3 section 7: - * - * If you modify this program, or any covered work, by linking or - * combining it with the OpenSSL project's OpenSSL library (or a - * modified version of that library), containing parts covered by the - * terms of the OpenSSL or SSLeay licenses, Savoir-Faire Linux Inc. - * grants you additional permission to convey the resulting work. - * Corresponding Source for a non-source form of such a combination - * shall include the source code for the parts of OpenSSL used as well - * as that of the covered work. - */ - -/* %nodefaultctor ManagerImpl; -%nodefaultdtor ManagerImpl; */ -%header %{ -#include <managerimpl.h> -namespace Manager { -extern ManagerImpl& instance(); -} -%} - -class ManagerImpl { -public: - void init(const std::string &config_file); - void setPath(const std::string &path); - bool outgoingCall(const std::string&, const std::string&, const std::string&, const std::string& = ""); - void refuseCall(const std::string& id); - bool answerCall(const std::string& id); - void hangupCall(const std::string& id); -}; - -//%rename(Manager_instance) Manager::instance; - -namespace Manager { - -ManagerImpl& Manager::instance() -{ - // Meyers singleton - static ManagerImpl instance_; - return instance_; -} - -}