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 734e067..bc71506 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 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
        * gst-libs/gst/Makefile.am: same
 

diff --git a/ext/libvisual/Makefile.am b/ext/libvisual/Makefile.am
index 510552c..4f362da 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 23eb7b0..eeb82f9 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 9df3508..c636e66 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 a50cf7b..4f52e7b 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 043d1bd..9ee0793 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 7b46117..3ee55ac 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