mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 00:31:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: Check for libglade-2.0, for the metadata-editor example.

Browse source 
Original commit message from CVS:
* configure.ac:
Check for libglade-2.0, for the metadata-editor example.
* tests/icles/Makefile.am:
Only try to build the metadata-editor example if we have gtk and
glade (otherwise the build would just fail ...); fix build in
uninstalled setup.
* tests/icles/metadata_editor.c: (on_cell_edited), (ui_add_columns):
Fix compiler warnings (use GLib macros to cast pointer <-> int).
This commit is contained in:
Tim-Philipp Müller 2008-01-26 12:11:47 +00:00
parent 9e31b57dc3
commit 3a5db6a932
4 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2008-01-26 Tim-Philipp Müller <tim at centricular dot net>
* configure.ac:
Check for libglade-2.0, for the metadata-editor example.
* tests/icles/Makefile.am:
Only try to build the metadata-editor example if we have gtk and
glade (otherwise the build would just fail ...); fix build in
uninstalled setup.
* tests/icles/metadata_editor.c: (on_cell_edited), (ui_add_columns):
Fix compiler warnings (use GLib macros to cast pointer <-> int).
2008-01-25 Edgard Lima <edgard.lima@indt.org.br> 2008-01-25 Edgard Lima <edgard.lima@indt.org.br>
* ext/metadata/TODO: * ext/metadata/TODO:

8
configure.ac
View file

@ -245,6 +245,14 @@ AC_SUBST(GTK_CFLAGS)
AC_SUBST(HAVE_GTK) AC_SUBST(HAVE_GTK)
AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes") AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
dnl libglade is optional and only used in examples
HAVE_GLADE=NO
PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.6.0, HAVE_GLADE=yes, HAVE_GLADE=no)
AC_SUBST(GLADE_LIBS)
AC_SUBST(GLADE_CFLAGS)
AC_SUBST(HAVE_GLADE)
AM_CONDITIONAL(HAVE_GLADE, test "x$HAVE_GLADE" = "xyes")
dnl set license and copyright notice dnl set license and copyright notice
GST_LICENSE="LGPL" GST_LICENSE="LGPL"
AC_DEFINE_UNQUOTED(GST_LICENSE, "$GST_LICENSE", [GStreamer license]) AC_DEFINE_UNQUOTED(GST_LICENSE, "$GST_LICENSE", [GStreamer license])

21
tests/icles/Makefile.am
View file

@ -12,18 +12,23 @@ GST_SOUNDTOUCH_TESTS =
endif endif
if USE_METADATA if USE_METADATA
if HAVE_GLADE
if HAVE_GTK
GST_METADATA_TESTS = metadata_editor GST_METADATA_TESTS = metadata_editor
metadata_editor_SOURCES = metadata_editor.c metadata_editor_SOURCES = metadata_editor.c
metadata_editor_CFLAGS = $(GST_CFLAGS) \ metadata_editor_CFLAGS = \
`pkg-config --cflags gstreamer-0.10 libglade-2.0 gtk+-2.0` $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GLADE_CFLAGS)
metadata_editor_LDADD = $(GST_LIBS) metadata_editor_LDADD = \
metadata_editor_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \ $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-0.10 $(GST_LIBS) $(GLADE_LIBS)
-Wl -export-dynamic \ metadata_editor_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-lgstinterfaces-0.10 \ else
`pkg-config --libs gstreamer-0.10 libglade-2.0 gtk+-2.0` GST_METADATA_TESTS =
endif
else
GST_METADATA_TESTS =
endif
else else
GST_METADATA_TESTS = GST_METADATA_TESTS =
endif endif

4
tests/icles/metadata_editor.c
View file

@ -398,7 +398,7 @@ on_cell_edited (GtkCellRendererText * renderer, gchar * str_path,
GtkTreePath *path = NULL; GtkTreePath *path = NULL;
GtkTreeIter iter; GtkTreeIter iter;
GtkTreeModel *model = NULL; GtkTreeModel *model = NULL;
const guint32 col_index = (guint32) user_data; const gint col_index = GPOINTER_TO_INT (user_data);
const gchar *tag = gtk_entry_get_text (ui_entry_insert_tag); const gchar *tag = gtk_entry_get_text (ui_entry_insert_tag);
path = gtk_tree_path_new_from_string (str_path); path = gtk_tree_path_new_from_string (str_path);
@ -459,7 +459,7 @@ ui_add_columns (GtkTreeView * tree_view, const gchar * title, gint col_index,
if (editable) { if (editable) {
g_object_set (renderer, "editable", TRUE, NULL); g_object_set (renderer, "editable", TRUE, NULL);
g_signal_connect (G_OBJECT (renderer), "edited", g_signal_connect (G_OBJECT (renderer), "edited",
G_CALLBACK (on_cell_edited), (gpointer) col_index); G_CALLBACK (on_cell_edited), GINT_TO_POINTER (col_index));
} }
if ((tree_col = gtk_tree_view_column_new_with_attributes (title, renderer, if ((tree_col = gtk_tree_view_column_new_with_attributes (title, renderer,