diff options
Diffstat (limited to 'src/miav.cc')
| -rw-r--r-- | src/miav.cc | 49 |
1 files changed, 33 insertions, 16 deletions
diff --git a/src/miav.cc b/src/miav.cc index 2316413..daac99d 100644 --- a/src/miav.cc +++ b/src/miav.cc @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /*************************************************************************** * miav.cc * @@ -7,33 +8,40 @@ ****************************************************************************/ /* - * 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 file is part of MIaV. * - * 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 Library General Public License for more details. + * MIaV 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. * - * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * MIaV 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 MIaV; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ + /* * $Id$ */ + /* * $Log$ + * Revision 1.7 2005/05/03 08:31:59 deva + * Removed the error object, and replaced it with a more generic info object. + * * Revision 1.6 2005/05/02 19:47:43 deva * Fixed overlapping cpr numbers on the server (now it saves one cpr pr. * connection, and ignores any changes sent) * * Revision 1.5 2005/05/01 09:56:26 deva * Added Id and Log tags to all files - * */ + #include <config.h> #include "server.h" @@ -47,6 +55,9 @@ #include "miav_config.h" +#include "info_console.h" +#include "info_gui.h" + #include <stdio.h> enum { @@ -112,8 +123,6 @@ int server(int argc, char *argv[]) { int main(int argc, char *argv[]) { - Error conferr; - config = new MiavConfig(ETC"/miav.conf", &conferr); int mode = MODE_GRAB; @@ -128,9 +137,17 @@ int main(int argc, char *argv[]) switch(mode) { case MODE_GRAB: - return grab(argc - 2, &argv[2]); + { + InfoGui info; + config = new MiavConfig(ETC"/miav.conf", &info); + return grab(argc - 2, &argv[2]); + } case MODE_SERVER: - return server(argc - 2, &argv[2]); + { + InfoConsole info; + config = new MiavConfig(ETC"/miav.conf", &info); + return server(argc - 2, &argv[2]); + } } return 0; } |