From 021c5ac6eceaeaf4e28d8278722a195a06afca65 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Fri, 11 May 2012 09:33:59 +0200 Subject: first draft of the libexperiment-reader helper class it hides libXML2 details when dealing with session.dtd XML files (Folker-transcript + session data) --- src/Makefile.am | 2 +- src/main.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 4ed7ab2..0f469de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,7 @@ experiment_player_CPPFLAGS += -I@top_srcdir@/lib/gtk-experiment-widgets experiment_player_LDADD += @top_srcdir@/lib/gtk-experiment-widgets/libgtk-experiment-widgets.la experiment_player_CPPFLAGS += -I@top_srcdir@/lib/experiment-reader -#experiment_player_LDADD += @top_srcdir@/lib/experiment-reader/libexperiment-reader.la +experiment_player_LDADD += @top_srcdir@/lib/experiment-reader/libexperiment-reader.la experiment_player_CFLAGS += @GTKAPP_CFLAGS@ experiment_player_LDFLAGS += @GTKAPP_LDFLAGS@ diff --git a/src/main.c b/src/main.c index 1b1b69a..fc05a1b 100644 --- a/src/main.c +++ b/src/main.c @@ -183,13 +183,21 @@ load_media_file(const gchar *file) gboolean load_transcript_file(const gchar *file) { + ExperimentReader *reader; gboolean res; - /* FIXME */ - res = gtk_experiment_navigator_load_filename(GTK_EXPERIMENT_NAVIGATOR(navigator_widget), file); - if (res) + reader = experiment_reader_new(file); + if (reader == NULL) return TRUE; + res = gtk_experiment_navigator_load(GTK_EXPERIMENT_NAVIGATOR(navigator_widget), + reader); + if (res) { + g_object_unref(G_OBJECT(reader)); + return TRUE; + } + + g_object_unref(reader); return FALSE; } -- cgit v1.2.3