diff --git a/docs/libs/ges-docs.sgml b/docs/libs/ges-docs.sgml
index d97b967d9f..506f724c93 100644
--- a/docs/libs/ges-docs.sgml
+++ b/docs/libs/ges-docs.sgml
@@ -94,7 +94,7 @@ platform as well as Windows. It is released under the GNU Library General Public
Serialization Classes
-
+
diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt
index ffc2535552..489780401d 100644
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -916,6 +916,24 @@ ges_formatter_get_type
GESFormatterPrivate
+
+ges-pitivi-formatter
+GESPitiviFormatter
+GESPitiviFormatter
+ges_pitivi_formatter_new
+
+GESPitiviFormatterClass
+GESPitiviFormatterPrivate
+GES_TYPE_PITIVI_FORMATTER
+GES_IS_PITIVI_FORMATTER
+GES_IS_PITIVI_FORMATTER_CLASS
+GES_PITIVI_FORMATTER
+GES_PITIVI_FORMATTER_CLASS
+GES_PITIVI_FORMATTER_GET_CLASS
+GES_TYPE_PITIVIFORMATTER
+ges_pitivi_formatter_get_type
+
+
ges-base-effect
GESBaseEffect
diff --git a/ges/Makefile.am b/ges/Makefile.am
index 0263f1c402..30728d8b31 100644
--- a/ges/Makefile.am
+++ b/ges/Makefile.am
@@ -50,6 +50,7 @@ libges_@GST_API_VERSION@_la_SOURCES = \
ges-effect.c \
ges-screenshot.c \
ges-formatter.c \
+ ges-pitivi-formatter.c \
ges-asset.c \
ges-uri-asset.c \
ges-clip-asset.c \
@@ -68,9 +69,6 @@ libges_@GST_API_VERSION@_la_SOURCES = \
ges-group.c \
gstframepositionner.c
-# XPTV formatter disabled
-# ges-pitivi-formatter.c
-
libges_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/ges/
libges_@GST_API_VERSION@include_HEADERS = \
$(built_header_make) \
@@ -117,6 +115,7 @@ libges_@GST_API_VERSION@include_HEADERS = \
ges-text-overlay.h \
ges-screenshot.h \
ges-formatter.h \
+ ges-pitivi-formatter.h \
ges-asset.h \
ges-uri-asset.h \
ges-clip-asset.h \
@@ -134,9 +133,6 @@ libges_@GST_API_VERSION@include_HEADERS = \
ges-group.h \
gstframepositionner.h
-# XPTV formatter disabled
-# ges-pitivi-formatter.h
-
noinst_HEADERS = \
ges-internal.h \
ges-auto-transition.h
diff --git a/ges/ges.c b/ges/ges.c
index 5d0e57b4de..f55a45fb8b 100644
--- a/ges/ges.c
+++ b/ges/ges.c
@@ -81,9 +81,7 @@ ges_init (void)
GES_TYPE_GROUP;
/* register formatter types with the system */
-
- /* FIXME PITIVI Formatter disabled
- * GES_TYPE_PITIVI_FORMATTER; */
+ GES_TYPE_PITIVI_FORMATTER;
GES_TYPE_XML_FORMATTER;
/* Register track elements */
diff --git a/ges/ges.h b/ges/ges.h
index 1868248da8..c0a3b3a0cc 100644
--- a/ges/ges.h
+++ b/ges/ges.h
@@ -73,7 +73,7 @@
#include
#include
#include
-/* DISABLED #include */
+#include
#include
#include
#include
diff --git a/tests/examples/ges-ui.c b/tests/examples/ges-ui.c
index 8417e22a8e..95233de9e7 100644
--- a/tests/examples/ges-ui.c
+++ b/tests/examples/ges-ui.c
@@ -111,7 +111,7 @@ gboolean window_delete_event_cb (GtkObject * window, GdkEvent * event,
void new_activate_cb (GtkMenuItem * item, App * app);
void open_activate_cb (GtkMenuItem * item, App * app);
void save_as_activate_cb (GtkMenuItem * item, App * app);
-void launch_project_activate_cb (GtkMenuItem * item, App * app);
+void launch_pitivi_project_activate_cb (GtkMenuItem * item, App * app);
void quit_item_activate_cb (GtkMenuItem * item, App * app);
void delete_activate_cb (GtkAction * item, App * app);
void play_activate_cb (GtkAction * item, App * app);
@@ -1156,24 +1156,24 @@ app_launch_project (App * app, gchar * uri)
GMainLoop *mainloop;
GESPipeline *pipeline;
GstBus *bus;
- GESProject *project;
+ GESFormatter *formatter;
uri = g_strsplit (uri, "//", 2)[1];
printf ("we will launch this uri : %s\n", uri);
- project = ges_project_new (uri);
- timeline = GES_TIMELINE (ges_asset_extract (GES_ASSET (project), NULL));
+ formatter = GES_FORMATTER (ges_pitivi_formatter_new ());
+ timeline = ges_timeline_new ();
pipeline = ges_pipeline_new ();
bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
mainloop = g_main_loop_new (NULL, FALSE);
ges_pipeline_add_timeline (pipeline, timeline);
+ ges_formatter_load_from_uri (formatter, timeline, uri, NULL);
ges_pipeline_set_mode (pipeline, TIMELINE_MODE_PREVIEW_VIDEO);
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
gst_bus_add_signal_watch (bus);
g_signal_connect (bus, "message", G_CALLBACK (project_bus_message_cb),
mainloop);
g_main_loop_run (mainloop);
- g_object_unref (project);
}
static void
@@ -1393,7 +1393,7 @@ new_activate_cb (GtkMenuItem * item, App * app)
}
void
-launch_project_activate_cb (GtkMenuItem * item, App * app)
+launch_pitivi_project_activate_cb (GtkMenuItem * item, App * app)
{
GtkFileChooserDialog *dlg;
GtkFileFilter *filter;
diff --git a/tests/examples/ges-ui.glade b/tests/examples/ges-ui.glade
index 5a1eda33c6..4ce11df648 100644
--- a/tests/examples/ges-ui.glade
+++ b/tests/examples/ges-ui.glade
@@ -97,7 +97,7 @@
Launches a .xptv project
image1
False
-
+