- follow some a little bit stricter rules of gcc-2.95.3
git-svn-id: https://svn.ibp.de/svn/capisuite/trunk/capisuite@9 4ebea2bb-67d4-0310-8558-a5799e421b66
This commit is contained in:
gernot
parent
ff26e4c6f0
commit
c27c7def8c
|
|
@ -2,7 +2,7 @@
|
|||
@brief Contains CapiSuite - Main application class, implements ApplicationInterface
|
||||
|
||||
@author Gernot Hillier <gernot@hillier.de>
|
||||
$Revision: 1.1 $
|
||||
$Revision: 1.2 $
|
||||
*/
|
||||
|
||||
/***************************************************************************
|
||||
|
|
@ -312,7 +312,7 @@ CapiSuite::readConfiguration()
|
|||
if (t[i]<'0' || t[i]>'9')
|
||||
throw ApplicationError("Invalid idle_script_interval given.","main()");
|
||||
|
||||
if (config["log_file"]!="" and config["log_file"]!="-") {
|
||||
if (config["log_file"]!="" && config["log_file"]!="-") {
|
||||
debug = new ofstream(config["log_file"].c_str(),ios::app);
|
||||
if (! (*debug)) {
|
||||
cerr << "Can't open log file. Writing to stdout." << endl;
|
||||
|
|
@ -326,7 +326,7 @@ CapiSuite::readConfiguration()
|
|||
if (t.size()!=1 && (t[0]<'0' || t[0]>'3'))
|
||||
throw ApplicationError("Invalid log_level given.","main()");
|
||||
|
||||
if (config["log_error"]!="" and config["log_error"]!="-") {
|
||||
if (config["log_error"]!="" && config["log_error"]!="-") {
|
||||
error = new ofstream(config["log_error"].c_str(),ios::app);
|
||||
if (! (*error)) {
|
||||
cerr << "Can't open error log file. Writing to stderr." << endl;
|
||||
|
|
@ -400,8 +400,11 @@ CapiSuite::help()
|
|||
/* History
|
||||
|
||||
$Log: capisuite.cpp,v $
|
||||
Revision 1.1 2003/02/19 08:19:53 gernot
|
||||
Initial revision
|
||||
Revision 1.2 2003/02/21 23:21:44 gernot
|
||||
- follow some a little bit stricter rules of gcc-2.95.3
|
||||
|
||||
Revision 1.1.1.1 2003/02/19 08:19:53 gernot
|
||||
initial checkin of 0.4
|
||||
|
||||
Revision 1.14 2003/02/17 16:49:24 ghillie
|
||||
- cosmetic...
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
@brief Contains CapiSuite - Main application class, implements ApplicationInterface
|
||||
|
||||
@author Gernot Hillier <gernot@hillier.de>
|
||||
$Revision: 1.1 $
|
||||
$Revision: 1.2 $
|
||||
*/
|
||||
|
||||
/***************************************************************************
|
||||
|
|
@ -20,6 +20,7 @@
|
|||
#include <Python.h>
|
||||
#include <map>
|
||||
#include <queue>
|
||||
#include <fstream>
|
||||
#include "../backend/applicationinterface.h"
|
||||
#include "applicationexception.h"
|
||||
#include "capisuitemodule.h"
|
||||
|
|
@ -171,8 +172,11 @@ class CapiSuite: public ApplicationInterface
|
|||
/* History
|
||||
|
||||
$Log: capisuite.h,v $
|
||||
Revision 1.1 2003/02/19 08:19:53 gernot
|
||||
Initial revision
|
||||
Revision 1.2 2003/02/21 23:21:44 gernot
|
||||
- follow some a little bit stricter rules of gcc-2.95.3
|
||||
|
||||
Revision 1.1.1.1 2003/02/19 08:19:53 gernot
|
||||
initial checkin of 0.4
|
||||
|
||||
Revision 1.8 2003/01/31 11:25:53 ghillie
|
||||
- moved capisuiteInstance from header to cpp (mustn't be defined in
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
@brief Contains the Python module and integration routines
|
||||
|
||||
@author Gernot Hillier <gernot@hillier.de>
|
||||
$Revision: 1.1 $
|
||||
$Revision: 1.2 $
|
||||
*/
|
||||
|
||||
/***************************************************************************
|
||||
|
|
@ -18,6 +18,7 @@
|
|||
// Connection object! (connection can be already deleted while the python script is still running
|
||||
|
||||
#include <string>
|
||||
#include <unistd.h> // for sleep()
|
||||
#include "../backend/connection.h"
|
||||
#include "../modules/audiosend.h"
|
||||
#include "../modules/audioreceive.h"
|
||||
|
|
@ -964,8 +965,11 @@ capisuitemodule_init () throw (ApplicationError)
|
|||
/* History
|
||||
|
||||
$Log: capisuitemodule.cpp,v $
|
||||
Revision 1.1 2003/02/19 08:19:53 gernot
|
||||
Initial revision
|
||||
Revision 1.2 2003/02/21 23:21:44 gernot
|
||||
- follow some a little bit stricter rules of gcc-2.95.3
|
||||
|
||||
Revision 1.1.1.1 2003/02/19 08:19:53 gernot
|
||||
initial checkin of 0.4
|
||||
|
||||
Revision 1.21 2003/01/31 11:26:46 ghillie
|
||||
- add "extern capisuiteInstance"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
@brief Contains Capi - Main Class for communication with CAPI
|
||||
|
||||
@author Gernot Hillier <gernot@hillier.de>
|
||||
$Revision: 1.1 $
|
||||
$Revision: 1.2 $
|
||||
*/
|
||||
|
||||
/***************************************************************************
|
||||
|
|
@ -33,7 +33,7 @@ void* capi_exec_handler(void* arg)
|
|||
instance->run();
|
||||
}
|
||||
|
||||
Capi::Capi (ostream& debug, unsigned short debug_level, ostream &error, unsigned maxLogicalConnection, unsigned maxBDataBlocks,unsigned maxBDataLen) throw (CapiMsgError, CapiError)
|
||||
Capi::Capi (ostream& debug, unsigned short debug_level, ostream &error, unsigned maxLogicalConnection, unsigned maxBDataBlocks,unsigned maxBDataLen) throw (CapiError, CapiMsgError)
|
||||
:debug(debug),debug_level(debug_level),error(error),messageNumber(0),usedInfoMask(0),usedCIPMask(0)
|
||||
{
|
||||
if (debug_level >= 2)
|
||||
|
|
@ -874,8 +874,11 @@ Capi::getInfo(bool verbose) throw (CapiMsgError)
|
|||
/* History
|
||||
|
||||
$Log: capi.cpp,v $
|
||||
Revision 1.1 2003/02/19 08:19:53 gernot
|
||||
Initial revision
|
||||
Revision 1.2 2003/02/21 23:21:44 gernot
|
||||
- follow some a little bit stricter rules of gcc-2.95.3
|
||||
|
||||
Revision 1.1.1.1 2003/02/19 08:19:53 gernot
|
||||
initial checkin of 0.4
|
||||
|
||||
Revision 1.28 2003/02/10 14:20:52 ghillie
|
||||
merged from NATIVE_PTHREADS to HEAD
|
||||
|
|
|
|||
Loading…
Reference in New Issue