summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis de Bethencourt <luis@debethencourt.com>2011-05-25 01:41:09 +0200
committerLuis de Bethencourt <luis@debethencourt.com>2011-05-25 01:41:09 +0200
commitd0e56bcfba6058eb897e5a8ea2fe52079bdce7d9 (patch)
treed8363b759af0d9b2cad395d2cf92dba8d1da905f
parentb149e31666ef6bb2b040fa76220ee6814ef2d327 (diff)
engine: init variables
-rw-r--r--src/gst_engine.c15
-rw-r--r--src/snappy.c7
2 files changed, 14 insertions, 8 deletions
diff --git a/src/gst_engine.c b/src/gst_engine.c
index 6e0fe67..76c4b89 100644
--- a/src/gst_engine.c
+++ b/src/gst_engine.c
@@ -360,15 +360,20 @@ bus_call (GstBus * bus, GstMessage * msg, gpointer data)
gboolean
engine_init (GstEngine * engine, GstElement * sink)
{
- engine->media_width = 600;
- engine->media_height = 400;
- engine->media_duration = -1;
+ engine->playing = FALSE;
engine->direction_foward = TRUE;
engine->prev_done = TRUE;
- engine->second = GST_SECOND;
+
+ engine->has_started = FALSE;
engine->has_video = FALSE;
engine->has_audio = FALSE;
- engine->has_started = FALSE;
+
+ engine->media_width = 600;
+ engine->media_height = 400;
+ engine->media_duration = -1;
+ engine->second = GST_SECOND;
+
+ engine->uri = NULL;
engine->player = gst_element_factory_make ("playbin2", "playbin2");
if (engine->player == NULL) {
diff --git a/src/snappy.c b/src/snappy.c
index 9f049be..1d48251 100644
--- a/src/snappy.c
+++ b/src/snappy.c
@@ -160,15 +160,16 @@ main (int argc, char *argv[])
/* Gstreamer engine */
engine = g_new (GstEngine, 1);
- engine->media_width = -1;
- engine->media_height = -1;
- ui->engine = engine;
+
sink = clutter_gst_video_sink_new (CLUTTER_TEXTURE (video_texture));
ok = engine_init (engine, sink);
if (!ok)
goto quit;
+
+ ui->engine = engine;
ui->texture = video_texture;
+
gst_bus_add_watch (engine->bus, bus_call, ui);
gst_object_unref (engine->bus);