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

dvdreadsrc, pnmsrc: update for GstURIHandler changes

Browse source
This commit is contained in:
Tim-Philipp Müller 2011-11-13 19:01:31 +00:00
parent b581c0f96d
commit 4db445cf84
3 changed files with 20 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
ext/dvdread/dvdreadsrc.c
View file

@ -100,7 +100,6 @@ gst_dvd_read_src_finalize (GObject * object)
GstDvdReadSrc *src = GST_DVD_READ_SRC (object); GstDvdReadSrc *src = GST_DVD_READ_SRC (object);
g_free (src->location); g_free (src->location);
g_free (src->last_uri);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -114,7 +113,6 @@ gst_dvd_read_src_init (GstDvdReadSrc * src)
src->dvd_title = NULL; src->dvd_title = NULL;
src->location = g_strdup ("/dev/dvd"); src->location = g_strdup ("/dev/dvd");
src->last_uri = NULL;
src->new_seek = TRUE; src->new_seek = TRUE;
src->new_cell = TRUE; src->new_cell = TRUE;
src->change_cell = FALSE; src->change_cell = FALSE;
@ -1642,36 +1640,25 @@ gst_dvd_read_src_uri_get_protocols (GType type)
return protocols; return protocols;
} }
static const gchar * static gchar *
gst_dvd_read_src_uri_get_uri (GstURIHandler * handler) gst_dvd_read_src_uri_get_uri (GstURIHandler * handler)
{ {
GstDvdReadSrc *src = GST_DVD_READ_SRC (handler); GstDvdReadSrc *src = GST_DVD_READ_SRC (handler);
gchar *uri;
GST_OBJECT_LOCK (src); GST_OBJECT_LOCK (src);
uri = g_strdup_printf ("dvd://%d,%d,%d", src->uri_title, src->uri_chapter,
g_free (src->last_uri); src->uri_angle);
src->last_uri = g_strdup_printf ("dvd://%d,%d,%d", src->uri_title,
src->uri_chapter, src->uri_angle);
GST_OBJECT_UNLOCK (src); GST_OBJECT_UNLOCK (src);
return src->last_uri; return uri;
} }
static gboolean static gboolean
gst_dvd_read_src_uri_set_uri (GstURIHandler * handler, const gchar * uri) gst_dvd_read_src_uri_set_uri (GstURIHandler * handler, const gchar * uri,
GError ** error)
{ {
GstDvdReadSrc *src = GST_DVD_READ_SRC (handler); GstDvdReadSrc *src = GST_DVD_READ_SRC (handler);
gboolean ret;
gchar *protocol;
protocol = gst_uri_get_protocol (uri);
ret = (protocol != NULL && g_str_equal (protocol, "dvd"));
g_free (protocol);
protocol = NULL;
if (!ret)
return ret;
/* parse out the new t/c/a and seek to them */ /* parse out the new t/c/a and seek to them */
{ {
@ -1682,15 +1669,15 @@ gst_dvd_read_src_uri_set_uri (GstURIHandler * handler, const gchar * uri)
location = gst_uri_get_location (uri); location = gst_uri_get_location (uri);
if (!location)
return ret;
GST_OBJECT_LOCK (src); GST_OBJECT_LOCK (src);
src->uri_title = 1; src->uri_title = 1;
src->uri_chapter = 1; src->uri_chapter = 1;
src->uri_angle = 1; src->uri_angle = 1;
if (!location)
goto empty_location;
strcur = strs = g_strsplit (location, ",", 0); strcur = strs = g_strsplit (location, ",", 0);
while (strcur && *strcur) { while (strcur && *strcur) {
gint val; gint val;
@ -1727,13 +1714,15 @@ gst_dvd_read_src_uri_set_uri (GstURIHandler * handler, const gchar * uri)
src->new_seek = TRUE; src->new_seek = TRUE;
} }
GST_OBJECT_UNLOCK (src);
g_strfreev (strs); g_strfreev (strs);
g_free (location); g_free (location);
empty_location:
GST_OBJECT_UNLOCK (src);
} }
return ret; return TRUE;
} }
static void static void

1
ext/dvdread/dvdreadsrc.h
View file

@ -47,7 +47,6 @@ struct _GstDvdReadSrc {
/* location */ /* location */
gchar *location; gchar *location;
gchar *last_uri;
gboolean new_seek; gboolean new_seek;
gboolean change_cell; gboolean change_cell;

11
gst/realmedia/pnmsrc.c
View file

@ -207,22 +207,21 @@ gst_pnm_src_uri_get_protocols (GType type)
return protocols; return protocols;
} }
static const gchar * static gchar *
gst_pnm_src_uri_get_uri (GstURIHandler * handler) gst_pnm_src_uri_get_uri (GstURIHandler * handler)
{ {
GstPNMSrc *src = GST_PNM_SRC (handler); GstPNMSrc *src = GST_PNM_SRC (handler);
return src->location; /* FIXME: make thread-safe */
return g_strdup (src->location);
} }
static gboolean static gboolean
gst_pnm_src_uri_set_uri (GstURIHandler * handler, const gchar * uri) gst_pnm_src_uri_set_uri (GstURIHandler * handler, const gchar * uri,
GError ** error)
{ {
GstPNMSrc *src = GST_PNM_SRC (handler); GstPNMSrc *src = GST_PNM_SRC (handler);
if (!g_str_has_prefix (uri, "pnm://"))
return FALSE;
g_free (src->location); g_free (src->location);
src->location = g_strdup (uri); src->location = g_strdup (uri);