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

ges-launch: replace home-grown version of gst_filename_to_uri()

Browse source 
and remove superfluous check if file is readable with
fopen. Code appears to also want to accept URIs, so this
doesn't work so well, and should probably be done differently
anyway if required.

https://bugzilla.gnome.org/show_bug.cgi?id=674296
This commit is contained in:
Tim-Philipp Müller 2012-05-02 08:44:25 +01:00
parent 59e156ea3a
commit 8542d18d43
1 changed files with 3 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
tools/ges-launch.c
View file

@ -39,24 +39,10 @@ void load_project (gchar * uri);
static gchar * static gchar *
ensure_uri (gchar * location) ensure_uri (gchar * location)
{ {
gchar *res;
gchar *path;
if (gst_uri_is_valid (location)) if (gst_uri_is_valid (location))
return g_strdup (location); return g_strdup (location);
else
if (!g_path_is_absolute (location)) { return gst_filename_to_uri (location, NULL);
gchar *cur_dir;
cur_dir = g_get_current_dir ();
path = g_build_filename (cur_dir, location, NULL);
g_free (cur_dir);
} else
path = g_strdup (location);
res = g_filename_to_uri (path, NULL, NULL);
g_free (path);
return res;
} }
static gboolean static gboolean
@ -77,18 +63,6 @@ thumbnail_cb (gpointer pipeline)
return res; return res;
} }
static gboolean
check_path (char *path)
{
FILE *fp = fopen (path, "r");
if (fp) {
fclose (fp);
return TRUE;
}
return FALSE;
}
static gboolean static gboolean
check_time (char *time) check_time (char *time)
{ {
@ -96,7 +70,7 @@ check_time (char *time)
if (!re) { if (!re) {
if (NULL == (re = g_regex_new ("^[0-9]+(.[0-9]+)?$", G_REGEX_EXTENDED, 0, if (NULL == (re = g_regex_new ("^[0-9]+(.[0-9]+)?$", G_REGEX_EXTENDED, 0,
NULL))) NULL)))
return FALSE; return FALSE;
} }
@ -233,11 +207,6 @@ create_timeline (int nbargs, gchar ** argv, gchar * audio, gchar * video)
gchar *uri; gchar *uri;
guint64 inpoint; guint64 inpoint;
if (!check_path (source)) {
g_error ("'%s': could not open path!", source);
goto build_failure;
}
if (!(uri = ensure_uri (source))) { if (!(uri = ensure_uri (source))) {
GST_ERROR ("couldn't create uri for '%s'", source); GST_ERROR ("couldn't create uri for '%s'", source);
goto build_failure; goto build_failure;