mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 06:26:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 0.11

Browse source
This commit is contained in:
Tim-Philipp Müller 2012-03-13 13:52:32 +00:00
commit 3ecd02cc24
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/check/ges/save_and_load.c
View file

@ -636,9 +636,7 @@ GST_START_TEST (test_pitivi_file_load)
GESFormatter *formatter; GESFormatter *formatter;
GESTimeline *timeline, *expected; GESTimeline *timeline, *expected;
GMainLoop *mainloop; GMainLoop *mainloop;
char cCurrentPath[FILENAME_MAX]; gchar *uri, *save_uri, *cur_dir;
char *a;
gchar *uri, *save_uri;
/*create the expected timeline */ /*create the expected timeline */
timeline = ges_timeline_new (); timeline = ges_timeline_new ();
@ -647,9 +645,11 @@ GST_START_TEST (test_pitivi_file_load)
/* create the timeline from formatter */ /* create the timeline from formatter */
formatter = GES_FORMATTER (ges_pitivi_formatter_new ()); formatter = GES_FORMATTER (ges_pitivi_formatter_new ());
a = GetCurrentDir (cCurrentPath, sizeof (cCurrentPath)); cur_dir = g_get_current_dir ();
uri = g_strconcat (a, "/test.xptv", NULL); uri = g_build_filename (cur_dir, "test.xptv", NULL);
save_uri = g_strconcat (a, "/testsave.xptv", NULL); save_uri = g_build_filename (cur_dir, "testsave.xptv", NULL);
g_free (cur_dir);
if (g_file_test (uri, G_FILE_TEST_EXISTS) == FALSE) { if (g_file_test (uri, G_FILE_TEST_EXISTS) == FALSE) {
GST_ERROR ("Could not test GESPitiviFormatter as no project file found"); GST_ERROR ("Could not test GESPitiviFormatter as no project file found");
return; return;