Convert gst_main() to g_main_loop_run()

Original commit message from CVS:
Convert gst_main() to g_main_loop_run()
* gst/playback/decodetest.c: (main):
* gst/playback/test2.c: (main):
* gst/playback/test3.c: (main):
* gst/playback/test4.c: (main):
Link plugins against libraries:
* ext/libvisual/Makefile.am:
* sys/xvimage/Makefile.am:

diff --git a/ChangeLog b/ChangeLog
index 734e067335df8e2d8b7eea216f82178d0de5a71e..bc71506b0d4ccb6cbaaa630d4a7ae6522f6d1f52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-04-24  David Schleef  <ds@schleef.org>
+
+       Convert gst_main() to g_main_loop_run()
+       * gst/playback/decodetest.c: (main):
+       * gst/playback/test2.c: (main):
+       * gst/playback/test3.c: (main):
+       * gst/playback/test4.c: (main):
+
+       Link plugins against libraries:
+       * ext/libvisual/Makefile.am:
+       * sys/xvimage/Makefile.am:
+
 2005-04-24  David Schleef  <ds@schleef.org>
 
        * configure.ac: Remove idct and resample libs

diff --git a/ext/libvisual/Makefile.am b/ext/libvisual/Makefile.am
index 510552c6d2e1d705189055aa49a10f87184cc0dc..4f362da8760f0ae146b5a87fb46593f0b7e57768 100644 (file)
--- a/ext/libvisual/Makefile.am
+++ b/ext/libvisual/Makefile.am
@@ -2,5 +2,6 @@ plugin_LTLIBRARIES = libgstlibvisual.la
 
 libgstlibvisual_la_SOURCES = visual.c 
 libgstlibvisual_la_CFLAGS = $(GST_CFLAGS) $(LIBVISUAL_CFLAGS)
-libgstlibvisual_la_LIBADD = $(LIBVISUAL_LIBS)
+libgstlibvisual_la_LIBADD = $(LIBVISUAL_LIBS) \
+       libgstbytestream-$(GST_MAJORMINOR).la
 libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

diff --git a/gst/playback/decodetest.c b/gst/playback/decodetest.c
index 23eb7b07caddf53a82fd96912f857e8e63656f94..eeb82f9bf0e0ea81689444a2fc936e46927a35a8 100644 (file)
--- a/gst/playback/decodetest.c
+++ b/gst/playback/decodetest.c
@@ -48,7 +48,7 @@ main (gint argc, gchar * argv[])
     return -1;
   }
 
-  gst_main ();
+  g_main_loop_run (g_main_loop_new (NULL, FALSE));
 
   return 0;
 }

diff --git a/gst/playback/test2.c b/gst/playback/test2.c
index 9df35089b793088155dfda343aa829592db2b164..c636e66d1de3215254381f5e7315b8ba4520aa3a 100644 (file)
--- a/gst/playback/test2.c
+++ b/gst/playback/test2.c
@@ -37,7 +37,7 @@ main (gint argc, gchar * argv[])
     return -1;
   }
 
-  gst_main ();
+  g_main_loop_run (g_main_loop_new (NULL, TRUE));
 
   return 0;
 }

diff --git a/gst/playback/test3.c b/gst/playback/test3.c
index a50cf7b0e97f4af246fde7b397670367062529f0..4f52e7b09d4c42d2fd2d171669c3a5b9697fe0f7 100644 (file)
--- a/gst/playback/test3.c
+++ b/gst/playback/test3.c
@@ -56,7 +56,7 @@ main (gint argc, gchar * argv[])
 
   g_timeout_add (UPDATE_INTERVAL, (GSourceFunc) update_scale, player);
 
-  gst_main ();
+  g_main_loop_run (g_main_loop_new (NULL, TRUE));
 
   return 0;
 }

diff --git a/gst/playback/test4.c b/gst/playback/test4.c
index 043d1bd0aa13d23e1ad8374f15398b489867348f..9ee0793412e5c28b603908bc31860555ddf80363 100644 (file)
--- a/gst/playback/test4.c
+++ b/gst/playback/test4.c
@@ -85,7 +85,7 @@ main (gint argc, gchar * argv[])
     return -1;
   }
 
-  gst_main ();
+  g_main_loop_run (g_main_loop_new (NULL, TRUE));
 
   return 0;
 }

diff --git a/sys/xvimage/Makefile.am b/sys/xvimage/Makefile.am
index 7b4611752b4bdba59d060a790483df2a78b666a1..3ee55ace10fc60d98b2b46f9b393e6e6877bf99e 100644 (file)
--- a/sys/xvimage/Makefile.am
+++ b/sys/xvimage/Makefile.am
@@ -5,7 +5,7 @@ libgstxvimagesink_la_SOURCES =  xvimagesink.c
 libgstxvimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS)
 libgstxvimagesink_la_LIBADD = $(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS) \
        $(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la \
-       $(top_builddir)/gst-libs/gst/video/libgstvideo.la
+       $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la
 libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = xvimagesink.h