From: Thibault Saunier Date: Thu, 29 Aug 2013 15:10:33 +0000 (-0400) Subject: ges: Disable the Pitivi formatter X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e54ceff7204e712daa9949ef41b73d96035a0446;p=platform%2Fupstream%2Fgst-editing-services.git ges: Disable the Pitivi formatter It lacks to many feature and the code is too bad, desactivation until someone comes and fix it... The code should be removed if it never happens --- diff --git a/docs/libs/ges-docs.sgml b/docs/libs/ges-docs.sgml index 78eccf5..937d198 100644 --- a/docs/libs/ges-docs.sgml +++ b/docs/libs/ges-docs.sgml @@ -91,7 +91,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 5c70451..c87eabd 100644 --- a/docs/libs/ges-sections.txt +++ b/docs/libs/ges-sections.txt @@ -868,24 +868,6 @@ 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 GESBaseEffect diff --git a/ges/Makefile.am b/ges/Makefile.am index f40cbba..ab9f8d0 100644 --- a/ges/Makefile.am +++ b/ges/Makefile.am @@ -47,7 +47,6 @@ 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 \ @@ -66,6 +65,9 @@ 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) \ @@ -109,7 +111,6 @@ 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 \ @@ -127,6 +128,9 @@ 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 d55d6b2..fa1ae20 100644 --- a/ges/ges.c +++ b/ges/ges.c @@ -81,7 +81,9 @@ ges_init (void) GES_TYPE_GROUP; /* register formatter types with the system */ - GES_TYPE_PITIVI_FORMATTER; + + /* FIXME PITIVI Formatter disabled + * GES_TYPE_PITIVI_FORMATTER; */ GES_TYPE_XML_FORMATTER; /* Register track elements */ diff --git a/ges/ges.h b/ges/ges.h index 28e7eac..b1cee92 100644 --- a/ges/ges.h +++ b/ges/ges.h @@ -72,7 +72,7 @@ #include #include #include -#include +/* DISABLED #include */ #include #include #include diff --git a/tests/examples/ges-ui.c b/tests/examples/ges-ui.c index 95233de..8417e22 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_pitivi_project_activate_cb (GtkMenuItem * item, App * app); +void launch_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; - GESFormatter *formatter; + GESProject *project; uri = g_strsplit (uri, "//", 2)[1]; printf ("we will launch this uri : %s\n", uri); - formatter = GES_FORMATTER (ges_pitivi_formatter_new ()); - timeline = ges_timeline_new (); + project = ges_project_new (uri); + timeline = GES_TIMELINE (ges_asset_extract (GES_ASSET (project), NULL)); 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_pitivi_project_activate_cb (GtkMenuItem * item, App * app) +launch_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 4ce11df..5a1eda3 100644 --- a/tests/examples/ges-ui.glade +++ b/tests/examples/ges-ui.glade @@ -97,7 +97,7 @@ Launches a .xptv project image1 False - +