Changeset 154:c8b7454fabb9 in mediastreamer2

Timestamp:

Nov 4, 2008 2:48:37 PM (5 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

fix videoout under sdl.

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

Location:

linphone/mediastreamer2

Files:

• configure.ac (modified) (1 diff)
• src/videoout.c (modified) (4 diffs)

linphone/mediastreamer2/configure.ac

@@ -393 +393 @@
 
 dnl define path of plugins:
-PACKAGE_PLUGINS_DIR=`eval echo $prefix/lib/mediastreamer/plugins`
-AC_DEFINE_UNQUOTED(PACKAGE_PLUGINS_DIR,  "$PACKAGE_PLUGINS_DIR" ,[path of plugins])
+AC_DEFINE_UNQUOTED(PACKAGE_PLUGINS_DIR, "${prefix}/lib/mediastreamer/plugins" ,[path of plugins])
+PACKAGE_PLUGINS_DIR="${prefix}/lib/mediastreamer/plugins"
 AC_SUBST(PACKAGE_PLUGINS_DIR)
 
-PACKAGE_DATA_DIR=`eval echo $prefix/share`
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,  "$PACKAGE_DATA_DIR" ,[path of data])
+PACKAGE_DATA_DIR="$prefix/share"
+AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,  "$prefix/share" ,[path of data])
 AC_SUBST(PACKAGE_DATA_DIR)
 

linphone/mediastreamer2/src/videoout.c

@@ -431 +431 @@
         if (!ret) ms_error("DrawDibDraw failed.");
         ReleaseDC(NULL,hdc);
-        while (PeekMessage(&msg, wd->window, 0, 0, PM_REMOVE) != 0)
-        {
-                  TranslateMessage(&msg);
-                  DispatchMessage(&msg);
-        }
 }
 
@@ -451 +446 @@
 
 bool_t win_display_pollevent(MSDisplay *d, MSDisplayEvent *ev){
+        while (PeekMessage(&msg, wd->window, 0, 0, PM_REMOVE) != 0){
+                  TranslateMessage(&msg);
+                  DispatchMessage(&msg);
+        }
         return FALSE;
 }
@@ -825 +824 @@
         video_out_postprocess,
         video_out_uninit,
-        methods,
-        MS_FILTER_IS_PUMP
+        methods
 };
 
@@ -839 +837 @@
         .noutputs=0,
         .init=video_out_init,
-        .preprocess=NULL,
         .process=video_out_process,
         .postprocess=video_out_postprocess,
         .uninit=video_out_uninit,
-        .methods=methods,
-        .flags=MS_FILTER_IS_PUMP
+        .methods=methods
 };