[gst-cvs] gst-plugins-bad: examples: Fix build and signal connection for GtkBuilder stuff
Sebastian Dröge
slomo at kemper.freedesktop.org
Sat Jan 16 02:41:48 PST 2010
Module: gst-plugins-bad
Branch: master
Commit: be9ca4d5e1665bf30b2cf0a01d469a7bf676b2be
URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=be9ca4d5e1665bf30b2cf0a01d469a7bf676b2be
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date: Sat Jan 16 11:41:20 2010 +0100
examples: Fix build and signal connection for GtkBuilder stuff
---
tests/examples/camerabin/Makefile.am | 6 ++-
tests/examples/camerabin/gst-camera.c | 76 +++++++++------------------------
tests/icles/Makefile.am | 4 +-
3 files changed, 28 insertions(+), 58 deletions(-)
diff --git a/tests/examples/camerabin/Makefile.am b/tests/examples/camerabin/Makefile.am
index c13ad8f..e082c24 100644
--- a/tests/examples/camerabin/Makefile.am
+++ b/tests/examples/camerabin/Makefile.am
@@ -8,12 +8,16 @@ gst_camera_SOURCES = gst-camera.c
gst_camera_CFLAGS = \
-I$(top_builddir)/gst-libs \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(GMODULE_EXPORT_CFLAGS) \
-DGST_USE_UNSTABLE_API
gst_camera_LDADD = \
$(top_builddir)/gst-libs/gst/interfaces/libgstphotography- at GST_MAJORMINOR@.la \
$(GST_PLUGINS_BASE_LIBS) \
-lgstinterfaces- at GST_MAJORMINOR@ \
- $(GST_LIBS)
+ $(GST_LIBS) \
+ $(GTK_LIBS) \
+ $(GMODULE_EXPORT_LIBS)
uidir = $(datadir)/gstreamer- at GST_MAJORMINOR@/camera-apps
ui_DATA = $(GST_CAMERABIN_UI_FILES)
diff --git a/tests/examples/camerabin/gst-camera.c b/tests/examples/camerabin/gst-camera.c
index adc04d0..45b77fb 100644
--- a/tests/examples/camerabin/gst-camera.c
+++ b/tests/examples/camerabin/gst-camera.c
@@ -160,40 +160,6 @@ static gboolean capture_mode_set_state (CaptureState state);
static void capture_mode_config_gui (void);
static gboolean capture_mode_stop (void);
-static void on_windowMain_delete_event (GtkWidget * widget, GdkEvent * event,
- gpointer user_data);
-static void on_buttonShot_clicked (GtkButton * button, gpointer user_data);
-static void on_buttonPause_clicked (GtkButton * button, gpointer user_data);
-static void on_comboboxResolution_changed (GtkComboBox * widget,
- gpointer user_data);
-static void on_radiobuttonImageCapture_toggled (GtkToggleButton * togglebutton,
- gpointer user_data);
-static void on_radiobuttonVideoCapture_toggled (GtkToggleButton * togglebutton,
- gpointer user_data);
-static void on_rbBntVidEffNone_toggled (GtkToggleButton * togglebutton,
- gpointer user_data);
-static void on_rbBntVidEffEdge_toggled (GtkToggleButton * togglebutton,
- gpointer user_data);
-static void on_rbBntVidEffAging_toggled (GtkToggleButton * togglebutton,
- gpointer user_data);
-static void on_rbBntVidEffDice_toggled (GtkToggleButton * togglebutton,
- gpointer user_data);
-static void on_rbBntVidEffWarp_toggled (GtkToggleButton * togglebutton,
- gpointer user_data);
-static void on_rbBntVidEffShagadelic_toggled (GtkToggleButton * togglebutton,
- gpointer user_data);
-static void on_rbBntVidEffVertigo_toggled (GtkToggleButton * togglebutton,
- gpointer user_data);
-static void on_rbBntVidEffRev_toggled (GtkToggleButton * togglebutton,
- gpointer user_data);
-static void on_rbBntVidEffQuark_toggled (GtkToggleButton * togglebutton,
- gpointer user_data);
-static void on_chkbntMute_toggled (GtkToggleButton * togglebutton,
- gpointer user_data);
-static void on_chkbtnRawMsg_toggled (GtkToggleButton * togglebutton,
- gpointer data);
-static void on_hscaleZoom_value_changed (GtkRange * range, gpointer user_data);
-
static void ui_connect_signals (void);
static gboolean ui_create (void);
static void destroy_color_controls (void);
@@ -774,7 +740,7 @@ done:
return FALSE;
}
-static void
+void
on_windowMain_delete_event (GtkWidget * widget, GdkEvent * event, gpointer data)
{
capture_mode_set_state (CAP_STATE_IMAGE);
@@ -811,7 +777,7 @@ set_metadata (void)
g_free (desc_str);
}
-static void
+void
on_buttonShot_clicked (GtkButton * button, gpointer user_data)
{
switch (capture_state) {
@@ -844,7 +810,7 @@ on_buttonShot_clicked (GtkButton * button, gpointer user_data)
}
}
-static void
+void
on_buttonPause_clicked (GtkButton * button, gpointer user_data)
{
switch (capture_state) {
@@ -874,7 +840,7 @@ on_buttonPause_clicked (GtkButton * button, gpointer user_data)
}
}
-static gboolean
+gboolean
on_drawingareaView_configure_event (GtkWidget * widget,
GdkEventConfigure * event, gpointer data)
{
@@ -888,7 +854,7 @@ on_drawingareaView_configure_event (GtkWidget * widget,
return TRUE;
}
-static void
+void
on_comboboxResolution_changed (GtkComboBox * widget, gpointer user_data)
{
GstStructure *st;
@@ -915,7 +881,7 @@ on_comboboxResolution_changed (GtkComboBox * widget, gpointer user_data)
}
}
-static void
+void
on_radiobuttonImageCapture_toggled (GtkToggleButton * togglebutton,
gpointer user_data)
{
@@ -927,7 +893,7 @@ on_radiobuttonImageCapture_toggled (GtkToggleButton * togglebutton,
}
}
-static void
+void
on_radiobuttonVideoCapture_toggled (GtkToggleButton * togglebutton,
gpointer user_data)
{
@@ -939,7 +905,7 @@ on_radiobuttonVideoCapture_toggled (GtkToggleButton * togglebutton,
}
}
-static void
+void
on_rbBntVidEff_toggled (GtkToggleButton * togglebutton, gchar * effect)
{
if (gtk_toggle_button_get_active (togglebutton)) {
@@ -955,68 +921,68 @@ on_rbBntVidEff_toggled (GtkToggleButton * togglebutton, gchar * effect)
}
}
-static void
+void
on_rbBntVidEffNone_toggled (GtkToggleButton * togglebutton, gpointer data)
{
on_rbBntVidEff_toggled (togglebutton, NULL);
}
-static void
+void
on_rbBntVidEffEdge_toggled (GtkToggleButton * togglebutton, gpointer data)
{
on_rbBntVidEff_toggled (togglebutton, "edgetv");
}
-static void
+void
on_rbBntVidEffAging_toggled (GtkToggleButton * togglebutton, gpointer user_data)
{
on_rbBntVidEff_toggled (togglebutton, "agingtv");
}
-static void
+void
on_rbBntVidEffDice_toggled (GtkToggleButton * togglebutton, gpointer user_data)
{
on_rbBntVidEff_toggled (togglebutton, "dicetv");
}
-static void
+void
on_rbBntVidEffWarp_toggled (GtkToggleButton * togglebutton, gpointer data)
{
on_rbBntVidEff_toggled (togglebutton, "warptv");
}
-static void
+void
on_rbBntVidEffShagadelic_toggled (GtkToggleButton * togglebutton, gpointer data)
{
on_rbBntVidEff_toggled (togglebutton, "shagadelictv");
}
-static void
+void
on_rbBntVidEffVertigo_toggled (GtkToggleButton * togglebutton, gpointer data)
{
on_rbBntVidEff_toggled (togglebutton, "vertigotv");
}
-static void
+void
on_rbBntVidEffRev_toggled (GtkToggleButton * togglebutton, gpointer data)
{
on_rbBntVidEff_toggled (togglebutton, "revtv");
}
-static void
+void
on_rbBntVidEffQuark_toggled (GtkToggleButton * togglebutton, gpointer data)
{
on_rbBntVidEff_toggled (togglebutton, "quarktv");
}
-static void
+void
on_chkbntMute_toggled (GtkToggleButton * togglebutton, gpointer data)
{
g_object_set (gst_camera_bin, "mute",
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)), NULL);
}
-static void
+void
on_chkbtnRawMsg_toggled (GtkToggleButton * togglebutton, gpointer data)
{
const gchar *env_var = "CAMSRC_PUBLISH_RAW";
@@ -1027,14 +993,14 @@ on_chkbtnRawMsg_toggled (GtkToggleButton * togglebutton, gpointer data)
}
}
-static void
+void
on_hscaleZoom_value_changed (GtkRange * range, gpointer user_data)
{
gint zoom = gtk_range_get_value (range);
g_object_set (gst_camera_bin, "zoom", zoom, NULL);
}
-static void
+void
on_color_control_value_changed (GtkRange * range, gpointer user_data)
{
GstColorBalance *balance = GST_COLOR_BALANCE (gst_camera_bin);
diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index 4488de5..39991b1 100644
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -25,9 +25,9 @@ GST_METADATA_TESTS = metadata_editor
metadata_editor_SOURCES = metadata_editor.c
metadata_editor_CFLAGS = \
- $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS)
+ $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) $(GMODULE_EXPORT_CFLAGS)
metadata_editor_LDADD = \
- $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-0.10 $(GST_LIBS) $(GTK_LIBS)
+ $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-0.10 $(GST_LIBS) $(GTK_LIBS) $(GMODULE_EXPORT_LIBS)
else
GST_METADATA_TESTS =
endif
More information about the Gstreamer-commits
mailing list