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

@@ -30,7 +30,7 @@
 
 #include "AmSession.h"
 #include "AmConfigReader.h"
-#include "AmAudio.h"
+#include "AmAudioFile.h"
 #include "AmB2BSession.h"
 
 #include <string>

apps/announce_transfer/AnnounceTransfer.h

@@ -30,6 +30,7 @@
 #define _ANNOUNCETRANSFER_H_
 
 #include "AmSession.h"
+#include "AmAudioFile.h"
 #include "AmConfigReader.h"
 
 #include <string>

apps/announcement/Announcement.h

@@ -29,6 +29,7 @@
 #define _ANNOUNCEMENT_H_
 
 #include "AmSession.h"
+#include "AmAudioFile.h"
 #include "AmConfigReader.h"
 
 #include "ampi/UACAuthAPI.h"

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"

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"

apps/early_announce/EarlyAnnounce.h

@@ -29,6 +29,7 @@
 #define _EarlyAnnounce_h_
 
 #include "AmSession.h"
+#include "AmAudioFile.h"
 #include "AmConfigReader.h"
 
 #include <string>

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"

apps/examples/di_dialer/DIDial.cpp

@@ -7,6 +7,8 @@
 #include "AmConfigReader.h"
 #include "AmUtils.h"
 
+#include <map>
+
 #define APP_NAME "di_dial"
 
 class DIDialFactory : public AmDynInvokeFactory
@@ -19,13 +21,13 @@ public:
     return DIDial::instance();
   }
 
-  static map<string, DIDialoutInfo> dialout_pins;
+  static std::map<string, DIDialoutInfo> dialout_pins;
   int onLoad();
 };
 
 
 // note its not really safe to store plaintext passwords in memory
-map<string, DIDialoutInfo> DIDialFactory::dialout_pins;
+std::map<string, DIDialoutInfo> 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<string, DIDialoutInfo>::iterator it = DIDialFactory::dialout_pins.find(pin);
+  std::map<string, DIDialoutInfo>::iterator it = DIDialFactory::dialout_pins.find(pin);
   if (it != DIDialFactory::dialout_pins.end()) {
     AmArg* a = new AmArg();
     a->setBorrowedPointer(new UACAuthCred(it->second.realm, 

apps/examples/dtmftester/DtmfTester.h

@@ -29,6 +29,7 @@
 #define _ANNOUNCEMENT_H_
 
 #include "AmSession.h"
+#include "AmAudioFile.h"
 #include "AmConfigReader.h"
 #include "AmPlaylist.h"
 

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 <string>

apps/examples/jukecall/Jukecall.h

@@ -30,6 +30,7 @@
 
 #include "AmB2ABSession.h"
 #include "AmConfigReader.h"
+#include "AmAudioFile.h"
 #include "AmApi.h"
 
 #include <string>

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"
 

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"
 

apps/examples/tutorial/myannounceapp/MyAnnounceApp.h

@@ -2,7 +2,7 @@
 #define _MYANNOUNCEAPP_H_
 
 #include "AmSession.h"
-#include "AmAudio.h"
+#include "AmAudioFile.h"
 
 #include <string>
 using std::string;

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"
 

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"
 

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<string,string>::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<string,string>::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());

apps/ivr/IvrAudio.h

@@ -6,6 +6,7 @@
 #include <structmember.h>
 
 #include "AmAudio.h"
+#include "AmAudioFile.h"
 
 #define AUDIO_READ  1
 #define AUDIO_WRITE 2

apps/py_sems/PySemsAudio.h

@@ -5,7 +5,7 @@
 #include <Python.h>
 #include "structmember.h"
 
-#include "AmAudio.h"
+#include "AmAudioFile.h"
 
 #define AUDIO_READ  1
 #define AUDIO_WRITE 2

apps/py_sems/sip/AmAudio.sip

@@ -48,7 +48,7 @@ class AmAudioFile
 {
 
 %TypeHeaderCode
-#include "../../../core/AmAudio.h"
+#include "../../../core/AmAudioFile.h"
 %End
 
 public:

apps/voicemail/AnswerMachine.h

@@ -33,6 +33,7 @@
 #endif
 
 #include "AmSession.h"
+#include "AmAudioFile.h"
 #include "AmConfigReader.h"
 #include "EmailTemplate.h"
 #include "AmPlaylist.h"