From 3497f9e94a062688ef71c0d19ffd23561df2fc0c Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Sun, 10 Feb 2008 18:41:12 +0000 Subject: [PATCH] fixed header include due to AmAudio/AmAudioFile split git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@710 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- apps/ann_b2b/AnnounceB2B.h | 2 +- apps/announce_transfer/AnnounceTransfer.h | 1 + apps/announcement/Announcement.h | 1 + apps/click2dial/Click2Dial.h | 2 +- apps/conference/Conference.h | 1 + apps/early_announce/EarlyAnnounce.h | 1 + apps/examples/announce_auth/AnnounceAuth.h | 1 + apps/examples/di_dialer/DIDial.cpp | 8 ++-- apps/examples/dtmftester/DtmfTester.h | 1 + apps/examples/early_record/EarlyRecord.h | 2 +- apps/examples/jukecall/Jukecall.h | 1 + apps/examples/serviceline/ServiceLine.h | 2 +- .../simple_conference/SimpleConference.h | 1 + .../tutorial/myannounceapp/MyAnnounceApp.h | 2 +- apps/examples/tutorial/mycc/MyCC.cpp | 2 +- .../examples/tutorial/myjukebox/MyJukebox.cpp | 2 +- apps/ivr/Ivr.cpp | 47 ++++++++++--------- apps/ivr/IvrAudio.h | 1 + apps/py_sems/PySemsAudio.h | 2 +- apps/py_sems/sip/AmAudio.sip | 2 +- apps/voicemail/AnswerMachine.h | 1 + 21 files changed, 48 insertions(+), 35 deletions(-) diff --git a/apps/ann_b2b/AnnounceB2B.h b/apps/ann_b2b/AnnounceB2B.h index 187865fe..f55d565e 100644 --- a/apps/ann_b2b/AnnounceB2B.h +++ b/apps/ann_b2b/AnnounceB2B.h @@ -30,7 +30,7 @@ #include "AmSession.h" #include "AmConfigReader.h" -#include "AmAudio.h" +#include "AmAudioFile.h" #include "AmB2BSession.h" #include diff --git a/apps/announce_transfer/AnnounceTransfer.h b/apps/announce_transfer/AnnounceTransfer.h index ae2ccc07..9b75756f 100644 --- a/apps/announce_transfer/AnnounceTransfer.h +++ b/apps/announce_transfer/AnnounceTransfer.h @@ -30,6 +30,7 @@ #define _ANNOUNCETRANSFER_H_ #include "AmSession.h" +#include "AmAudioFile.h" #include "AmConfigReader.h" #include diff --git a/apps/announcement/Announcement.h b/apps/announcement/Announcement.h index dd025177..5e2b6392 100644 --- a/apps/announcement/Announcement.h +++ b/apps/announcement/Announcement.h @@ -29,6 +29,7 @@ #define _ANNOUNCEMENT_H_ #include "AmSession.h" +#include "AmAudioFile.h" #include "AmConfigReader.h" #include "ampi/UACAuthAPI.h" diff --git a/apps/click2dial/Click2Dial.h b/apps/click2dial/Click2Dial.h index f94619de..6e28e53e 100644 --- a/apps/click2dial/Click2Dial.h +++ b/apps/click2dial/Click2Dial.h @@ -31,7 +31,7 @@ #include "AmSession.h" #include "AmConfigReader.h" -#include "AmAudio.h" +#include "AmAudioFile.h" #include "AmB2BSession.h" #include "ampi/UACAuthAPI.h" diff --git a/apps/conference/Conference.h b/apps/conference/Conference.h index 09efee7e..ae659142 100644 --- a/apps/conference/Conference.h +++ b/apps/conference/Conference.h @@ -35,6 +35,7 @@ #include "AmApi.h" #include "AmThread.h" #include "AmSession.h" +#include "AmAudioFile.h" #include "AmConferenceChannel.h" #include "AmPlaylist.h" #include "AmRingTone.h" diff --git a/apps/early_announce/EarlyAnnounce.h b/apps/early_announce/EarlyAnnounce.h index ec9ccc69..1f97e0aa 100644 --- a/apps/early_announce/EarlyAnnounce.h +++ b/apps/early_announce/EarlyAnnounce.h @@ -29,6 +29,7 @@ #define _EarlyAnnounce_h_ #include "AmSession.h" +#include "AmAudioFile.h" #include "AmConfigReader.h" #include diff --git a/apps/examples/announce_auth/AnnounceAuth.h b/apps/examples/announce_auth/AnnounceAuth.h index 13b562cf..814b2597 100644 --- a/apps/examples/announce_auth/AnnounceAuth.h +++ b/apps/examples/announce_auth/AnnounceAuth.h @@ -30,6 +30,7 @@ #define _ANNOUNCEAUTH_H_ #include "AmSession.h" +#include "AmAudioFile.h" #include "AmConfigReader.h" #include "ampi/UACAuthAPI.h" diff --git a/apps/examples/di_dialer/DIDial.cpp b/apps/examples/di_dialer/DIDial.cpp index e6e3f2c1..ebabc939 100644 --- a/apps/examples/di_dialer/DIDial.cpp +++ b/apps/examples/di_dialer/DIDial.cpp @@ -7,6 +7,8 @@ #include "AmConfigReader.h" #include "AmUtils.h" +#include + #define APP_NAME "di_dial" class DIDialFactory : public AmDynInvokeFactory @@ -19,13 +21,13 @@ public: return DIDial::instance(); } - static map dialout_pins; + static std::map dialout_pins; int onLoad(); }; // note its not really safe to store plaintext passwords in memory -map DIDialFactory::dialout_pins; +std::map DIDialFactory::dialout_pins; int DIDialFactory::onLoad(){ @@ -225,7 +227,7 @@ string DIDial::dialout_pin(const string& application, application.c_str(), user.c_str(), to_user.c_str(), pin.c_str()); // find pin - map::iterator it = DIDialFactory::dialout_pins.find(pin); + std::map::iterator it = DIDialFactory::dialout_pins.find(pin); if (it != DIDialFactory::dialout_pins.end()) { AmArg* a = new AmArg(); a->setBorrowedPointer(new UACAuthCred(it->second.realm, diff --git a/apps/examples/dtmftester/DtmfTester.h b/apps/examples/dtmftester/DtmfTester.h index 86254211..9546f81d 100644 --- a/apps/examples/dtmftester/DtmfTester.h +++ b/apps/examples/dtmftester/DtmfTester.h @@ -29,6 +29,7 @@ #define _ANNOUNCEMENT_H_ #include "AmSession.h" +#include "AmAudioFile.h" #include "AmConfigReader.h" #include "AmPlaylist.h" diff --git a/apps/examples/early_record/EarlyRecord.h b/apps/examples/early_record/EarlyRecord.h index 9cc84083..694a7ec5 100644 --- a/apps/examples/early_record/EarlyRecord.h +++ b/apps/examples/early_record/EarlyRecord.h @@ -2,7 +2,7 @@ #define _EARLY_RECORD_H_ #include "AmSession.h" -#include "AmAudio.h" +#include "AmAudioFile.h" #include "ampi/UACAuthAPI.h" #include diff --git a/apps/examples/jukecall/Jukecall.h b/apps/examples/jukecall/Jukecall.h index 47a13911..6ec31ee2 100644 --- a/apps/examples/jukecall/Jukecall.h +++ b/apps/examples/jukecall/Jukecall.h @@ -30,6 +30,7 @@ #include "AmB2ABSession.h" #include "AmConfigReader.h" +#include "AmAudioFile.h" #include "AmApi.h" #include diff --git a/apps/examples/serviceline/ServiceLine.h b/apps/examples/serviceline/ServiceLine.h index 088f92f0..5187522f 100644 --- a/apps/examples/serviceline/ServiceLine.h +++ b/apps/examples/serviceline/ServiceLine.h @@ -30,7 +30,7 @@ #include "AmApi.h" #include "AmConfigReader.h" -#include "AmAudio.h" +#include "AmAudioFile.h" #include "AmB2ABSession.h" #include "ampi/UACAuthAPI.h" diff --git a/apps/examples/simple_conference/SimpleConference.h b/apps/examples/simple_conference/SimpleConference.h index 9dd2cc17..ef170bdd 100644 --- a/apps/examples/simple_conference/SimpleConference.h +++ b/apps/examples/simple_conference/SimpleConference.h @@ -29,6 +29,7 @@ #include "AmApi.h" #include "AmSession.h" +#include "AmAudioFile.h" #include "AmConferenceChannel.h" #include "AmPlaylist.h" diff --git a/apps/examples/tutorial/myannounceapp/MyAnnounceApp.h b/apps/examples/tutorial/myannounceapp/MyAnnounceApp.h index 8323be8a..34abcec5 100644 --- a/apps/examples/tutorial/myannounceapp/MyAnnounceApp.h +++ b/apps/examples/tutorial/myannounceapp/MyAnnounceApp.h @@ -2,7 +2,7 @@ #define _MYANNOUNCEAPP_H_ #include "AmSession.h" -#include "AmAudio.h" +#include "AmAudioFile.h" #include using std::string; diff --git a/apps/examples/tutorial/mycc/MyCC.cpp b/apps/examples/tutorial/mycc/MyCC.cpp index c1232413..1b95bd2a 100644 --- a/apps/examples/tutorial/mycc/MyCC.cpp +++ b/apps/examples/tutorial/mycc/MyCC.cpp @@ -4,7 +4,7 @@ #include "log.h" #include "AmConfigReader.h" #include "AmUtils.h" -#include "AmAudio.h" +#include "AmAudioFile.h" #include "AmPlugIn.h" #include "AmMediaProcessor.h" diff --git a/apps/examples/tutorial/myjukebox/MyJukebox.cpp b/apps/examples/tutorial/myjukebox/MyJukebox.cpp index f5de5953..3129f106 100644 --- a/apps/examples/tutorial/myjukebox/MyJukebox.cpp +++ b/apps/examples/tutorial/myjukebox/MyJukebox.cpp @@ -4,7 +4,7 @@ #include "log.h" #include "AmConfigReader.h" #include "AmUtils.h" -#include "AmAudio.h" +#include "AmAudioFile.h" #define MOD_NAME "myjukebox" diff --git a/apps/ivr/Ivr.cpp b/apps/ivr/Ivr.cpp index 114ee300..befdf123 100644 --- a/apps/ivr/Ivr.cpp +++ b/apps/ivr/Ivr.cpp @@ -364,37 +364,38 @@ bool IvrFactory::loadScript(const string& path) AmConfigReader cfg; string cfg_file = add2path(AmConfig::ModConfigPath,1,(path + ".conf").c_str()); if(cfg.loadFile(cfg_file)){ - ERROR("could not load config file at %s\n",cfg_file.c_str()); - goto error2; - } + WARN("could not load config file at %s\n",cfg_file.c_str()); + } else { - config = PyDict_New(); - if(!config){ - ERROR("could not allocate new dict for config\n"); - goto error2; - } + config = PyDict_New(); + if(!config){ + ERROR("could not allocate new dict for config\n"); + goto error2; + } - for(map::const_iterator it = cfg.begin(); - it != cfg.end(); it++){ - PyDict_SetItem(config, - PyString_FromString(it->first.c_str()), - PyString_FromString(it->second.c_str())); - } + for(map::const_iterator it = cfg.begin(); + it != cfg.end(); it++){ + PyDict_SetItem(config, + PyString_FromString(it->first.c_str()), + PyString_FromString(it->second.c_str())); + } - // set config ivr ivr_module while loading - Py_INCREF(config); - PyObject_SetAttrString(ivr_module,"config",config); + // set config ivr ivr_module while loading + Py_INCREF(config); + PyObject_SetAttrString(ivr_module,"config",config); + } // load module modName = PyString_FromString(path.c_str()); - + mod = PyImport_Import(modName); Py_DECREF(modName); - - // remove config ivr ivr_module while loading - PyObject_DelAttrString(ivr_module, "config"); - Py_DECREF(config); - + if (NULL != config) { + // remove config ivr ivr_module while loading + PyObject_DelAttrString(ivr_module, "config"); + Py_DECREF(config); + } + if(!mod){ PyErr_Print(); WARN("IvrFactory: Failed to load \"%s\"\n", path.c_str()); diff --git a/apps/ivr/IvrAudio.h b/apps/ivr/IvrAudio.h index 29d0ea7f..ff09e90e 100644 --- a/apps/ivr/IvrAudio.h +++ b/apps/ivr/IvrAudio.h @@ -6,6 +6,7 @@ #include #include "AmAudio.h" +#include "AmAudioFile.h" #define AUDIO_READ 1 #define AUDIO_WRITE 2 diff --git a/apps/py_sems/PySemsAudio.h b/apps/py_sems/PySemsAudio.h index 7e3181fe..e1a1b4bc 100644 --- a/apps/py_sems/PySemsAudio.h +++ b/apps/py_sems/PySemsAudio.h @@ -5,7 +5,7 @@ #include #include "structmember.h" -#include "AmAudio.h" +#include "AmAudioFile.h" #define AUDIO_READ 1 #define AUDIO_WRITE 2 diff --git a/apps/py_sems/sip/AmAudio.sip b/apps/py_sems/sip/AmAudio.sip index 19a92834..d8a3e2df 100644 --- a/apps/py_sems/sip/AmAudio.sip +++ b/apps/py_sems/sip/AmAudio.sip @@ -48,7 +48,7 @@ class AmAudioFile { %TypeHeaderCode -#include "../../../core/AmAudio.h" +#include "../../../core/AmAudioFile.h" %End public: diff --git a/apps/voicemail/AnswerMachine.h b/apps/voicemail/AnswerMachine.h index b16fb808..5ef4e7ae 100644 --- a/apps/voicemail/AnswerMachine.h +++ b/apps/voicemail/AnswerMachine.h @@ -33,6 +33,7 @@ #endif #include "AmSession.h" +#include "AmAudioFile.h" #include "AmConfigReader.h" #include "EmailTemplate.h" #include "AmPlaylist.h"