Changeset 4790 for pjproject/trunk

Timestamp:

Mar 11, 2014 7:03:22 AM (11 years ago)

Author:

riza

Message:

Re #1742 (misc): Add input file checking on pjsua2_demo

File:

• pjproject/trunk/pjsip-apps/src/samples/pjsua2_demo.cpp (modified) (10 diffs)

pjproject/trunk/pjsip-apps/src/samples/pjsua2_demo.cpp

@@ -22 +22 @@
 #include <pj/file_access.h>
 
+#define THIS_FILE       "pjsua2_demo.cpp"
+
 using namespace pj;
 
@@ -105 +107 @@
 }
 
-static void mainProg1() throw(Error)
-{
-    Endpoint ep;
-
-    // Create library
-    ep.libCreate();
-
+static void mainProg1(Endpoint &ep) throw(Error)
+{
     // Init library
     EpConfig ep_cfg;
@@ -154 +151 @@
 }
 
-void mainProg2() throw(Error)
-{
-    Endpoint ep;
-
-    // Create library
-    ep.libCreate();
-
+static void mainProg2() throw(Error)
+{
     string json_str;
-
     {
         EpConfig epCfg;
@@ -203 +194 @@
         pj_file_delete("jsontest.js");
     }
-
-    ep.libDestroy();
-}
-
-
-void mainProg3() throw(Error)
-{
-    Endpoint ep;
-
-    // Create library
-    ep.libCreate();
+}
+
+
+static void mainProg3(Endpoint &ep) throw(Error)
+{
+    const char *paths[] = { "../../../../tests/pjsua/wavs/input.16.wav",
+                            "../../tests/pjsua/wavs/input.16.wav",
+                            "input.16.wav"};
+    unsigned i;
+    const char *filename = NULL;
 
     // Init library
@@ -219 +209 @@
     ep.libInit( ep_cfg );
 
+    for (i=0; i<PJ_ARRAY_SIZE(paths); ++i) {
+       if (pj_file_exists(paths[i])) {
+          filename = paths[i];
+          break;
+       }
+    }
+
+    if (!filename) {
+        PJSUA2_RAISE_ERROR3(PJ_ENOTFOUND, "mainProg3()",
+                           "Could not locate input.16.wav");
+    }
+
     // Start library
     ep.libStart();
@@ -226 +228 @@
     {
         AudioMediaPlayer amp;
-        amp.createPlayer("../../tests/pjsua/wavs/input.16.wav");
+        amp.createPlayer(filename);
 
         AudioMediaRecorder amr;
@@ -236 +238 @@
         pj_thread_sleep(5000);
     }
-
-    ep.libDestroy();
-}
-
-
-void mainProg() throw(Error)
-{
-    Endpoint ep;
-
-    // Create library
-    ep.libCreate();
-
+}
+
+
+static void mainProg() throw(Error)
+{
     string json_str;
 
@@ -295 +290 @@
         std::cout << json_str << std::endl << std::endl;
     }
-
-    ep.libDestroy();
 }
 
@@ -302 +295 @@
 {
     int ret = 0;
-
-    /* Test endpoint instantiation and destruction without libCreate(),
-     * libInit() etc.
-     */
-    {
-        Endpoint ep;
-    }
+    Endpoint ep;
 
     try {
-        mainProg3();
-        std::cout << "Success" << std::endl;
+        ep.libCreate();
+
+        mainProg3(ep);
+        ret = PJ_SUCCESS;
     } catch (Error & err) {
         std::cout << "Exception: " << err.info() << std::endl;
@@ -318 +307 @@
     }
 
+    try {
+        ep.libDestroy();
+    } catch(Error &err) {
+        std::cout << "Exception: " << err.info() << std::endl;
+        ret = 1;
+    }
+
+    if (ret == PJ_SUCCESS) {
+        std::cout << "Success" << std::endl;
+    } else {
+        std::cout << "Error Found" << std::endl;
+    }
+
     return ret;
 }