diff options
| author | Luo Jinghua <sunmoon1997@gmail.com> | 2009-09-25 10:20:13 +0800 |
|---|---|---|
| committer | Luo Jinghua <sunmoon1997@gmail.com> | 2009-09-25 10:20:13 +0800 |
| commit | 53e889dd17be952d717df9de109e39c057b4d1fe (patch) | |
| tree | 4c4249d41349caae272b3583e6774480a5dfae26 | |
| parent | 89a23f428aa48c8dd9dd51c7c30f6f0b2bcdfaaa (diff) | |
ppssrc: rename tvod_location to transformed_location
tvod_location can be a pps:// uri already
| -rw-r--r-- | src/gstppssrc.c | 13 | ||||
| -rw-r--r-- | src/gstppssrc.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/gstppssrc.c b/src/gstppssrc.c index 84db488..c915dac 100644 --- a/src/gstppssrc.c +++ b/src/gstppssrc.c @@ -241,8 +241,8 @@ gst_pps_src_dispose (GObject * gobject) g_free (src->location); src->location = NULL; - g_free (src->tvod_location); - src->tvod_location = NULL; + g_free (src->transformed_location); + src->transformed_location = NULL; g_free (src->oem); src->oem = NULL; g_free (src->terminal_type); @@ -579,8 +579,9 @@ gst_pps_src_open (GstPpsSrc * src) GST_DEBUG_OBJECT (src, "add item: (\"%s\")", src->location); src->fd = ret = ppsvod_add_item (src->location, src->vip_flag); if (ret < 0) { - if (src->tvod_location) - src->fd = ret = ppsvod_add_item (src->tvod_location, src->vip_flag); + if (src->transformed_location) + src->fd = ret = + ppsvod_add_item (src->transformed_location, src->vip_flag); if (ret < 0) { GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL), ("Couldn't open the stream")); @@ -1163,10 +1164,10 @@ static gboolean gst_pps_src_set_location (GstPpsSrc * src, const gchar * uri) { g_free (src->location); - g_free (src->tvod_location); + g_free (src->transformed_location); src->location = gst_pps_src_recode_uri (uri); - src->tvod_location = gst_pps_src_transform_uri (uri, 0); + src->transformed_location = gst_pps_src_transform_uri (uri, 0); src->location_changed = TRUE; return TRUE; diff --git a/src/gstppssrc.h b/src/gstppssrc.h index dc629db..55ef2a4 100644 --- a/src/gstppssrc.h +++ b/src/gstppssrc.h @@ -43,7 +43,7 @@ struct _GstPpsSrc { GstPushSrc element; gchar *location; /* Full URI. */ - gchar *tvod_location; /* Transformed Full URI. */ + gchar *transformed_location; /* Transformed Full URI. */ gchar *oem; /* OEM. */ gchar *terminal_type; /* Terminal Type. */ gchar *device_id; /* Device Id */ |