diff options
author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-05-11 09:33:59 +0200 |
---|---|---|
committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-05-11 14:43:24 +0200 |
commit | 021c5ac6eceaeaf4e28d8278722a195a06afca65 (patch) | |
tree | b59b8c0c1b2c981113a1bf05fcd67810082af7f5 /src | |
parent | 7f9620ed8c76494f79e75e2303a2b0c13180e992 (diff) | |
download | gtk-vlc-player-021c5ac6eceaeaf4e28d8278722a195a06afca65.tar.gz |
first draft of the libexperiment-reader helper class
it hides libXML2 details when dealing with session.dtd XML files (Folker-transcript + session data)
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/main.c | 14 |
2 files changed, 12 insertions, 4 deletions
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@ @@ -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; } |