retronetworking
/
capisuite
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2004-02-11 Gernot Hillier <gernot@hillier.de> 

* scripts/incoming.py (faxIncoming,CVS log): fixed two typos /
          removed not allowed german umlauts
        * src/modules/audioreceive.h (AudioReceive): correct exception
          declaration order (thx to Matthias Haberkorn for the patch)
        * src/modules/callmodule.h (mainLoop): Likewise.


git-svn-id: https://svn.ibp.de/svn/capisuite/trunk/capisuite@229 4ebea2bb-67d4-0310-8558-a5799e421b66
This commit is contained in:
gernot 2004-02-11 05:17:43 +00:00
parent 2027da93b7
commit ad6c633600
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-02-11 Gernot Hillier <gernot@hillier.de>
* scripts/incoming.py (faxIncoming,CVS log): fixed two typos /
removed not allowed german umlauts
* src/modules/audioreceive.h (AudioReceive): correct exception
declaration order (thx to Matthias Haberkorn for the patch)
* src/modules/callmodule.h (mainLoop): Likewise.
2004-02-08 Gernot Hillier <gernot@hillier.de>
* src/application/capisuitemodule.cpp (capisuite_audio_send,
capisuite_fax_send): catch some missing Exceptions

8
scripts/incoming.py
View File

@ -2,7 +2,7 @@
# ----------------------------------------------------
# copyright : (C) 2002 by Gernot Hillier
# email : gernot@hillier.de
# version : $Revision: 1.17 $
# version : $Revision: 1.18 $
#
# 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
@ -134,7 +134,7 @@ def faxIncoming(call,call_from,call_to,curr_user,config,already_connected):
if (os.access(filename,os.R_OK)):
cs_helpers.writeDescription(filename,
"call_from=\"%s\"\ncall_to=\"%s\"\ntime=\"%s\"\n" \
"call_from=\"%s\"\ncall_to=\"%s\"\ntime=\"%s\"\n" \
"cause=\"0x%x/0x%x\"\n" % (call_from,call_to,time.ctime(),cause,causeB3))
userdata=pwd.getpwnam(curr_user)
os.chmod(filename,0600)
@ -155,7 +155,7 @@ def faxIncoming(call,call_from,call_to,curr_user,config,already_connected):
if (action=="mailandsave"):
mailText="You got a fax from %s to %s\nDate: %s" % (call_from,call_to,time.ctime())
if (faxInfo!=None and len(faxInfo)>=5):
mailText="%sStation ID: %s\nTransmission Details: bit rate %i " \
mailText="%sStation ID: %s\nTransmission Details: bit rate %i " \
"%s %s\nPages: %i\n\nSee attached file.\n" \
"The original file was saved to file://%s " \
"on host \"%s\"." % (mailText,faxInfo[0], \
@ -439,7 +439,7 @@ def newAnnouncement(call,userdir,curr_user,config):
# - started implementing faxInfo output in sent mails, not working currently
#
# Revision 1.9 2003/06/27 07:51:09 gernot
# - replaced german umlaut in filename "nachricht-gelöscht.la", can cause
# - replaced german umlaut in filename "nachricht-gelscht.la", can cause
# problems on Redhat, thx to Herbert Hübner for reporting
#
# Revision 1.8 2003/06/16 10:21:05 gernot

4
src/modules/audioreceive.h
View File

@ -2,7 +2,7 @@
@brief Contains AudioReceive - Call Module for receiving audio.
@author Gernot Hillier <gernot@hillier.de>
$Revision: 1.3 $
$Revision: 1.4 $
*/
/***************************************************************************
@ -62,7 +62,7 @@ class AudioReceive: public CallModule
@throw CapiExternalError Thrown if connection is not in speech mode
@throw CapiWrongState Thrown if connection is not up (thrown by base class constructor)
*/
AudioReceive(Connection *conn, string file, int timeout, int silence_timeout, bool DTMF_exit) throw (CapiWrongState,CapiExternalError);
AudioReceive(Connection *conn, string file, int timeout, int silence_timeout, bool DTMF_exit) throw (CapiExternalError,CapiWrongState);
/** @brief Start file reception, wait for one of the timeouts or disconnection and stop the reception.

4
src/modules/callmodule.h
View File

@ -2,7 +2,7 @@
@brief Contains CallModule - Base class for all call handling modules
@author Gernot Hillier <gernot@hillier.de>
$Revision: 1.7 $
$Revision: 1.8 $
*/
/***************************************************************************
@ -78,7 +78,7 @@ class CallModule: public CallInterface
@throw CapiExternalError A given command didn't succeed for a reason not caused by the CAPI (not thrown by CallModule, but may be thrown in subclasses)
@throw CapiWrongState Not thrown here, but sub classes may throw it
*/
virtual void mainLoop() throw (CapiError,CapiWrongState,CapiMsgError,CapiExternalError);
virtual void mainLoop() throw (CapiWrongState,CapiMsgError,CapiExternalError,CapiError);
/** @brief empty here.