mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 00:36:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "ges: Disable the Pitivi formatter"

Browse source 
This reverts commit e54ceff720.

Let's just keep it... it does not cost anything.
This commit is contained in:
Thibault Saunier 2013-09-16 11:16:18 -03:00
parent 56754358f4
commit c0eae0c790
7 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/libs/ges-docs.sgml
View file

@ -94,7 +94,7 @@ platform as well as Windows. It is released under the GNU Library General Public
<chapter>
<title>Serialization Classes</title>
<xi:include href="xml/ges-formatter.xml"/>
<!-- DISABLED <xi:include href="xml/ges-pitivi-formatter.xml"/>-->
<xi:include href="xml/ges-pitivi-formatter.xml"/>
<xi:include href="xml/ges-base-xml-formatter.xml"/>
<xi:include href="xml/ges-xml-formatter.xml"/>
</chapter>

18
docs/libs/ges-sections.txt
View file

@ -916,6 +916,24 @@ ges_formatter_get_type
GESFormatterPrivate
</SECTION>
<SECTION>
<FILE>ges-pitivi-formatter</FILE>
<TITLE>GESPitiviFormatter</TITLE>
GESPitiviFormatter
ges_pitivi_formatter_new
<SUBSECTION Standard>
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
</SECTION>
<SECTION>
<FILE>ges-base-effect</FILE>
<TITLE>GESBaseEffect</TITLE>

8
ges/Makefile.am
View file

@ -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

4
ges/ges.c
View file

@ -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 */

2
ges/ges.h
View file

@ -73,7 +73,7 @@
#include <ges/ges-base-effect.h>
#include <ges/ges-effect.h>
#include <ges/ges-formatter.h>
/* DISABLED #include <ges/ges-pitivi-formatter.h> */
#include <ges/ges-pitivi-formatter.h>
#include <ges/ges-utils.h>
#include <ges/ges-meta-container.h>
#include <ges/ges-gerror.h>

12
tests/examples/ges-ui.c
View file

@ -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;

2
tests/examples/ges-ui.glade
View file

@ -97,7 +97,7 @@
<property name="tooltip_text" translatable="yes">Launches a .xptv project</property>
<property name="image">image1</property>
<property name="use_stock">False</property>
<signal name="activate" handler="launch_project_activate_cb"/>
<signal name="activate" handler="launch_pitivi_project_activate_cb"/>
</object>
</child>
</object>