Changeset 125:e643134d0f9c in mediastreamer2

Timestamp:

Oct 29, 2008 4:06:10 PM (5 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

• autoconf build system,
• cleanups in C code

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@128 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

p2pproxy

Files:

• AUTHORS (added)
• COPYING (added)
• ChangeLog (added)
• INSTALL (added)
• Makefile.am (added)
• NEWS (added)
• README (added)
• autogen.sh (added)
• configure.ac (added)
• launcher/Makefile.am (added)
• launcher/src/Makefile.am (added)
• launcher/src/p2pproxy.c (modified) (7 diffs)
• launcher/src/p2pproxy.h (modified) (2 diffs)

p2pproxy/launcher/src/p2pproxy.c

@@ -8 +8 @@
 #endif
 #ifndef P2PPROXY_INSTALLDIR
-        #define P2PPROXY_INSTALLDIR "/usr/local/share/java"
+        #define P2PPROXY_INSTALLDIR "/usr/share/java/fonis"
 #endif 
 #ifndef P2PPROXY_BUILDDIR
@@ -14 +14 @@
 #endif
 #define NUMBER_OF_OPTION 7
-JavaVM* p2pproxy_application_jvm = 0;
+JavaVM *p2pproxy_application_jvm = 0;
 
 #define GET_JNI_ENV \
         jint lResult = 0 ;\
-        JNIEnv* lJniEnv = 0;\
+        JNIEnv *lJniEnv = 0;\
         jclass  lMainClass = 0;\
-        lResult = (*p2pproxy_application_jvm)->AttachCurrentThread(p2pproxy_application_jvm,&lJniEnv,NULL);\
+        lResult = (*p2pproxy_application_jvm)->AttachCurrentThread(p2pproxy_application_jvm,(void**)&lJniEnv,NULL);\
         if (lResult != 0) { \
                 fprintf(stderr,"cannot attach VM\n");\
@@ -33 +33 @@
 
 int p2pproxy_application_start(int argc, char **argv) {
-        JNIEnv* lJniEnv = 0;
+        JNIEnv *lJniEnv = 0;
         jclass  lMainClass = 0;
-        
         JavaVMInitArgs args;
         JavaVMOption options[NUMBER_OF_OPTION];
@@ -70 +69 @@
         args.nOptions = NUMBER_OF_OPTION;
         args.options = options;
-        args.ignoreUnrecognized = JNI_FALSE;    int lResult;
+        args.ignoreUnrecognized = JNI_FALSE;
         
 
-        res = JNI_CreateJavaVM(&p2pproxy_application_jvm, (void **)&lJniEnv, &args);
+        res = JNI_CreateJavaVM(&p2pproxy_application_jvm,  (void**)& lJniEnv, &args);
         if (res < 0) {
                 fprintf(stderr,"cannot start p2pproxy vm [%i]",res);
                 return P2PPROXY_ERROR;
         }
-
         lMainClass = (*lJniEnv)->FindClass(lJniEnv, "org/linphone/p2pproxy/core/P2pProxyMain");
 
@@ -144 +142 @@
         jmethodID lLookupSipProxyUriMethod;
         jstring lJStringResult; 
-        const jbyte* lString;
+        const char* lString;
         jboolean  lIsCopy;
         jstring applicationArg;
@@ -185 +183 @@
         
 }
-void p2pproxy_application_stop() {
+
+int p2pproxy_application_stop() {
         jmethodID stopMethod = 0;
         GET_JNI_ENV
@@ -192 +191 @@
         (*lJniEnv)->CallStaticVoidMethod(lJniEnv, lMainClass, stopMethod);
         (*p2pproxy_application_jvm)->DetachCurrentThread(p2pproxy_application_jvm);
-        return;
-
+        return 0;
 }
 

p2pproxy/launcher/src/p2pproxy.h

@@ -60 +60 @@
  * 
  */
-int p2pproxy_application_get_state();
+int p2pproxy_application_get_state(void);
 
 /**
@@ -66 +66 @@
  * 
  */
-void p2pproxy_application_stop();
+int p2pproxy_application_stop(void);
 
 /**