From: Tim-Philipp Müller <tim@centricular.net>
Date: Tue, 13 Sep 2005 13:52:59 +0000 (+0000)
Subject: gst/audioconvert/Makefile.am: Audioconvert derives from GstBaseTransform and should... 
X-Git-Tag: RELEASE-0_9_3~67
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32f976bfea980dcd0c386140669293491d56257e;p=platform%2Fupstream%2Fgst-plugins-base.git

gst/audioconvert/Makefile.am: Audioconvert derives from GstBaseTransform and should link to the library with our base...

Original commit message from CVS:
* gst/audioconvert/Makefile.am:
Audioconvert derives from GstBaseTransform and should
link to the library with our base elements to avoid
unresolved symbols. Makes things work with MinGW (#316160)
* gst/playback/test4.c: (main):
Fix MinGW build problem and use g_usleep() instead of
sleep() (#316162)
---

diff --git a/ChangeLog b/ChangeLog
index ec71639..95adc2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-09-13  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst/audioconvert/Makefile.am:
+	  Audioconvert derives from GstBaseTransform and should
+	  link to the library with our base elements to avoid
+	  unresolved symbols. Makes things work with MinGW (#316160)
+ 
+	* gst/playback/test4.c: (main):
+	  Fix MinGW build problem and use g_usleep() instead of 
+	  sleep() (#316162)
+
 2005-09-12  Wim Taymans  <wim@fluendo.com>
 
 	* gst/audioconvert/audioconvert.c: (float),
diff --git a/gst/audioconvert/Makefile.am b/gst/audioconvert/Makefile.am
index a13d175..45a9993 100644
--- a/gst/audioconvert/Makefile.am
+++ b/gst/audioconvert/Makefile.am
@@ -7,11 +7,11 @@ libgstaudioconvert_la_SOURCES = \
 	bufferframesconvert.c \
 	plugin.c
 
-libgstaudioconvert_la_CFLAGS = $(GST_CFLAGS)
+libgstaudioconvert_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
 libgstaudioconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaudioconvert_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
-	$(GST_LIBS)
+	$(GST_LIBS) $(GST_BASE_LIBS)
 
 noinst_HEADERS = \
 	gstaudioconvert.h \
diff --git a/gst/playback/test4.c b/gst/playback/test4.c
index 37d7fa2..b688ea9 100644
--- a/gst/playback/test4.c
+++ b/gst/playback/test4.c
@@ -46,7 +46,7 @@ main (gint argc, gchar * argv[])
   }
 
   g_print ("sleep 2...\n");
-  sleep (2);
+  g_usleep (2 * G_USEC_PER_SEC);
 
   g_print ("pause...\n");
   res = gst_element_set_state (player, GST_STATE_PAUSED);
@@ -56,7 +56,7 @@ main (gint argc, gchar * argv[])
   }
 
   g_print ("sleep 2...\n");
-  sleep (2);
+  g_usleep (2 * G_USEC_PER_SEC);
 
   g_print ("play...\n");
   res = gst_element_set_state (player, GST_STATE_PLAYING);
@@ -66,7 +66,7 @@ main (gint argc, gchar * argv[])
   }
 
   g_print ("sleep 2...\n");
-  sleep (2);
+  g_usleep (2 * G_USEC_PER_SEC);
 
   g_print ("ready...\n");
   res = gst_element_set_state (player, GST_STATE_READY);
@@ -76,7 +76,7 @@ main (gint argc, gchar * argv[])
   }
 
   g_print ("sleep 2...\n");
-  sleep (2);
+  g_usleep (2 * G_USEC_PER_SEC);
 
   g_print ("play...\n");
   res = gst_element_set_state (player, GST_STATE_PLAYING);