Changeset 208:41b410aec5ef in mediastreamer2

Timestamp:

Dec 26, 2008 10:14:12 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

??

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

Location:

linphone

Files:

• console/linphonec.c (modified) (1 diff)
• gtk-glade/main.c (modified) (1 diff)
• mediastreamer2/configure.ac (modified) (2 diffs)
• oRTP/src/ortp.c (modified) (1 diff)

linphone/console/linphonec.c

@@ -342 +342 @@
                 ms_mutex_unlock(&prompt_mutex);
         }
-        /*
-        ms_mutex_lock(&prompt_mutex);
-        strcpy(received_prompt,"quit");
-        have_prompt=TRUE;
-        ms_mutex_unlock(&prompt_mutex);
-        */
         return NULL;
 }

linphone/gtk-glade/main.c

@@ -675 +675 @@
         /* couldn't find a way to prevent closing to destroy the main window*/
         LinphoneCore *lc=linphone_gtk_get_core();
-        /*shutdown call if any*/
-        if (linphone_core_in_call(lc))
-                linphone_core_terminate_call(lc,NULL);
-        linphone_core_enable_video_preview(lc,FALSE);
         the_ui=NULL;
         the_ui=linphone_gtk_create_window("main");
         linphone_gtk_init_main_window();
+        /*shutdown call if any*/
+        if (linphone_core_in_call(lc)){
+                linphone_core_terminate_call(lc,NULL);
+                linphone_gtk_call_terminated(the_ui);
+        }
+        linphone_core_enable_video_preview(lc,FALSE);
 }
 

linphone/mediastreamer2/configure.ac

@@ -133 +133 @@
 AM_CONDITIONAL(BUILD_MACOSX, test x$macosx_found = xyes)
 
+dnl initialize pkg-config so that we can use it within if else fi statements.
+PKG_PROG_PKG_CONFIG()
+
 AC_SUBST(MSPLUGINS_CFLAGS)
 AC_SUBST(MSPLUGINS_LIBS)
@@ -188 +191 @@
 
 arts_enabled=false
-
-PKG_PROG_PKG_CONFIG()
 
 if test "$artsc" = "true" ; then

linphone/oRTP/src/ortp.c

@@ -53 +53 @@
         int i;
         
-        wVersionRequested = MAKEWORD(1,1);
+        wVersionRequested = MAKEWORD(2,0);
         if( (i = WSAStartup(wVersionRequested,  &wsaData))!=0)
         {
-                ortp_error("Unable to initialize windows socket api, reason: %d",i);
+                ortp_error("Unable to initialize windows socket api, reason: %d (%s)",i,getWinSocketError(i));
                 return FALSE;
         }